do not ignore flock() return values for PHP 8.5 compat

Author: xabbuh

Diff for: src/Symfony/Component/Cache/LockRegistry.php

@@ -74,7 +74,6 @@ public static function setFiles(array $files): array
 
         foreach (self::$openedFiles as $file) {
             if ($file) {
-                flock($file, \LOCK_UN);
                 fclose($file);
             }
         }
@@ -123,9 +122,9 @@ public static function compute(callable $callback, ItemInterface $item, bool &$s
                 }
                 // if we failed the race, retry locking in blocking mode to wait for the winner
                 $logger?->info('Item "{key}" is locked, waiting for it to be released', ['key' => $item->getKey()]);
-                flock($lock, \LOCK_SH);
+                (bool) flock($lock, \LOCK_SH);
             } finally {
-                flock($lock, \LOCK_UN);
+                fclose($lock);
                 unset(self::$lockedFiles[$key]);
             }
 

Diff for: src/Symfony/Component/HttpKernel/HttpCache/Store.php

@@ -62,7 +62,6 @@ public function cleanup()
     {
         // unlock everything
         foreach ($this->locks as $lock) {
-            flock($lock, \LOCK_UN);
             fclose($lock);
         }
 
@@ -106,7 +105,6 @@ public function unlock(Request $request): bool
         $key = $this->getCacheKey($request);
 
         if (isset($this->locks[$key])) {
-            flock($this->locks[$key], \LOCK_UN);
             fclose($this->locks[$key]);
             unset($this->locks[$key]);
 
@@ -129,8 +127,7 @@ public function isLocked(Request $request): bool
         }
 
         $h = fopen($path, 'r');
-        flock($h, \LOCK_EX | \LOCK_NB, $wouldBlock);
-        flock($h, \LOCK_UN); // release the lock we just acquired
+        flock($h, \LOCK_EX | \LOCK_NB, $wouldBlock) && flock($h, \LOCK_UN); // release the lock we just acquired
         fclose($h);
 
         return (bool) $wouldBlock;
@@ -340,7 +337,6 @@ private function doPurge(string $url): bool
     {
         $key = $this->getCacheKey(Request::create($url));
         if (isset($this->locks[$key])) {
-            flock($this->locks[$key], \LOCK_UN);
             fclose($this->locks[$key]);
             unset($this->locks[$key]);
         }

Diff for: src/Symfony/Component/HttpKernel/Kernel.php

@@ -435,7 +435,6 @@ protected function initializeContainer()
                 } elseif (!is_file($cachePath) || !\is_object($this->container = include $cachePath)) {
                     $this->container = null;
                 } elseif (!$oldContainer || $this->container::class !== $oldContainer->name) {
-                    flock($lock, \LOCK_UN);
                     fclose($lock);
                     $this->container->set('kernel', $this);
 
@@ -517,7 +516,6 @@ protected function initializeContainer()
         $this->dumpContainer($cache, $container, $class, $this->getContainerBaseClass());
 
         if ($lock) {
-            flock($lock, \LOCK_UN);
             fclose($lock);
         }
 

Diff for: src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php

@@ -307,9 +307,8 @@ private function doRead($token, ?Profile $profile = null): ?Profile
         }
 
         $h = fopen($file, 'r');
-        flock($h, \LOCK_SH);
+        (bool) flock($h, \LOCK_SH);
         $data = stream_get_contents($h);
-        flock($h, \LOCK_UN);
         fclose($h);
 
         if (\function_exists('gzdecode')) {

Diff for: src/Symfony/Component/Lock/Store/FlockStore.php

@@ -152,7 +152,6 @@ public function delete(Key $key)
 
         $handle = $key->getState(__CLASS__)[1];
 
-        flock($handle, \LOCK_UN | \LOCK_NB);
         fclose($handle);
 
         $key->removeState(__CLASS__);

Diff for: src/Symfony/Component/Process/Pipes/WindowsPipes.php

@@ -66,13 +66,11 @@ public function __construct(mixed $input, bool $haveReadSupport)
                         continue 2;
                     }
                     if (isset($this->lockHandles[$pipe])) {
-                        flock($this->lockHandles[$pipe], \LOCK_UN);
                         fclose($this->lockHandles[$pipe]);
                     }
                     $this->lockHandles[$pipe] = $h;
 
                     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]);
                         continue 2;
@@ -153,7 +151,6 @@ public function readAndWrite(bool $blocking, bool $close = false): array
             if ($close) {
                 ftruncate($fileHandle, 0);
                 fclose($fileHandle);
-                flock($this->lockHandles[$type], \LOCK_UN);
                 fclose($this->lockHandles[$type]);
                 unset($this->fileHandles[$type], $this->lockHandles[$type]);
             }
@@ -178,7 +175,6 @@ public function close(): void
         foreach ($this->fileHandles as $type => $handle) {
             ftruncate($handle, 0);
             fclose($handle);
-            flock($this->lockHandles[$type], \LOCK_UN);
             fclose($this->lockHandles[$type]);
         }
         $this->fileHandles = $this->lockHandles = [];

Diff for: src/Symfony/Component/Process/Tests/ProcessTest.php

@@ -413,10 +413,10 @@ public function testIncrementalOutput($getOutput, $getIncrementalOutput, $uri)
     {
         $lock = tempnam(sys_get_temp_dir(), __FUNCTION__);
 
-        $p = $this->getProcessForCode('file_put_contents($s = \''.$uri.'\', \'foo\'); flock(fopen('.var_export($lock, true).', \'r\'), LOCK_EX); file_put_contents($s, \'bar\');');
+        $p = $this->getProcessForCode('file_put_contents($s = \''.$uri.'\', \'foo\'); (bool) flock(fopen('.var_export($lock, true).', \'r\'), LOCK_EX); file_put_contents($s, \'bar\');');
 
         $h = fopen($lock, 'w');
-        flock($h, \LOCK_EX);
+        (bool) flock($h, \LOCK_EX);
 
         $p->start();
 
@@ -427,8 +427,6 @@ public function testIncrementalOutput($getOutput, $getIncrementalOutput, $uri)
 
             $this->assertSame($s, $p->$getIncrementalOutput());
             $this->assertSame('', $p->$getIncrementalOutput());
-
-            flock($h, \LOCK_UN);
         }
 
         fclose($h);