bug #39223 [Console] Re-enable hyperlinks in Konsole/Yakuake (OndraM)

chalasr · chalasr · commit da65c57fb49d · 2020-11-30T17:35:14.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [Console] Re-enable hyperlinks in Konsole/Yakuake | Q | A | ------------- | --- | Branch? | 4.4  | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | Fix #31809  | License | MIT Hyperlinks feature was broken in KDE's Konsole/Yakuake (#31809) and thus disabled by #31849. But the feature has been recently [implemented](https://invent.kde.org/utilities/konsole/-/merge_requests/138), and is about to be released in KDE 20.12 on December 10th 2020, see [release notes](https://community.kde.org/Releases/20.12_Release_Notes#Konsole). ![obrazek](https://user-images.githubusercontent.com/793041/100556284-92dccf00-32a1-11eb-9907-f65c2eaa1335.png) Tested in RC version and seems to be working fine. The feature is disabled by default (as per security concerns), but even when disabled, it just gracefully don't show the links. Commits ------- 728edf3 [Console] Enable hyperlinks in Konsole/Yakuake
diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
@@ -166,7 +166,8 @@ public function apply($text)
         $unsetCodes = [];
 
         if (null === $this->handlesHrefGracefully) {
-            $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR') && !getenv('KONSOLE_VERSION');
+            $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR')
+                && (!getenv('KONSOLE_VERSION') || (int) getenv('KONSOLE_VERSION') > 201100);
         }
 
         if (null !== $this->foreground) {
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -439,7 +439,8 @@ protected function style($style, $value, $attr = [])
         }
 
         if (null === $this->handlesHrefGracefully) {
-            $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR') && !getenv('KONSOLE_VERSION');
+            $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR')
+                && (!getenv('KONSOLE_VERSION') || (int) getenv('KONSOLE_VERSION') > 201100);
         }
 
         if (isset($attr['ellipsis'], $attr['ellipsis-type'])) {

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,8 @@ public function apply($text)`
`166`	`166`	`$unsetCodes = [];`
`167`	`167`
`168`	`168`	`if (null === $this->handlesHrefGracefully) {`
`169`		`- $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR') && !getenv('KONSOLE_VERSION');`
	`169`	`+ $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR')`
	`170`	`+ && (!getenv('KONSOLE_VERSION') \|\| (int) getenv('KONSOLE_VERSION') > 201100);`
`170`	`171`	`}`
`171`	`172`
`172`	`173`	`if (null !== $this->foreground) {`
Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,8 @@ protected function style($style, $value, $attr = [])`
`439`	`439`	`}`
`440`	`440`
`441`	`441`	`if (null === $this->handlesHrefGracefully) {`
`442`		`- $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR') && !getenv('KONSOLE_VERSION');`
	`442`	`+ $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR')`
	`443`	`+ && (!getenv('KONSOLE_VERSION') \|\| (int) getenv('KONSOLE_VERSION') > 201100);`
`443`	`444`	`}`
`444`	`445`
`445`	`446`	`if (isset($attr['ellipsis'], $attr['ellipsis-type'])) {`