Merge pull request #3 from dotkernel/issue-2

issue 2

Author: MarioRadu

src/Application.php

@@ -45,7 +45,7 @@ public function __destruct()
      */
     public function doRun(InputInterface $input, OutputInterface $output): int
     {
-        $this->fileLocker->setCommandName($this->getCommandName($input));
+        $this->fileLocker->setCommandName($this->getCommandName($input))->initLockFile();
 
         try {
             $this->fileLocker->lock();

src/FileLocker.php

@@ -25,7 +25,19 @@ class FileLocker implements FileLockerInterface
     private bool $enabled;
     private ?string $dirPath;
     private ?string $commandName;
-
+    private $lockFile;
+    
+    /**
+     * @return $this
+     */
+    public function initLockFile(): self
+    {
+        if ($this->enabled) {
+            $this->lockFile = fopen($this->getLockFilePath(), 'w+');
+        }
+        return $this;
+    }
+    
     /**
      * @return bool
      */
@@ -85,6 +97,25 @@ public function setCommandName(?string $commandName): self
         return $this;
     }
 
+    /**
+     * @return false|resource
+     */
+    public function getLockFile(): bool
+    {
+        return $this->lockFile;
+    }
+
+    /**
+     * @param bool $lockFile
+     * @return $this
+     */
+    public function setLockFile(bool $lockFile): self
+    {
+        $this->lockFile = $lockFile;
+        
+        return $this;
+    }
+
     /**
      * @return string
      */
@@ -104,18 +135,11 @@ public function lock(): void
             return;
         }
 
-        if (!is_dir($this->dirPath)) {
-            mkdir($this->dirPath);
-        }
-
-        $lockFile = $this->getLockFilePath();
-        $fp = fopen($lockFile, 'w+');
-        if (!flock($fp, LOCK_EX|LOCK_NB, $wouldBlock)) {
+        if (!flock($this->lockFile, LOCK_EX|LOCK_NB, $wouldBlock)) {
             if ($wouldBlock) {
-                throw new Exception('Another process holds the lock!');
+                throw new \Exception('Another process holds the lock!');
             }
         }
-        fclose($fp);
     }
 
     /**
@@ -126,15 +150,8 @@ public function unlock(): void
         if (!$this->enabled) {
             return;
         }
-
-        $lockFile = $this->getLockFilePath();
-        if (!file_exists($lockFile)) {
-            return;
-        }
-
-        $fp = fopen($lockFile, 'w+');
-        flock($fp, LOCK_UN);
-        fclose($fp);
-        unlink($lockFile);
+        
+        flock($this->lockFile, LOCK_UN);
+        fclose($this->lockFile);
     }
 }