Merge branch '4.4' into 5.1

derrabus · derrabus · commit fa8f8cab6b65 · 2020-11-30T18:05:38.000+01:00
* 4.4:
  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/Filesystem.php b/Filesystem.php
@@ -667,7 +667,9 @@ public function dumpFile(string $filename, $content)
 
             $this->rename($tmpFile, $filename, true);
         } finally {
-            @unlink($tmpFile);
+            if (file_exists($tmpFile)) {
+                @unlink($tmpFile);
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -667,7 +667,9 @@ public function dumpFile(string $filename, $content)`
`667`	`667`
`668`	`668`	`$this->rename($tmpFile, $filename, true);`
`669`	`669`	`} finally {`
`670`		`- @unlink($tmpFile);`
	`670`	`+ if (file_exists($tmpFile)) {`
	`671`	`+ @unlink($tmpFile);`
	`672`	`+ }`
`671`	`673`	`}`
`672`	`674`	`}`
`673`	`675`