finally and refactor

Author: cesargb

README.md

@@ -50,6 +50,7 @@ $rotation = new Rotation([
     'truncate' => false,
     'then' => function ($filename) {},
     'catch' => function (RotationFailed $exception) {},
+    'finally' => function ($message, $filename) {},
 ]);
 
 $rotation->rotate('file.log');

src/ErrorHandler.php

@@ -7,12 +7,26 @@
 
 trait ErrorHandler
 {
+    private $thenCallback = null;
+
     private $catchCallable = null;
 
-    protected $finallyCallback = null;
+    private $finallyCallback = null;
 
     private ?string $_filename = null;
 
+    /**
+     * Function that will be executed when the rotation is successful.
+     * The first argument will be the name of the destination file and
+     * the second the name of the rotated file.
+     */
+    public function then(callable $callable): self
+    {
+        $this->thenCallback = $callable;
+
+        return $this;
+    }
+
     /**
      * Call function if roteted catch any Exception.
      */
@@ -23,11 +37,32 @@ public function catch(callable $callable): self
         return $this;
     }
 
+    /**
+     * Function that will be executed when the process was finished.
+     */
+    public function finally(callable $callable): self
+    {
+        $this->finallyCallback = $callable;
+
+        return $this;
+    }
+
     protected function setFilename(string $filename): void
     {
         $this->_filename = $filename;
     }
 
+    private function sucessfull(string $filenameSource, ?string $filenameRotated): void
+    {
+        $this->finished($filenameRotated, 'sucessfull');
+
+        if (is_null($this->thenCallback) || is_null($filenameRotated)) {
+            return;
+        }
+
+        call_user_func($this->thenCallback, $filenameRotated, $filenameSource);
+    }
+
     protected function exception(Throwable $exception): self
     {
         $this->finished($this->_filename, $exception->getMessage());
@@ -41,6 +76,7 @@ protected function exception(Throwable $exception): self
         return $this;
     }
 
+
     protected function finished(string $filenameSource, string $message): void
     {
         if (is_null($this->finallyCallback)) {

src/Rotation.php

@@ -19,8 +19,6 @@ class Rotation
 
     private bool $_truncate = false;
 
-    private $thenCallback = null;
-
     public function __construct(array $options = [])
     {
         $this->processor = new RotativeProcessor();
@@ -88,28 +86,6 @@ public function minSize(int $bytes): self
         return $this;
     }
 
-    /**
-     * Function that will be executed when the rotation is successful.
-     * The first argument will be the name of the destination file and
-     * the second the name of the rotated file.
-     */
-    public function then(callable $callable): self
-    {
-        $this->thenCallback = $callable;
-
-        return $this;
-    }
-
-    /**
-     * Function that will be executed when the process was finished.
-     */
-    public function finally(callable $callable): self
-    {
-        $this->finallyCallback = $callable;
-
-        return $this;
-    }
-
     /**
      * Rotate file.
      *
@@ -178,17 +154,6 @@ private function runCompress(string $filename): ?string
         }
     }
 
-    private function sucessfull(string $filenameSource, ?string $filenameRotated): void
-    {
-        if (is_null($this->thenCallback) || is_null($filenameRotated)) {
-            return;
-        }
-
-        call_user_func($this->thenCallback, $filenameRotated, $filenameSource);
-
-        $this->finished($filenameRotated, 'sucessfull');
-    }
-
     /**
      * check if file need rotate.
      */

tests/ErrorHandlerTest.php

@@ -7,6 +7,34 @@
 
 class ErrorHandlerTest extends TestCase
 {
+    public function testCallThenIfRotateWasSucessfull()
+    {
+        file_put_contents(self::DIR_WORK.'file.log', microtime(true));
+
+        $rotation = new Rotation();
+
+        $thenCalled = false;
+
+        $rotation->then(function () use (&$thenCalled) {
+            $thenCalled = true;
+        })->rotate(self::DIR_WORK.'file.log');
+
+        $this->assertTrue($thenCalled);
+    }
+
+    public function testNotCallThenIfRotateNotWasSucessfull()
+    {
+        $rotation = new Rotation();
+
+        $thenCalled = false;
+
+        $rotation->then(function () use (&$thenCalled) {
+            $thenCalled = true;
+        })->rotate(self::DIR_WORK.'file.log');
+
+        $this->assertFalse($thenCalled);
+    }
+
     public function testThrowsException()
     {
         $this->expectException(RotationFailed::class);
@@ -39,4 +67,50 @@ public function testCatchException()
 
         $this->assertFalse($result);
     }
+
+    public function testCallFinallyIfRotateWasSucessfull()
+    {
+        file_put_contents(self::DIR_WORK.'file.log', microtime(true));
+
+        $rotation = new Rotation();
+
+        $finallyCalled = false;
+
+        $rotation->finally(function () use (&$finallyCalled) {
+            $finallyCalled = true;
+        })->rotate(self::DIR_WORK.'file.log');
+
+        $this->assertTrue($finallyCalled);
+    }
+
+    public function testCallFinallyIfFileDontExists()
+    {
+        $rotation = new Rotation();
+
+        $finallyCalled = false;
+
+        $rotation->finally(function () use (&$finallyCalled) {
+            $finallyCalled = true;
+        })->rotate(self::DIR_WORK.'file.log');
+
+        $this->assertTrue($finallyCalled);
+    }
+
+    public function testCallFinallyIfThrowException()
+    {
+        $this->expectException(RotationFailed::class);
+
+        $rotation = new Rotation();
+
+        touch(self::DIR_WORK.'/file.log');
+        chmod(self::DIR_WORK.'/file.log', 0444);
+
+        $finallyCalled = false;
+
+        $rotation->finally(function () use (&$finallyCalled) {
+            $finallyCalled = true;
+        })->rotate(self::DIR_WORK.'file.log');
+
+        $this->assertTrue($finallyCalled);
+    }
 }