replace setter injection with constructor params injection

Author: mathroc

README.md

@@ -114,24 +114,19 @@ The only `LockFactory` available at the moment is the `TH\Lock\FileFactory`. Thi
 use TH\Lock\FileFactory;
 
 $factory = new FileFactory('/path/to/lock_dir/');
-$factory->setLogger($psrLogger);
-
-$factory->create(...);
+$lock = $factory->create('resource identifier');
 ```
 
 ## API
 
-There are three methods you can use on a `FileLock`:
+There are two methods you can use on a `FileLock`:
 
 * `\TH\Lock\FileLock::acquire($exclusive = FileLock::EXCLUSIVE, $blocking = FileLock::NON_BLOCKING)` used to acquire a lock on the file
 * `\TH\Lock\FileLock::release()` used to release a lock on the file
-* `\TH\Lock\FileLock::setLogger(\Psr\Log\LoggerInterface $logger)` used to configure this lock logger (configured by the factory if the `LockFile` come from the factory)
 
-And two on `FileFactory':
+And one on a `FileFactory':
 
 * `\TH\Lock\FileFactory::create($resource, $owner = null)` used to create a `FileLock` for $resource
-* `\TH\Lock\FileFactory::setLogger(\Psr\Log\LoggerInterface $logger)` used to configure lock build by this factory
-`
 
 ## Notes
 

src/FileFactory.php

@@ -8,19 +8,16 @@
 class FileFactory implements LockFactory
 {
     private $lock_dir;
-    private $logger;
     private $hash_algo;
 
-    public function __construct($lock_dir, $hash_algo = 'sha256')
+    private $logger;
+
+    public function __construct($lock_dir, $hash_algo = 'sha256', LoggerInterface $logger = null)
     {
-        $this->logger    = new NullLogger;
         $this->lock_dir  = $lock_dir;
         $this->hash_algo = $hash_algo;
-    }
 
-    public function setLogger(LoggerInterface $logger)
-    {
-        $this->logger = $logger;
+        $this->logger = $logger ?: new NullLogger;
     }
 
     public function create($resource, $owner = null)
@@ -31,9 +28,7 @@ public function create($resource, $owner = null)
 
         $path = $this->lock_dir.'/'.hash($this->hash_algo, serialize($resource)).'.lock';
 
-        $lock = new FileLock($path, $resource, $owner, true);
-
-        $lock->setLogger($this->logger);
+        $lock = new FileLock($path, $resource, $owner, true, $this->logger);
 
         return $lock;
     }

src/FileLock.php

@@ -23,19 +23,25 @@ class FileLock implements Lock
     private $logger;
 
     /**
-     * @param string       $lock_file         path to file
-     * @param string|null  $identifier        resource identifier (default to $lock_file) for logging
-     * @param string|null  $owner             owner name for logging
-     * @param boolean      $remove_on_release remove file on release if no other lock remains
+     * @param string          $lock_file         path to file
+     * @param string|null     $identifier        resource identifier (default to $lock_file) for logging
+     * @param string|null     $owner             owner name for logging
+     * @param boolean         $remove_on_release remove file on release if no other lock remains
+     * @param LoggerInterface $logger
      */
-    public function __construct($lock_file, $identifier = null, $owner = null, $remove_on_release = false)
-    {
+    public function __construct(
+        $lock_file,
+        $identifier = null,
+        $owner = null,
+        $remove_on_release = false,
+        LoggerInterface $logger = null
+    ) {
         $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;
+        $this->logger = $logger ?: new NullLogger;
     }
 
     /**
@@ -107,11 +113,6 @@ public function release()
         ]);
     }
 
-    public function setLogger(LoggerInterface $logger)
-    {
-        $this->logger = $logger;
-    }
-
     public function __destruct()
     {
         $this->release();

src/Lock.php

@@ -17,11 +17,4 @@ public function acquire();
      * @return void
      */
     public function release();
-
-    /**
-     * Replace lock logger
-     * @param LoggerInterface $logger
-     * @return void
-     */
-    public function setLogger(LoggerInterface $logger);
 }

src/LockFactory.php

@@ -13,10 +13,4 @@ interface LockFactory
      * @return Lock
      */
     public function create($resource, $owner = null);
-
-    /**
-     * @param LoggerInterface $logger
-     * @return void
-     */
-    public function setLogger(LoggerInterface $logger);
 }