Merge pull request #193 from samsonasik/add-php84

Add PHP 8.4 support
laminas · Dec 2, 2024 · 7afebaf · 7afebaf
2 parents 312f3e4 + 730f4cf
commit 7afebaf
Show file tree

Hide file tree

Showing 8 changed files with 261 additions and 383 deletions.
diff --git a/composer.json b/composer.json
@@ -15,12 +15,12 @@
         "forum": "https://discourse.laminas.dev/"
     },
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 ",
         "rector/rector": "1.2.10"
     },
     "require-dev": {
         "laminas/laminas-servicemanager": "^4.0",
-        "phpunit/phpunit": "^9.5.26",
+        "phpunit/phpunit": "^10.5.38",
         "squizlabs/php_codesniffer": "^3.7.1"
     },
     "autoload": {

diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-    bootstrap="vendor/autoload.php"
-    colors="true">
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-    </coverage>
-
-    <testsuites>
-        <testsuite name="laminas-servicemanager-migration">
-            <directory>./test</directory>
-        </testsuite>
-    </testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true" cacheDirectory=".phpunit.cache">
+  <testsuites>
+    <testsuite name="laminas-servicemanager-migration">
+      <directory>./test</directory>
+    </testsuite>
+  </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/test/Rector/Class_/ImplementsFactoryInterfaceToPsrFactoryRector/AutoImportRenameUseTest.php b/test/Rector/Class_/ImplementsFactoryInterfaceToPsrFactoryRector/AutoImportRenameUseTest.php
@@ -17,9 +17,9 @@ public function test(string $filePath): void
         $this->doTestFile($filePath);
     }
 
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
-        return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureAutoImportRenameUse');
+        return self::yieldFilesFromDirectory(__DIR__ . '/FixtureAutoImportRenameUse');
     }
 
     public function provideConfigFilePath(): string

diff --git a/.../Class_/ImplementsFactoryInterfaceToPsrFactoryRector/CombineWithSetListAutoImportTest.php b/.../Class_/ImplementsFactoryInterfaceToPsrFactoryRector/CombineWithSetListAutoImportTest.php
@@ -16,9 +16,9 @@ public function test(string $filePath): void
     {
         $this->doTestFile($filePath);
     }
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
-        return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureCombineWithSetListAutoImport');
+        return self::yieldFilesFromDirectory(__DIR__ . '/FixtureCombineWithSetListAutoImport');
     }
 
     public function provideConfigFilePath(): string

diff --git a/...tsFactoryInterfaceToPsrFactoryRector/ImplementsFactoryInterfaceToPsrFactoryRectorTest.php b/...tsFactoryInterfaceToPsrFactoryRector/ImplementsFactoryInterfaceToPsrFactoryRectorTest.php
@@ -17,9 +17,9 @@ public function test(string $filePath): void
         $this->doTestFile($filePath);
     }
 
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
-        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
+        return self::yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

diff --git a/test/Rector/RenameClassRector/AutoImportTest.php b/test/Rector/RenameClassRector/AutoImportTest.php
@@ -18,9 +18,9 @@ public function test(string $filePath): void
         $this->doTestFile($filePath);
     }
 
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
-        return $this->yieldFilesFromDirectory(__DIR__ . '/FixtureAutoImport');
+        return self::yieldFilesFromDirectory(__DIR__ . '/FixtureAutoImport');
     }
 
     public function provideConfigFilePath(): string

diff --git a/test/Rector/RenameClassRector/RenameClassRectorTest.php b/test/Rector/RenameClassRector/RenameClassRectorTest.php
@@ -18,9 +18,9 @@ public function test(string $filePath): void
         $this->doTestFile($filePath);
     }
 
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
-        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
+        return self::yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string