only remove locked file after release for lock file created with factory

Author: mathroc

spec/TH/Lock/FileLockSpec.php

@@ -64,8 +64,6 @@ public function it_should_release_a_lock()
         $this->acquire(FileLock::SHARED);
         $this->release();
 
-        touch($this->lock_file);
-
         if (!flock(fopen($this->lock_file, 'r'), LOCK_EX|LOCK_NB)) {
             throw new Exception('Lock file was not released');
         }
@@ -81,6 +79,8 @@ public function it_should_throw_if_it_cannot_lock()
 
     public function it_remove_its_lock_file_if_not_locked()
     {
+        $this->beConstructedWith($this->lock_file, null, null, true);
+
         $this->acquire();
         $this->release();
 
@@ -91,6 +91,8 @@ public function it_remove_its_lock_file_if_not_locked()
 
     public function it_does_not_remove_its_lock_file_if_still_locked()
     {
+        $this->beConstructedWith($this->lock_file, null, null, true);
+
         touch($this->lock_file);
         flock(fopen($this->lock_file, 'r'), LOCK_SH|LOCK_NB);
 
@@ -104,6 +106,8 @@ public function it_does_not_remove_its_lock_file_if_still_locked()
 
     public function it_can_acquire_then_release_and_acquire_again()
     {
+        $this->beConstructedWith($this->lock_file, null, null, true);
+
         $this->acquire();
         $this->release();
         $this->acquire();

src/FileFactory.php

@@ -31,7 +31,7 @@ public function create($resource, $owner = null)
 
         $path = $this->lock_dir.'/'.hash($this->hash_algo, serialize($resource)).'.lock';
 
-        $lock = new FileLock($path, $resource, $owner);
+        $lock = new FileLock($path, $resource, $owner, true);
 
         $lock->setLogger($this->logger);
 

src/FileLock.php

@@ -18,12 +18,14 @@ class FileLock implements Lock
     private $identifier;
     private $owner;
     private $fh;
+    private $remove_on_release;
 
-    public function __construct($lock_file, $identifier = null, $owner = null)
+    public function __construct($lock_file, $identifier = null, $owner = null, $remove_on_release = false)
     {
-        $this->lock_file  = $lock_file;
-        $this->identifier = $identifier?:$lock_file;
-        $this->owner      = $owner === null ? '' : $owner.': ';
+        $this->lock_file         = $lock_file;
+        $this->identifier        = $identifier?:$lock_file;
+        $this->owner             = $owner === null ? '' : $owner.': ';
+        $this->remove_on_release = $remove_on_release;
 
         $this->logger = new NullLogger;
     }
@@ -63,7 +65,7 @@ public function release()
             return;
         }
 
-        if(flock($this->fh, LOCK_EX)) {
+        if($this->remove_on_release && flock($this->fh, LOCK_EX)) {
             fclose($this->fh);
             $this->fh = null;
             unlink($this->lock_file);