PSR-12

Author: mathroc

Diff for: spec/TH/Lock/FileFactorySpec.php

@@ -2,9 +2,12 @@
 
 namespace spec\TH\Lock;
 
-use VirtualFileSystem\FileSystem;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
+use TH\Lock\Factory;
+use TH\Lock\FileFactory;
+use TH\Lock\FileLock;
+use VirtualFileSystem\FileSystem;
 
 class FileFactorySpec extends ObjectBehavior
 {
@@ -21,12 +24,12 @@ public function let()
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType('TH\Lock\FileFactory');
-        $this->shouldImplement('TH\Lock\Factory');
+        $this->shouldHaveType(FileFactory::class);
+        $this->shouldImplement(Factory::class);
     }
 
     public function it_should_create_a_file_lock()
     {
-        $this->create('some resource identifier')->shouldhaveType('TH\Lock\FileLock');
+        $this->create('some resource identifier')->shouldhaveType(FileLock::class);
     }
 }

Diff for: spec/TH/Lock/FileLockSpec.php

@@ -2,11 +2,11 @@
 
 namespace spec\TH\Lock;
 
-use VirtualFileSystem\FileSystem;
-use TH\Lock\FileLock;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
-use Exception;
+use TH\Lock\FileLock;
+use TH\Lock\Lock;
+use VirtualFileSystem\FileSystem;
 
 class FileLockSpec extends ObjectBehavior
 {
@@ -25,20 +25,20 @@ public function let()
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType('TH\Lock\FileLock');
-        $this->shouldImplement('TH\Lock\Lock');
+        $this->shouldHaveType(FileLock::class);
+        $this->shouldImplement(Lock::class);
     }
 
     public function it_should_acquire_an_exclusive_lock()
     {
         $this->acquire();
 
         if (!file_exists($this->lock_file)) {
-            throw new Exception('Lock file was not created');
+            throw new \Exception('Lock file was not created');
         }
 
         if (flock(fopen($this->lock_file, 'r'), LOCK_SH|LOCK_NB)) {
-            throw new Exception('Lock file was not exclusively locked');
+            throw new \Exception('Lock file was not exclusively locked');
         }
     }
 
@@ -49,15 +49,15 @@ public function it_should_acquire_a_shared_lock()
         $this->acquire();
 
         if (!file_exists($this->lock_file)) {
-            throw new Exception('Lock file was not created');
+            throw new \Exception('Lock file was not created');
         }
 
         if (flock(fopen($this->lock_file, 'r'), LOCK_EX|LOCK_NB)) {
-            throw new Exception('Lock file was not locked againt exclusive lock');
+            throw new \Exception('Lock file was not locked againt exclusive lock');
         }
 
         if (!flock(fopen($this->lock_file, 'r'), LOCK_SH|LOCK_NB)) {
-            throw new Exception('Lock file was not shared locked');
+            throw new \Exception('Lock file was not shared locked');
         }
     }
 
@@ -67,7 +67,7 @@ public function it_should_release_a_lock()
         $this->release();
 
         if (!flock(fopen($this->lock_file, 'r'), LOCK_EX|LOCK_NB)) {
-            throw new Exception('Lock file was not released');
+            throw new \Exception('Lock file was not released');
         }
     }
 
@@ -87,7 +87,7 @@ public function it_remove_its_lock_file_if_not_locked()
         $this->release();
 
         if (file_exists($this->lock_file)) {
-            throw new Exception('Lock file was not removed');
+            throw new \Exception('Lock file was not removed');
         }
     }
 
@@ -102,7 +102,7 @@ public function it_does_not_remove_its_lock_file_if_still_locked()
         $this->release();
 
         if (!file_exists($this->lock_file)) {
-            throw new Exception('Lock file was removed');
+            throw new \Exception('Lock file was removed');
         }
     }
 
@@ -115,11 +115,11 @@ public function it_can_acquire_then_release_and_acquire_again()
         $this->acquire();
 
         if (!file_exists($this->lock_file)) {
-            throw new Exception('Lock file was not created');
+            throw new \Exception('Lock file was not created');
         }
 
         if (flock(fopen($this->lock_file, 'r'), LOCK_SH|LOCK_NB)) {
-            throw new Exception('Lock file was not exclusively locked');
+            throw new \Exception('Lock file was not exclusively locked');
         }
 
         $this->release();

Diff for: src/FileLock.php

@@ -4,7 +4,6 @@
 
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
-use Exception;
 
 class FileLock implements Lock
 {
@@ -82,7 +81,7 @@ private function tryAcquire($operation, $lock_type)
         if (!$this->flock($operation)) {
             $this->logger->debug('could not acquire {lock_type} lock on {lock_file}', $log_data);
 
-            throw new Exception(
+            throw new \Exception(
                 'Could not acquire '.$lock_type.' lock on '.$this->lock_file
             );
 
@@ -123,7 +122,7 @@ private function flock($operation)
         }
 
         if (!is_resource($this->fh)) {
-            throw new Exception('Could not open lock file '.$this->lock_file);
+            throw new \Exception('Could not open lock file '.$this->lock_file);
         }
 
         return flock($this->fh, $operation);