Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit 456509aac7ce · 2021-05-26T19:33:56.000+02:00
* 4.4:
  [HttpKernel] Fixes tests for PHP7.4+
  [Filesystem] fix readlink for Windows
diff --git a/HttpCache/Store.php b/HttpCache/Store.php
@@ -347,7 +347,7 @@ private function load(string $key): ?string
     {
         $path = $this->getPath($key);
 
-        return is_file($path) && false !== ($contents = file_get_contents($path)) ? $contents : null;
+        return is_file($path) && false !== ($contents = @file_get_contents($path)) ? $contents : null;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ private function load(string $key): ?string`
`347`	`347`	`{`
`348`	`348`	`$path = $this->getPath($key);`
`349`	`349`
`350`		`- return is_file($path) && false !== ($contents = file_get_contents($path)) ? $contents : null;`
	`350`	`+ return is_file($path) && false !== ($contents = @file_get_contents($path)) ? $contents : null;`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`/**`