Handle race condition when creating cache directory

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Enh #88: Don't create cache directory on `FileCache` initialization (@vjik)
 - Bug #88: Set correct permissions for nested directories (@vjik)
 - Bug #85: Clear stat cache in `FileCache::set()` (@samdark)
+- Bug #86: Handle race condition when creating cache directory (@vjik)
 
 ## 3.1.0 October 09, 2023
 

src/FileCache.php

@@ -20,12 +20,14 @@
 use function is_dir;
 use function is_file;
 use function iterator_to_array;
+use function mkdir;
 use function opendir;
 use function posix_geteuid;
 use function random_int;
 use function readdir;
 use function rmdir;
 use function serialize;
+use function sprintf;
 use function strpbrk;
 use function substr;
 use function unlink;
@@ -115,7 +117,7 @@
         $this->gc();
         $expiration = $this->ttlToExpiration($ttl);
 
         if ($expiration <= self::EXPIRATION_EXPIRED) {
             return $this->delete($key);
         }
 
@@ -185,7 +187,7 @@
     public function setMultiple(iterable $values, null|int|DateInterval $ttl = null): bool
     {
         $values = $this->iterableToArray($values);
         $this->validateKeys(array_map('\strval', array_keys($values)));
 
         foreach ($values as $key => $value) {
             $this->set((string) $key, $value, $ttl);
@@ -203,7 +205,7 @@
             $this->delete($key);
         }
 
         return true;
     }
 
     public function has(string $key): bool
@@ -328,10 +330,21 @@
             throw new CacheException("Failed to create cache directory, file with the same name exists: \"$path\".");
         }
 
-        mkdir($path, recursive: true);
-
-        if (!is_dir($path)) {
-            throw new CacheException("Failed to create cache directory \"$path\".");
+        set_error_handler(
+            static function (int $errorNumber, string $errorString) use ($path): bool {
+                if (is_dir($path)) {
+                    return true;
+                }
+                throw new CacheException(
+                    sprintf('Failed to create directory "%s". %s', $path, $errorString),
+                    $errorNumber,
+                );
+            }
+        );
+        try {
+            mkdir($path, recursive: true);
+        } finally {
+            restore_error_handler();
         }
 
         chmod($path, $this->directoryMode);

tests/FileCacheTest.php

@@ -656,4 +656,13 @@ public function testSetClearsStatCache(): void
         $this->assertTrue($this->cache->set(__FUNCTION__, 'cache2', 2));
         $this->assertSame('cache2', $this->cache->get(__FUNCTION__));
     }
+
+    public function testMkdirConvertingErrorToException(): void
+    {
+        $cache = new FileCache('');
+
+        $this->expectException(CacheException::class);
+        $this->expectExceptionMessage('Failed to create directory "". mkdir(): Invalid path');
+        $cache->set('test', 0);
+    }
 }