Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit 714b47f9196d · 2021-06-12T12:15:01.000+02:00
* 4.4:
  [Config] fix tracking attributes in ReflectionClassResource
  [Process] Fix incorrect parameter type
  [HttpFoundation] Handle tentative return types
diff --git a/Pipes/WindowsPipes.php b/Pipes/WindowsPipes.php
@@ -71,7 +71,7 @@ public function __construct($input, bool $haveReadSupport)
                     }
                     $this->lockHandles[$pipe] = $h;
 
-                    if (!fclose(fopen($file, 'w')) || !$h = fopen($file, 'r')) {
+                    if (!($h = fopen($file, 'w')) || !fclose($h) || !$h = fopen($file, 'r')) {
                         flock($this->lockHandles[$pipe], \LOCK_UN);
                         fclose($this->lockHandles[$pipe]);
                         unset($this->lockHandles[$pipe]);

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function __construct($input, bool $haveReadSupport)`
`71`	`71`	`}`
`72`	`72`	`$this->lockHandles[$pipe] = $h;`
`73`	`73`
`74`		`- if (!fclose(fopen($file, 'w')) \|\| !$h = fopen($file, 'r')) {`
	`74`	`+ if (!($h = fopen($file, 'w')) \|\| !fclose($h) \|\| !$h = fopen($file, 'r')) {`
`75`	`75`	`flock($this->lockHandles[$pipe], \LOCK_UN);`
`76`	`76`	`fclose($this->lockHandles[$pipe]);`
`77`	`77`	`unset($this->lockHandles[$pipe]);`