Improve PHPStan coverage and add precise type annotations

Author: mohorev

composer.json

@@ -8,7 +8,7 @@
         "php": "^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.5.8|^9.3.3",
+        "phpunit/phpunit": "^9.6",
         "phpstan/phpstan": "^1.8"
     },
     "autoload": {

phpstan.neon

@@ -1,6 +1,4 @@
 parameters:
-    ignoreErrors:
-        - '#no value type specified in iterable type array#'
     level: max
     paths:
         - src

src/Options/FormatQuality.php

@@ -9,7 +9,7 @@
 final class FormatQuality extends AbstractOption
 {
     /**
-     * @var array[]
+     * @var list<array{string, int}>
      */
     private array $options = [];
 
@@ -19,8 +19,8 @@ final class FormatQuality extends AbstractOption
     public function __construct(array $options)
     {
         foreach ($options as $format => $quality) {
-            $data = (new Quality($quality))->data();
-            $this->options[] = [$format, ...$data];
+            $quality = (new Quality($quality))->quality();
+            $this->options[] = [$format, $quality];
         }
 
         if (empty($this->options)) {

src/Options/Quality.php

@@ -9,13 +9,18 @@
 final class Quality extends AbstractOption
 {
     public function __construct(
-        private int $quality,
+        public int $quality,
     ) {
         if ($quality < 0 || $quality > 100) {
             throw new InvalidArgumentException(sprintf('Invalid quality: %s', $quality));
         }
     }
 
+    public function quality(): int
+    {
+        return $this->quality;
+    }
+
     /**
      * @inheritDoc
      */

tests/Options/AutoRotateTest.php

@@ -24,7 +24,7 @@ public function testCreateDefault(): void
     }
 
     /**
-     * @return array[]
+     * @return list<array{bool, string}>
      */
     public function exampleData(): array
     {

tests/Options/BackgroundTest.php

@@ -31,7 +31,7 @@ public function testCreateFail(string $color): void
     }
 
     /**
-     * @return array[]
+     * @return list<array{string, string}>
      */
     public function validData(): array
     {
@@ -43,7 +43,7 @@ public function validData(): array
     }
 
     /**
-     * @return array[]
+     * @return list<array{string}>
      */
     public function invalidData(): array
     {

tests/Options/BlurTest.php

@@ -29,7 +29,7 @@ public function testCreateFail(float $sigma): void
     }
 
     /**
-     * @return array[]
+     * @return list<array{int|float, string}>
      */
     public function validData(): array
     {
@@ -42,7 +42,7 @@ public function validData(): array
     }
 
     /**
-     * @return array[]
+     * @return list<array{int|float}>
      */
     public function invalidData(): array
     {

tests/Options/CropTest.php

@@ -52,7 +52,7 @@ public function testCreateFailInvalidGravity(string $gravity, string $message):
     }
 
     /**
-     * @return array[]
+     * @return list<array{int, int, string|Gravity|null, string}>
      */
     public function validData(): array
     {
@@ -70,7 +70,7 @@ public function validData(): array
     }
 
     /**
-     * @return array[]
+     * @return list<array{int}>
      */
     public function invalidData(): array
     {
@@ -81,7 +81,7 @@ public function invalidData(): array
     }
 
     /**
-     * @return array[]
+     * @return list<array{string, string}>
      */
     public function invalidGravityData(): array
     {

tests/Options/DprTest.php

@@ -29,7 +29,7 @@ public function testCreateFail(int $dpr): void
     }
 
     /**
-     * @return array[]
+     * @return list<array{int, string}>
      */
     public function validData(): array
     {
@@ -40,7 +40,7 @@ public function validData(): array
     }
 
     /**
-     * @return array[]
+     * @return list<array{int}>
      */
     public function invalidData(): array
     {

tests/Options/EnforceThumbnailTest.php

@@ -24,7 +24,7 @@ public function testCreateDefault(): void
     }
 
     /**
-     * @return array[]
+     * @return list<array{string|null, string}>
      */
     public function exampleData(): array
     {