Add PHP 7.4 compatibility (#20)

* php 7.4 compatible code

* more

* github workflow

* fix

* revert require phpstan/phpstan 1.0. as identifiers in baseline is only available in 2.0:
phpstan/phpstan-src@c8b7ea9

---------

Co-authored-by: Simon Bigelmayr <[email protected]>

Author: simbig

.github/workflows/checks.yml

@@ -31,7 +31,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-version: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
+                php-version: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
                 dependency-version: [ prefer-lowest, prefer-stable ]
         steps:
             -

composer.json

@@ -13,9 +13,9 @@
         "error identifier"
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^7.4 || ^8.0",
         "nette/neon": "^3.3.3 || ^4.0",
-        "phpstan/phpstan": "^2.0.0"
+        "phpstan/phpstan": "^2"
     },
     "require-dev": {
         "editorconfig-checker/editorconfig-checker": "10.6.0",

src/BaselinePerIdentifierFormatter.php

@@ -130,7 +130,7 @@ private function getPathDifference(string $from, string $to): string
         $toParts = explode(DIRECTORY_SEPARATOR, $to);
 
         // Find the common base path
-        while (count($fromParts) > 0 && count($toParts) > 0 && ($fromParts[0] === $toParts[0])) {
+        while ($fromParts !== [] && $toParts !== [] && ($fromParts[0] === $toParts[0])) {
             array_shift($fromParts);
             array_shift($toParts);
         }

src/BaselineSplitter.php

@@ -18,10 +18,11 @@
 class BaselineSplitter
 {
 
-    public function __construct(
-        private string $indent
-    )
+    private string $indent;
+
+    public function __construct(string $indent)
     {
+        $this->indent = $indent;
     }
 
     /**
@@ -97,9 +98,23 @@ private function groupErrorsByIdentifier(array $errors, string $folder): array
 
             $identifier = $error['identifier'] ?? 'missing-identifier';
 
-            $message = $error['message'] ?? throw new ErrorException("Ignored error #$index is missing 'message'");
-            $count = $error['count'] ?? throw new ErrorException("Ignored error #$index is missing 'count'");
-            $path = $error['path'] ?? throw new ErrorException("Ignored error #$index is missing 'path'");
+            if (!isset($error['message'])) {
+                throw new ErrorException("Ignored error #$index is missing 'message'");
+            }
+
+            $message = $error['message'];
+
+            if (!isset($error['count'])) {
+                throw new ErrorException("Ignored error #$index is missing 'count'");
+            }
+
+            $count = $error['count'];
+
+            if (!isset($error['path'])) {
+                throw new ErrorException("Ignored error #$index is missing 'path'");
+            }
+
+            $path = $error['path'];
 
             assert(is_string($identifier));
             assert(is_string($message));

src/Handler/HandlerFactory.php

@@ -12,11 +12,16 @@ class HandlerFactory
      */
     public static function create(string $extension): BaselineHandler
     {
-        return match ($extension) {
-            'neon' => new NeonBaselineHandler(),
-            'php' => new PhpBaselineHandler(),
-            default => throw new ErrorException("Invalid baseline file extension '$extension', expected neon or php file"),
-        };
+        switch ($extension) {
+            case 'neon':
+                return new NeonBaselineHandler();
+
+            case 'php':
+                return new PhpBaselineHandler();
+
+            default:
+                throw new ErrorException("Invalid baseline file extension '$extension', expected neon or php file");
+        }
     }
 
 }

src/Handler/NeonBaselineHandler.php

@@ -6,7 +6,7 @@
 use Nette\Neon\Neon;
 use ShipMonk\PHPStan\Baseline\Exception\ErrorException;
 use ShipMonk\PHPStan\Baseline\NeonHelper;
-use function get_debug_type;
+use function gettype;
 use function is_array;
 
 class NeonBaselineHandler implements BaselineHandler
@@ -19,7 +19,7 @@ public function decodeBaseline(string $filepath): array
             $decoded = Neon::decodeFile($filepath);
 
             if (!is_array($decoded)) {
-                throw new ErrorException('Invalid neon file: root must be an array, ' . get_debug_type($decoded) . ' given');
+                throw new ErrorException('Invalid neon file: root must be an array, ' . gettype($decoded) . ' given');
             }
 
             return $decoded;

src/Handler/PhpBaselineHandler.php

@@ -4,7 +4,7 @@
 
 use ShipMonk\PHPStan\Baseline\Exception\ErrorException;
 use Throwable;
-use function get_debug_type;
+use function gettype;
 use function is_array;
 use function sprintf;
 use function var_export;
@@ -15,12 +15,10 @@ class PhpBaselineHandler implements BaselineHandler
     public function decodeBaseline(string $filepath): array
     {
         try {
-            $decoded = (static function () use ($filepath): mixed {
-                return require $filepath;
-            })();
+            $decoded = (static fn() => require $filepath)();
 
             if (!is_array($decoded)) {
-                throw new ErrorException("File '$filepath' must return array, " . get_debug_type($decoded) . ' given');
+                throw new ErrorException("File '$filepath' must return array, " . gettype($decoded) . ' given');
             }
 
             return $decoded;

src/NeonHelper.php

@@ -10,9 +10,12 @@
 class NeonHelper
 {
 
-    public static function encode(mixed $data, string $indent): string
+    /**
+     * @param mixed $data
+     */
+    public static function encode($data, string $indent): string
     {
-        return trim(Neon::encode($data, blockMode: true, indentation: $indent)) . "\n";
+        return trim(Neon::encode($data, true, $indent)) . "\n";
     }
 
     public static function escape(string $value): string

tests/Rule/BaselinePerIdentifierFormatterTest.php

@@ -10,7 +10,7 @@
 use function sys_get_temp_dir;
 use function uniqid;
 
-class BaselinePerIdentifierFormatterTest extends PHPStanTestCase
+final class BaselinePerIdentifierFormatterTest extends PHPStanTestCase
 {
 
     public function testFormat(): void

tests/SplitterTest.php

@@ -14,7 +14,7 @@
 use function uniqid;
 use function var_export;
 
-class SplitterTest extends TestCase
+final class SplitterTest extends TestCase
 {
 
     public function testBinaryWithNeon(): void