[Cache] Fix locking on Solaris

nicolas-grekas · nicolas-grekas · commit 43da583267de · 2018-06-21T11:23:42.000+02:00
diff --git a/src/Symfony/Component/Cache/LockRegistry.php b/src/Symfony/Component/Cache/LockRegistry.php
@@ -64,9 +64,11 @@ public static function setFiles(array $files): array
         $previousFiles = self::$files;
         self::$files = $files;
 
-        foreach (self::$openedFiles as $k => $file) {
-            flock($file, LOCK_UN);
-            fclose($file);
+        foreach (self::$openedFiles as $file) {
+            if ($file) {
+                flock($file, LOCK_UN);
+                fclose($file);
+            }
         }
         self::$openedFiles = self::$lockedFiles = array();
 
@@ -112,19 +114,24 @@ function (CacheItemPoolInterface $pool, CacheItemInterface $item, $value, float
             flock($lock, LOCK_SH);
         } finally {
             flock($lock, LOCK_UN);
-            self::$lockedFiles[$key] = false;
+            unset(self::$lockedFiles[$key]);
         }
 
         return false;
     }
 
     private static function open(int $key)
     {
-        if ($h = self::$openedFiles[$key] ?? null) {
+        if (null !== $h = self::$openedFiles[$key] ?? null) {
             return $h;
         }
-        if ($h = fopen(self::$files[$key], 'rb')) {
-            return self::$openedFiles[$key] = $h;
+        set_error_handler(function () {});
+        try {
+            $h = fopen(self::$files[$key], 'r+');
+        } finally {
+            restore_error_handler();
         }
+
+        self::$openedFiles[$key] = $h ?: @fopen(self::$files[$key], 'r');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,11 @@ public static function setFiles(array $files): array`
`64`	`64`	`$previousFiles = self::$files;`
`65`	`65`	`self::$files = $files;`
`66`	`66`
`67`		`- foreach (self::$openedFiles as $k => $file) {`
`68`		`- flock($file, LOCK_UN);`
`69`		`- fclose($file);`
	`67`	`+ foreach (self::$openedFiles as $file) {`
	`68`	`+ if ($file) {`
	`69`	`+ flock($file, LOCK_UN);`
	`70`	`+ fclose($file);`
	`71`	`+ }`
`70`	`72`	`}`
`71`	`73`	`self::$openedFiles = self::$lockedFiles = array();`
`72`	`74`
`@@ -112,19 +114,24 @@ function (CacheItemPoolInterface $pool, CacheItemInterface $item, $value, float`
`112`	`114`	`flock($lock, LOCK_SH);`
`113`	`115`	`} finally {`
`114`	`116`	`flock($lock, LOCK_UN);`
`115`		`- self::$lockedFiles[$key] = false;`
	`117`	`+ unset(self::$lockedFiles[$key]);`
`116`	`118`	`}`
`117`	`119`
`118`	`120`	`return false;`
`119`	`121`	`}`
`120`	`122`
`121`	`123`	`private static function open(int $key)`
`122`	`124`	`{`
`123`		`- if ($h = self::$openedFiles[$key] ?? null) {`
	`125`	`+ if (null !== $h = self::$openedFiles[$key] ?? null) {`
`124`	`126`	`return $h;`
`125`	`127`	`}`
`126`		`- if ($h = fopen(self::$files[$key], 'rb')) {`
`127`		`- return self::$openedFiles[$key] = $h;`
	`128`	`+ set_error_handler(function () {});`
	`129`	`+ try {`
	`130`	`+ $h = fopen(self::$files[$key], 'r+');`
	`131`	`+ } finally {`
	`132`	`+ restore_error_handler();`
`128`	`133`	`}`
	`134`	`+`
	`135`	`+ self::$openedFiles[$key] = $h ?: @fopen(self::$files[$key], 'r');`
`129`	`136`	`}`
`130`	`137`	`}`