Merge branch '5.1' into 5.2

derrabus · derrabus · commit e1789346d5a4 · 2020-11-30T18:15:52.000+01:00
* 5.1:
  Added additional file existence check on temporary file cleanup for dumpFile method
  fix lexing inline sequences/mappings with trailing whitespaces
  Added test for issue 39229
  [Console] Enable hyperlinks in Konsole/Yakuake
diff --git a/Dumper/CliDumper.php b/Dumper/CliDumper.php
@@ -435,7 +435,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
`@@ -435,7 +435,8 @@ protected function style($style, $value, $attr = [])`
`435`	`435`	`}`
`436`	`436`
`437`	`437`	`if (null === $this->handlesHrefGracefully) {`
`438`		`- $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR') && !getenv('KONSOLE_VERSION');`
	`438`	`+ $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR')`
	`439`	`+ && (!getenv('KONSOLE_VERSION') \|\| (int) getenv('KONSOLE_VERSION') > 201100);`
`439`	`440`	`}`
`440`	`441`
`441`	`442`	`if (isset($attr['ellipsis'], $attr['ellipsis-type'])) {`