bug #31849 [Console] Add check for Konsole/Yakuake to disable hyperlinks (belinde)

fabpot · fabpot · commit ed59830f55ee · 2019-06-05T04:08:12.000+02:00
This PR was squashed before being merged into the 4.3 branch (closes #31849). Discussion ---------- [Console] Add check for Konsole/Yakuake to disable hyperlinks | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #31809 | License | MIT | Doc PR | Added check for environment variable set by Konsole and other relateds terminal emulators. A ticket has been opened to Konsole team to support this feature someday: https://bugs.kde.org/show_bug.cgi?id=408288 Commits ------- 14b27b7 [Console] Add check for Konsole/Yakuake to disable hyperlinks
diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
@@ -187,7 +187,7 @@ public function apply($text)
         $unsetCodes = [];
 
         if (null === $this->handlesHrefGracefully) {
-            $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR');
+            $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR') && !getenv('KONSOLE_VERSION');
         }
 
         if (null !== $this->foreground) {
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -435,7 +435,7 @@ protected function style($style, $value, $attr = [])
         }
 
         if (null === $this->handlesHrefGracefully) {
-            $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR');
+            $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR') && !getenv('KONSOLE_VERSION');
         }
 
         if (isset($attr['ellipsis'], $attr['ellipsis-type'])) {

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ public function apply($text)`
`187`	`187`	`$unsetCodes = [];`
`188`	`188`
`189`	`189`	`if (null === $this->handlesHrefGracefully) {`
`190`		`- $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR');`
	`190`	`+ $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR') && !getenv('KONSOLE_VERSION');`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`if (null !== $this->foreground) {`
Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ protected function style($style, $value, $attr = [])`
`435`	`435`	`}`
`436`	`436`
`437`	`437`	`if (null === $this->handlesHrefGracefully) {`
`438`		`- $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR');`
	`438`	`+ $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR') && !getenv('KONSOLE_VERSION');`
`439`	`439`	`}`
`440`	`440`
`441`	`441`	`if (isset($attr['ellipsis'], $attr['ellipsis-type'])) {`