Looks like we need separate method

arvenil · Jun 12, 2015 · d4f516f · d4f516f
1 parent 3f0b3c5
commit d4f516f
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 3 deletions.
diff --git a/src/NinjaMutex/Lock/LockExpirationInterface.php b/src/NinjaMutex/Lock/LockExpirationInterface.php
@@ -20,4 +20,10 @@ interface LockExpirationInterface
      * @param int $expiration Expiration time of the lock in seconds.
      */
     public function setExpiration($expiration);
+
+    /**
+     * @param  string $name
+     * @return bool
+     */
+    public function clearLock($name);
 }
diff --git a/src/NinjaMutex/Lock/MemcacheLock.php b/src/NinjaMutex/Lock/MemcacheLock.php
@@ -61,6 +61,23 @@ public function setExpiration($expiration)
         $this->expiration = $expiration;
     }
 
+    /**
+     * Clear lock without releasing it
+     * Do not use this method unless you know what you do
+     *
+     * @param  string $name name of lock
+     * @return bool
+     */
+    public function clearLock($name)
+    {
+        if (!isset($this->locks[$name])) {
+            return false;
+        }
+
+        unset($this->locks[$name]);
+        return true;
+    }
+
     /**
      * @param  string $name name of lock
      * @param  bool   $blocking
@@ -83,7 +100,7 @@ protected function getLock($name, $blocking)
      */
     public function releaseLock($name)
     {
-        if (isset($this->locks[$name]) && ($this->memcache->delete($name) || !$this->isLocked($name))) {
+        if (isset($this->locks[$name]) && $this->memcache->delete($name)) {
             unset($this->locks[$name]);
 
             return true;

diff --git a/src/NinjaMutex/Lock/MemcachedLock.php b/src/NinjaMutex/Lock/MemcachedLock.php
@@ -61,6 +61,23 @@ public function setExpiration($expiration)
         $this->expiration = $expiration;
     }
 
+    /**
+     * Clear lock without releasing it
+     * Do not use this method unless you know what you do
+     *
+     * @param  string $name name of lock
+     * @return bool
+     */
+    public function clearLock($name)
+    {
+        if (!isset($this->locks[$name])) {
+            return false;
+        }
+
+        unset($this->locks[$name]);
+        return true;
+    }
+
     /**
      * @param  string $name name of lock
      * @param  bool   $blocking
@@ -83,7 +100,7 @@ protected function getLock($name, $blocking)
      */
     public function releaseLock($name)
     {
-        if (isset($this->locks[$name]) && ($this->memcached->delete($name) || !$this->isLocked($name))) {
+        if (isset($this->locks[$name]) && $this->memcached->delete($name)) {
             unset($this->locks[$name]);
 
             return true;

diff --git a/tests/NinjaMutex/Lock/LockTest.php b/tests/NinjaMutex/Lock/LockTest.php
@@ -191,6 +191,8 @@ public function testExpiration(LockFabricWithExpirationInterface $lockFabricWith
 
         // Cleanup
         $this->assertTrue($lockImplementor->releaseLock($name, 0));
-        $this->assertTrue($lockImplementorWithExpiration->releaseLock($name, 0));
+        // Expired lock is unusable, we need to clean it's lock state or otherwise
+        // it will invoke in __destruct Exception (php*) or Fatal Error (hhvm)
+        $this->assertTrue($lockImplementorWithExpiration->clearLock($name, 0));
     }
 }