drop support for old phpunit & fix github actions

Author: olekans

.github/workflows/phpstan.yml

@@ -21,6 +21,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
 
     steps:
       - name: "Checkout"

.github/workflows/tests-code-coverage.yml

@@ -18,9 +18,6 @@ jobs:
         php-version:
           - "7.4"
           - "8.0"
-          - "8.1"
-          - "8.2"
-          - "8.3"
 
     steps:
       - name: "Checkout"

.github/workflows/tests.yml

@@ -16,11 +16,10 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.4"
-          - "8.0"
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
 
     steps:
       - name: "Checkout"

composer.json

@@ -10,7 +10,7 @@
         "phpstan/phpstan": "^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5 | ^8.5 | 9.4"
+        "phpunit/phpunit": "^9.0"
     },
     "autoload": {
         "psr-4": {

src/EnumDynamicReturnTypeExtension.php

@@ -23,26 +23,26 @@ class EnumDynamicReturnTypeExtension implements DynamicStaticMethodReturnTypeExt
      *
      * @var array<string, callable>
      */
-    private $objectMethods = [];
+    private array $objectMethods = [];
 
     /**
      * Map supported static method to a callable function detecting return type
      *
      * @var array<string, callable>
      */
-    private $staticMethods = [];
+    private array $staticMethods = [];
 
     /**
      * Buffer of all types of enumeration values
      * @phpstan-var array<class-string<Enum>, Type[]>
      */
-    private $enumValueTypesBuffer = [];
+    private array $enumValueTypesBuffer = [];
 
     /**
      * Buffer of all types of enumeration ordinals
      * @phpstan-var array<class-string<Enum>, Type[]>
      */
-    private $enumOrdinalTypesBuffer = [];
+    private array $enumOrdinalTypesBuffer = [];
 
     public function __construct()
     {

src/EnumMethodReflection.php

@@ -13,15 +13,9 @@
 
 class EnumMethodReflection implements MethodReflection
 {
-    /**
-     * @var ClassReflection
-     */
-    private $classReflection;
-
-    /**
-     * @var string
-     */
-    private $name;
+    private ClassReflection $classReflection;
+
+    private string $name;
 
     public function __construct(ClassReflection $classReflection, string $name)
     {

tests/integration/IntegrationTest.php

@@ -2,12 +2,10 @@
 
 namespace MabeEnum\PHPStan\tests\integration;
 
-use MabeEnum\Enum;
 use PHPStan\Testing\LevelsTestCase;
 
 final class IntegrationTest extends LevelsTestCase
 {
-
     /**
      * @return string[][]
      */

tests/unit/EnumDynamicReturnTypeExtensionTest.php

@@ -9,10 +9,7 @@
 
 class EnumDynamicReturnTypeExtensionTest extends PHPStanTestCase
 {
-    /**
-     * @var EnumDynamicReturnTypeExtension
-     */
-    protected $extension;
+    protected EnumDynamicReturnTypeExtension $extension;
 
     public function setUp(): void
     {

tests/unit/EnumMethodReflectionTest.php

@@ -7,21 +7,15 @@
 use MabeEnum\PHPStan\tests\assets\DocCommentEnum;
 use MabeEnum\PHPStan\tests\assets\VisibilityEnum;
 use PHPStan\Reflection\ParametersAcceptorSelector;
+use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\Type\VerbosityLevel;
 use PHPStan\Analyser\Scope;
 
 class EnumMethodReflectionTest extends PHPStanTestCase
 {
-    /**
-     * @var \PHPStan\Reflection\ReflectionProvider
-     */
-    protected $reflectionProvider;
-
-    /**
-     * @var EnumMethodsClassReflectionExtension
-     */
-    protected $reflectionExtension;
+    protected ReflectionProvider $reflectionProvider;
+    protected EnumMethodsClassReflectionExtension $reflectionExtension;
 
     public function setUp(): void
     {
@@ -162,14 +156,4 @@ public function testHasSideEffects(): void
 
         $this->assertTrue($methodReflection->hasSideEffects()->no());
     }
-
-    public static function assertMatchesRegularExpression(string $pattern, string $string, string $message = ''): void
-    {
-        parent::assertMatchesRegularExpression($pattern, $string, $message);
-    }
-
-    public static function assertDoesNotMatchRegularExpression(string $pattern, string $string, string $message = ''): void
-    {
-        parent::assertDoesNotMatchRegularExpression($pattern, $string, $message);
-    }
 }

tests/unit/EnumMethodsClassReflectionExtensionTest.php

@@ -6,19 +6,13 @@
 use MabeEnumPHPStan\EnumMethodsClassReflectionExtension;
 use MabeEnum\PHPStan\tests\assets\NotAnEnum;
 use MabeEnum\PHPStan\tests\assets\VisibilityEnum;
+use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Testing\PHPStanTestCase;
 
 class EnumMethodsClassReflectionExtensionTest extends PHPStanTestCase
 {
-    /**
-     * @var \PHPStan\Reflection\ReflectionProvider
-     */
-    protected $reflectionProvider;
-
-    /**
-     * @var EnumMethodsClassReflectionExtension
-     */
-    protected $extension;
+    protected ReflectionProvider $reflectionProvider;
+    protected EnumMethodsClassReflectionExtension $extension;
 
     public function setUp(): void
     {