Add isCurrentlyOwnedBy function to lock

laravel · May 13, 2024 · 4e69b25 · 4e69b25
1 parent fd6cc89
commit 4e69b25
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 0 deletions.
diff --git a/src/Illuminate/Cache/Lock.php b/src/Illuminate/Cache/Lock.php
@@ -143,6 +143,16 @@ public function owner()
         return $this->owner;
     }
 
+    /**
+     * Determines whether this lock is owned by the given identifier.
+     *
+     * @return bool
+     */
+    public function isCurrentlyOwnedBy($owner = null)
+    {
+        return $this->getCurrentOwner() === $owner;
+    }
+
     /**
      * Determines whether this lock is allowed to release the lock in the driver.
      *

diff --git a/tests/Integration/Cache/FileCacheLockTest.php b/tests/Integration/Cache/FileCacheLockTest.php
@@ -104,9 +104,12 @@ public function testOtherOwnerDoesNotOwnLockAfterRestore()
         Cache::lock('foo')->forceRelease();
 
         $firstLock = Cache::lock('foo', 10);
+        $this->assertTrue($firstLock->isCurrentlyOwnedBy(null));
         $this->assertTrue($firstLock->get());
+        $this->assertTrue($firstLock->isCurrentlyOwnedBy($firstLock->owner()));
 
         $secondLock = Cache::store('file')->restoreLock('foo', 'other_owner');
+        $this->assertFalse($secondLock->isCurrentlyOwnedBy($firstLock->owner()));
         $this->assertFalse($secondLock->isOwnedByCurrentProcess());
     }
 }
diff --git a/tests/Integration/Cache/MemcachedCacheLockTestCase.php b/tests/Integration/Cache/MemcachedCacheLockTestCase.php
@@ -97,9 +97,12 @@ public function testOtherOwnerDoesNotOwnLockAfterRestore()
         Cache::store('memcached')->lock('foo')->forceRelease();
 
         $firstLock = Cache::store('memcached')->lock('foo', 10);
+        $this->assertTrue($firstLock->isCurrentlyOwnedBy(null));
         $this->assertTrue($firstLock->get());
+        $this->assertTrue($firstLock->isCurrentlyOwnedBy($firstLock->owner()));
 
         $secondLock = Cache::store('memcached')->restoreLock('foo', 'other_owner');
+        $this->assertFalse($secondLock->isCurrentlyOwnedBy($firstLock->owner()));
         $this->assertFalse($secondLock->isOwnedByCurrentProcess());
     }
 }
diff --git a/tests/Integration/Cache/RedisCacheLockTest.php b/tests/Integration/Cache/RedisCacheLockTest.php
@@ -126,9 +126,12 @@ public function testOtherOwnerDoesNotOwnLockAfterRestore()
         Cache::store('redis')->lock('foo')->forceRelease();
 
         $firstLock = Cache::store('redis')->lock('foo', 10);
+        $this->assertTrue($firstLock->isCurrentlyOwnedBy(null));
         $this->assertTrue($firstLock->get());
+        $this->assertTrue($firstLock->isCurrentlyOwnedBy($firstLock->owner()));
 
         $secondLock = Cache::store('redis')->restoreLock('foo', 'other_owner');
+        $this->assertFalse($secondLock->isCurrentlyOwnedBy($firstLock->owner()));
         $this->assertFalse($secondLock->isOwnedByCurrentProcess());
     }
 }
diff --git a/tests/Integration/Database/DatabaseLockTest.php b/tests/Integration/Database/DatabaseLockTest.php
@@ -56,4 +56,16 @@ public function testExpiredLockCanBeRetrieved()
 
         $otherLock->release();
     }
+
+    public function testOtherOwnerDoesNotOwnLockAfterRestore()
+    {
+        $firstLock = Cache::store('database')->lock('foo');
+        $this->assertTrue($firstLock->isCurrentlyOwnedBy(null));
+        $this->assertTrue($firstLock->get());
+        $this->assertTrue($firstLock->isCurrentlyOwnedBy($firstLock->owner()));
+
+        $secondLock = Cache::store('database')->restoreLock('foo', 'other_owner');
+        $this->assertFalse($secondLock->isCurrentlyOwnedBy($firstLock->owner()));
+        $this->assertFalse($secondLock->isOwnedByCurrentProcess());
+    }
 }