[12.x] Fix/file cache lock collision

config/cache.php

@@ -55,7 +55,7 @@
         'file' => [
             'driver' => 'file',
             'path' => storage_path('framework/cache/data'),
-            'lock_path' => storage_path('framework/cache/data'),
+            'lock_path' => storage_path('framework/cache/locks'),
         ],
 
         'memcached' => [

src/Illuminate/Cache/FileStore.php

@@ -216,10 +216,12 @@ public function forever($key, $value)
      */
     public function lock($name, $seconds = 0, $owner = null)
     {
-        $this->ensureCacheDirectoryExists($this->lockDirectory ?? $this->directory);
+        $locksDir = $this->lockDirectory ?? ($this->directory.'/locks');
+
+        $this->ensureCacheDirectoryExists($locksDir);
 
         return new FileLock(
-            new static($this->files, $this->lockDirectory ?? $this->directory, $this->filePermission),
+            new static($this->files, $locksDir, $this->filePermission),
             $name,
             $seconds,
             $owner

tests/Integration/Cache/FileCacheLockTest.php

@@ -8,6 +8,7 @@
 use Illuminate\Support\Sleep;
 use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\TestCase;
+use Throwable;
 
 #[WithConfig('cache.default', 'file')]
 class FileCacheLockTest extends TestCase
@@ -16,6 +17,9 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        $this->app['config']->set('cache.default', 'file');
+        $this->app['config']->set('cache.stores.file.lock_path', storage_path('framework/cache/locks'));
+
         // flush lock from previous tests
         Cache::lock('foo')->forceRelease();
     }
@@ -100,6 +104,18 @@ public function testOwnerStatusCanBeCheckedAfterRestoringLock()
         $this->assertTrue($secondLock->isOwnedByCurrentProcess());
     }
 
+    public function testCacheRememberReturnsValueWhenLockWithSameKeyExists()
+    {
+        $lock = Cache::lock('my-key', 5);
+        $this->assertTrue($lock->get());
+
+        $value = Cache::remember('my-key', 60, fn () => 'expected-value');
+
+        $this->assertSame('expected-value', $value);
+
+        $lock->release();
+    }
+
     public function testOtherOwnerDoesNotOwnLockAfterRestore()
     {
         $firstLock = Cache::lock('foo', 10);
@@ -123,4 +139,14 @@ public function testExceptionIfBlockCanNotAcquireLock()
         $this->expectException(LockTimeoutException::class);
         Cache::lock('foo', 10)->block(5);
     }
+
+    protected function tearDown(): void
+    {
+        try {
+            Cache::lock('foo')->forceRelease();
+        } catch (Throwable) {
+        }
+
+        parent::tearDown();
+    }
 }