chore: bump to PHPUnit 10 (#182)

* chore: bump to PHPUnit 10 * chore: bump to PHPUnit 10 * chore: fix branch alias * chore: bump to PHPUnit 10
sigwinhq · Jan 29, 2024 · f57a053 · f57a053
1 parent 406347d
commit f57a053
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 87 deletions.
diff --git a/composer.json b/composer.json
@@ -18,10 +18,10 @@
     "require-dev": {
         "matthiasnoback/symfony-dependency-injection-test": "^4.0",
         "nyholm/nsa": "^1.1",
-        "nyholm/symfony-bundle-test": "dev-master",
+        "nyholm/symfony-bundle-test": "^2.0",
         "openspout/openspout": "^4.0",
         "phpoffice/phpspreadsheet": "^1.29",
-        "phpunit/phpunit": "^9.6",
+        "phpunit/phpunit": "^10.5",
         "sigwin/infra": "~1.9.0",
         "symfony/console": "^6.4 || ^7.0",
         "symfony/framework-bundle": "^6.4 || ^7.0",
@@ -69,7 +69,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-main": "1.0-dev"
         }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -2,36 +2,34 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          beStrictAboutChangesToGlobalState="true"
-         beStrictAboutCoversAnnotation="true"
+         beStrictAboutCoverageMetadata="true"
          beStrictAboutOutputDuringTests="true"
-         beStrictAboutResourceUsageDuringSmallTests="true"
          beStrictAboutTodoAnnotatedTests="true"
-         bootstrap="./src/bootstrap.php"
-         cacheResultFile="var/phpqa/phpunit.result.cache"
+         bootstrap="./vendor/autoload.php"
+         cacheDirectory="var/phpqa/phpunit"
          colors="true"
-         convertDeprecationsToExceptions="true"
          enforceTimeLimit="true"
          executionOrder="random"
          failOnEmptyTestSuite="true"
          failOnRisky="true"
          failOnWarning="true"
-         forceCoversAnnotation="true"
-         verbose="true">
-    <coverage processUncoveredFiles="true">
+         requireCoverageMetadata="true">
+    <coverage/>
+    <source>
         <include>
-            <directory suffix=".php">./src/Xezilaires</directory>
-            <directory suffix=".php">./src/Bridge</directory>
+            <directory>./src/Xezilaires</directory>
+            <directory>./src/Bridge</directory>
         </include>
         <exclude>
-            <directory suffix=".php">./src/Xezilaires/Exception</directory>
-            <directory suffix=".php">./src/Xezilaires/Test</directory>
-            <directory suffix=".php">./src/Xezilaires/vendor</directory>
-            <directory suffix=".php">./src/Xezilaires/var</directory>
-            <directory suffix=".php">./src/Bridge/*/Test</directory>
-            <directory suffix=".php">./src/Bridge/*/vendor</directory>
-            <directory suffix=".php">./src/Bridge/*/var</directory>
+            <directory>./src/Xezilaires/Exception</directory>
+            <directory>./src/Xezilaires/Test</directory>
+            <directory>./src/Xezilaires/vendor</directory>
+            <directory>./src/Xezilaires/var</directory>
+            <directory>./src/Bridge/*/Test</directory>
+            <directory>./src/Bridge/*/vendor</directory>
+            <directory>./src/Bridge/*/var</directory>
         </exclude>
-    </coverage>
+    </source>
     <testsuites>
         <testsuite name="Xezilaires">
             <directory>./src/Xezilaires/Test</directory>
@@ -41,7 +39,4 @@
     <php>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=12&amp;verbose=0"/>
     </php>
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-    </listeners>
 </phpunit>
diff --git a/src/Bridge/PhpSpreadsheet/composer.json b/src/Bridge/PhpSpreadsheet/composer.json
@@ -15,7 +15,7 @@
         "sigwin/xezilaires": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.6",
+        "phpunit/phpunit": "^10.5",
         "symfony/phpunit-bridge": "^6.4 || ^7.0",
         "symfony/property-access": "^6.4 || ^7.0",
         "symfony/property-info": "^6.4 || ^7.0"
@@ -47,7 +47,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-main": "1.0-dev"
         }
     }
 }
diff --git a/src/Bridge/PhpSpreadsheet/phpunit.xml.dist b/src/Bridge/PhpSpreadsheet/phpunit.xml.dist
@@ -2,32 +2,29 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          beStrictAboutChangesToGlobalState="true"
-         beStrictAboutCoversAnnotation="true"
+         beStrictAboutCoverageMetadata="true"
          beStrictAboutOutputDuringTests="true"
-         beStrictAboutResourceUsageDuringSmallTests="true"
          beStrictAboutTodoAnnotatedTests="true"
          bootstrap="./vendor/autoload.php"
-         cacheResultFile="var/phpqa/phpunit.result.cache"
+         cacheDirectory="var/phpqa/phpunit"
          colors="true"
-         convertDeprecationsToExceptions="true"
          enforceTimeLimit="true"
          executionOrder="random"
          failOnEmptyTestSuite="true"
          failOnRisky="true"
-         failOnWarning="true"
-         forceCoversAnnotation="true"
-         verbose="true">
-    <coverage processUncoveredFiles="true">
+         failOnWarning="true">
+    <coverage/>
+    <source>
         <include>
-            <directory suffix=".php">./</directory>
+            <directory>./</directory>
         </include>
         <exclude>
-            <directory suffix=".php">./Exception</directory>
-            <directory suffix=".php">./Test</directory>
-            <directory suffix=".php">./var</directory>
-            <directory suffix=".php">./vendor</directory>
+            <directory>./Exception</directory>
+            <directory>./Test</directory>
+            <directory>./var</directory>
+            <directory>./vendor</directory>
         </exclude>
-    </coverage>
+    </source>
     <testsuites>
         <testsuite name="Xezilaires">
             <directory>./Test</directory>
@@ -36,7 +33,4 @@
     <php>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0&amp;max[indirect]=1&amp;verbose=0"/>
     </php>
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-    </listeners>
 </phpunit>
diff --git a/src/Bridge/Spout/Test/RowIteratorTest.php b/src/Bridge/Spout/Test/RowIteratorTest.php
@@ -29,7 +29,7 @@ final class RowIteratorTest extends TestCase
     /**
      * @return list<array{0: int, 1: int, 2: int, 3: array{rewind: int, next: int, valid: int}}>
      */
-    public function provideCanSeekProperlyCases(): iterable
+    public static function provideCanSeekProperlyCases(): iterable
     {
         return [
             [2, 2, 2, ['rewind' => 1, 'next' => 0, 'valid' => 0]],
@@ -41,7 +41,7 @@ public function provideCanSeekProperlyCases(): iterable
     /**
      * @return list<array{0: int, 1: int, 2: int, 3: array{rewind: int, next: int}, 4: array{valid: list<bool>}}>
      */
-    public function provideCanDetermineHighestRowProperlyCases(): iterable
+    public static function provideCanDetermineHighestRowProperlyCases(): iterable
     {
         return [
             [1, 1, 2, ['rewind' => 2, 'next' => 2], ['valid' => [true, true, false]]],

diff --git a/src/Bridge/Spout/composer.json b/src/Bridge/Spout/composer.json
@@ -16,7 +16,7 @@
     },
     "require-dev": {
         "nyholm/nsa": "^1.1",
-        "phpunit/phpunit": "^9.6",
+        "phpunit/phpunit": "^10.5",
         "symfony/phpunit-bridge": "^6.4 || ^7.0",
         "symfony/property-access": "^6.4 || ^7.0",
         "symfony/property-info": "^6.4 || ^7.0"
@@ -45,7 +45,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-main": "1.0-dev"
         }
     }
 }
diff --git a/src/Bridge/Spout/phpunit.xml.dist b/src/Bridge/Spout/phpunit.xml.dist
@@ -2,32 +2,29 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          beStrictAboutChangesToGlobalState="true"
-         beStrictAboutCoversAnnotation="true"
+         beStrictAboutCoverageMetadata="true"
          beStrictAboutOutputDuringTests="true"
-         beStrictAboutResourceUsageDuringSmallTests="true"
          beStrictAboutTodoAnnotatedTests="true"
          bootstrap="./vendor/autoload.php"
-         cacheResultFile="var/phpqa/phpunit.result.cache"
+         cacheDirectory="var/phpqa/phpunit"
          colors="true"
-         convertDeprecationsToExceptions="true"
          enforceTimeLimit="true"
          executionOrder="random"
          failOnEmptyTestSuite="true"
          failOnRisky="true"
-         failOnWarning="true"
-         forceCoversAnnotation="true"
-         verbose="true">
-    <coverage processUncoveredFiles="true">
+         failOnWarning="true">
+    <coverage/>
+    <source>
         <include>
-            <directory suffix=".php">./</directory>
+            <directory>./</directory>
         </include>
         <exclude>
-            <directory suffix=".php">./Exception</directory>
-            <directory suffix=".php">./Test</directory>
-            <directory suffix=".php">./var</directory>
-            <directory suffix=".php">./vendor</directory>
+            <directory>./Exception</directory>
+            <directory>./Test</directory>
+            <directory>./var</directory>
+            <directory>./vendor</directory>
         </exclude>
-    </coverage>
+    </source>
     <testsuites>
         <testsuite name="Xezilaires">
             <directory>./Test</directory>
@@ -36,7 +33,4 @@
     <php>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=13&amp;max[indirect]=1&amp;verbose=0"/>
     </php>
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-    </listeners>
 </phpunit>
diff --git a/src/Bridge/Symfony/composer.json b/src/Bridge/Symfony/composer.json
@@ -20,8 +20,8 @@
     },
     "require-dev": {
         "matthiasnoback/symfony-dependency-injection-test": "^4.0",
-        "nyholm/symfony-bundle-test": "dev-master",
-        "phpunit/phpunit": "^9.6",
+        "nyholm/symfony-bundle-test": "^2.0",
+        "phpunit/phpunit": "^10.5",
         "sigwin/xezilaires-phpspreadsheet": "^1.0",
         "sigwin/xezilaires-spout": "^1.0",
         "symfony/phpunit-bridge": "^6.4 || ^7.0"

diff --git a/src/Xezilaires/Test/Metadata/MappingTest.php b/src/Xezilaires/Test/Metadata/MappingTest.php
@@ -89,7 +89,7 @@ public function testCannotCreateInvalidMapping(
     /**
      * @return iterable<int, array{0: class-string, 1: array{name: Reference}, 2?: array{header: int, reverse?: bool, start?: int}}>
      */
-    public function provideCanCreateValidMappingCases(): iterable
+    public static function provideCanCreateValidMappingCases(): iterable
     {
         yield [
             Product::class,
@@ -107,7 +107,7 @@ public function provideCanCreateValidMappingCases(): iterable
     /**
      * @return iterable<int, array{0: string, 1: string, 2: array<array-key, mixed>, 3?: array<string, null|bool|int|string>}>
      */
-    public function provideCannotCreateInvalidMappingCases(): iterable
+    public static function provideCannotCreateInvalidMappingCases(): iterable
     {
         yield ['Invalid class "foo"', 'foo', ['name' => new ColumnReference('A')]];
         yield ['Invalid mapping, no references specified', Product::class, []];

diff --git a/src/Xezilaires/composer.json b/src/Xezilaires/composer.json
@@ -17,7 +17,7 @@
     "require-dev": {
         "nyholm/nsa": "^1.1",
         "openspout/openspout": "^4.0",
-        "phpunit/phpunit": "^9.6",
+        "phpunit/phpunit": "^10.5",
         "symfony/console": "^6.4 || ^7.0",
         "symfony/phpunit-bridge": "^6.4 || ^7.0",
         "symfony/property-access": "^6.4 || ^7.0",
@@ -47,7 +47,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-main": "1.0-dev"
         }
     }
 }
diff --git a/src/Xezilaires/phpunit.xml.dist b/src/Xezilaires/phpunit.xml.dist
@@ -2,32 +2,29 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          beStrictAboutChangesToGlobalState="true"
-         beStrictAboutCoversAnnotation="true"
+         beStrictAboutCoverageMetadata="true"
          beStrictAboutOutputDuringTests="true"
-         beStrictAboutResourceUsageDuringSmallTests="true"
          beStrictAboutTodoAnnotatedTests="true"
          bootstrap="./vendor/autoload.php"
-         cacheResultFile="var/phpqa/phpunit.result.cache"
+         cacheDirectory="var/phpqa/phpunit"
          colors="true"
-         convertDeprecationsToExceptions="true"
          enforceTimeLimit="true"
          executionOrder="random"
          failOnEmptyTestSuite="true"
          failOnRisky="true"
-         failOnWarning="true"
-         forceCoversAnnotation="true"
-         verbose="true">
-    <coverage processUncoveredFiles="true">
+         failOnWarning="true">
+    <coverage/>
+    <source>
         <include>
-            <directory suffix=".php">./</directory>
+            <directory>./</directory>
         </include>
         <exclude>
-            <directory suffix=".php">./Exception</directory>
-            <directory suffix=".php">./Test</directory>
-            <directory suffix=".php">./var</directory>
-            <directory suffix=".php">./vendor</directory>
+            <directory>./Exception</directory>
+            <directory>./Test</directory>
+            <directory>./var</directory>
+            <directory>./vendor</directory>
         </exclude>
-    </coverage>
+    </source>
     <testsuites>
         <testsuite name="Xezilaires">
             <directory>./Test</directory>
@@ -36,7 +33,4 @@
     <php>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=9&amp;verbose=0"/>
     </php>
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-    </listeners>
 </phpunit>