remove support php74 and phpstan level 9 (#18)

* remove support to php74
* phpstan level 9
* fix optionable

Author: cesargb

.github/workflows/tests.yml

@@ -8,7 +8,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [8.2, 8.1, 8.0, 7.4]
+                php: [8.2, 8.1, 8.0]
 
         name: P${{ matrix.php }}
 
@@ -25,6 +25,6 @@ jobs:
             - name: Install dependencies
               run: |
                   composer update --prefer-dist --no-interaction
-                  
+
             - name: Execute tests
               run: composer test

composer.json

@@ -16,7 +16,7 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.4 || ^8.0"
+        "php": "^8.0"
     },
     "autoload": {
         "psr-4": {

phpstan.neon.dist

@@ -5,4 +5,4 @@ parameters:
         - tests
 
     # The level 9 is the highest level
-    level: 5
+    level: 9

src/Compress/Gz.php

@@ -27,7 +27,11 @@ public function handler(string $filename): string
         }
 
         while (!feof($fd)) {
-            gzwrite($gz, fread($fd, 1024 * 512));
+            $data = fread($fd, 1024 * 512);
+
+            $data = $data === false ? '' : $data;
+
+            gzwrite($gz, $data);
         }
 
         gzclose($gz);

src/ErrorHandler.php

@@ -21,7 +21,7 @@ trait ErrorHandler
      * 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
+    public function then(Closure $callable): self
     {
         $this->thenCallback = $callable;
 
@@ -31,7 +31,7 @@ public function then(callable $callable): self
     /**
      * Call function if roteted catch any Exception.
      */
-    public function catch(callable $callable): self
+    public function catch(Closure $callable): self
     {
         $this->catchCallable = $callable;
 
@@ -41,7 +41,7 @@ public function catch(callable $callable): self
     /**
      * Function that will be executed when the process was finished.
      */
-    public function finally(callable $callable): self
+    public function finally(Closure $callable): self
     {
         $this->finallyCallback = $callable;
 

src/Optionable.php

@@ -6,12 +6,15 @@
 
 trait Optionable
 {
-    private $validMethods = [];
+    /**
+     * @var string[]
+     */
+    private array $validMethods = [];
 
     /**
      * Set options
      *
-     * @param array $options
+     * @param mixed[] $options
      * @throws LogicException
      * @return self
      */
@@ -24,14 +27,17 @@ public function options(array $options): self
         return $this;
     }
 
+    /**
+     * @param string[] $methods
+     */
     protected function methodsOptionables(array $methods): self
     {
         $this->validMethods = $methods;
 
         return $this;
     }
 
-    private function setMethod($key, $value)
+    private function setMethod(string $key, mixed $value): void
     {
         $method = $this->convert($key);
 

src/Processors/AbstractProcessor.php

@@ -25,7 +25,7 @@ public function removeExtention(string $extension): void
         $this->extension = str_replace('.'.$extension, '', $this->extension);
     }
 
-    public function setFilenameSource($filenameSource): self
+    public function setFilenameSource(string $filenameSource): self
     {
         $this->filenameSource = $filenameSource;
 

src/Processors/RotativeProcessor.php

@@ -4,7 +4,7 @@
 
 class RotativeProcessor extends AbstractProcessor
 {
-    private $maxFiles = 366;
+    private int $maxFiles = 366;
 
     /**
      * Log files are rotated count times before being removed.

src/Rotation.php

@@ -19,6 +19,9 @@ class Rotation
 
     private bool $_truncate = false;
 
+    /**
+     * @param mixed[] $options
+     */
     public function __construct(array $options = [])
     {
         $this->processor = new RotativeProcessor();
@@ -199,25 +202,15 @@ private function copyAndTruncate(string $filename): ?string
     {
         clearstatcache();
 
-        $filenameTarget = tempnam(dirname($filename), 'LOG');
-
-        $fd = fopen($filename, 'r+');
-
-        if ($fd === false) {
-            $this->exception(
-                new Exception(sprintf('the file %s not can open.', $filename), 20)
-            );
+        $filenameTarget = $this->getTempFilename(dirname($filename));
 
+        if (!$filenameTarget) {
             return null;
         }
 
-        if (!flock($fd, LOCK_EX)) {
-            fclose($fd);
-
-            $this->exception(
-                new Exception(sprintf('the file %s not can lock.', $filename), 21)
-            );
+        $fd = $this->openFileWithLock($filename);
 
+        if (!$fd) {
             return null;
         }
 
@@ -259,7 +252,11 @@ private function move(string $filename): ?string
     {
         clearstatcache();
 
-        $filenameTarget = tempnam(dirname($filename), 'LOG');
+        $filenameTarget = $this->getTempFilename(dirname($filename));
+
+        if (!$filenameTarget) {
+            return null;
+        }
 
         if (!rename($filename, $filenameTarget)) {
             $this->exception(
@@ -274,4 +271,47 @@ private function move(string $filename): ?string
 
         return $filenameTarget;
     }
+
+    private function getTempFilename(string $path): ?string
+    {
+        $filename = tempnam($path, 'LOG');
+
+        if ($filename === false) {
+            $this->exception(
+                new Exception(sprintf('the file %s not can create temp file.', $path), 19)
+            );
+
+            return null;
+        }
+
+        return $filename;
+    }
+
+    /**
+     * @return null|resource
+     */
+    private function openFileWithLock(string $filename)
+    {
+        $fd = fopen($filename, 'r+');
+
+        if ($fd === false) {
+            $this->exception(
+                new Exception(sprintf('the file %s not can open.', $filename), 20)
+            );
+
+            return null;
+        }
+
+        if (!flock($fd, LOCK_EX)) {
+            fclose($fd);
+
+            $this->exception(
+                new Exception(sprintf('the file %s not can lock.', $filename), 21)
+            );
+
+            return null;
+        }
+
+        return $fd;
+    }
 }

tests/Compress/GzTest.php

@@ -7,7 +7,7 @@
 
 class GzTest extends TestCase
 {
-    public function testRotationProcessorWithGzProcessor()
+    public function testRotationProcessorWithGzProcessor(): void
     {
         $rotation = new Rotation();
 
@@ -31,6 +31,6 @@ public function testRotationProcessorWithGzProcessor()
 
         $this->assertFileExists(self::DIR_WORK.'file.log.1.gz');
 
-        $this->assertEquals($content, implode('', gzfile(self::DIR_WORK.'file.log.1.gz')));
+        $this->assertEquals($content, implode('', (array)gzfile(self::DIR_WORK.'file.log.1.gz')));
     }
 }