Upgrade to PHPUnit 10.

Crell · Crell · commit b713ad1e9e97 · 2023-10-28T16:43:19.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@ build
 composer.lock
 vendor
 .phpunit.result.cache
+.phpunit.cache
 /vendor-bin/**/vendor
 .env
 profiles
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     "require-dev": {
         "phpbench/phpbench": "^1.2",
         "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "~9.0",
+        "phpunit/phpunit": "~10.3",
         "psr/cache": "^3.0",
         "psr/cache-util": "^2.0"
     },
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <coverage>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
-    <exclude>
-        <directory suffix=".php">src/Attributes/Reflect</directory>
-    </exclude>
     <report>
       <clover outputFile="build/logs/clover.xml"/>
       <html outputDirectory="build/coverage"/>
@@ -21,4 +15,12 @@
   <logging>
     <junit outputFile="build/report.junit.xml"/>
   </logging>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">src/Attributes/Reflect</directory>
+    </exclude>
+  </source>
 </phpunit>
diff --git a/tests/ClassAnalyzerTest.php b/tests/ClassAnalyzerTest.php
@@ -123,7 +123,7 @@ public function analyze_anonymous_objects(): void
     /**
      * @see analyze_classes()
      */
-    public function attributeTestProvider(): \Generator
+    public static function attributeTestProvider(): \Generator
     {
         yield 'Generic' => [
             'subject' => Point::class,
@@ -434,7 +434,7 @@ public function analyze_classes_scoped(string $subject, string $attribute, array
         $tests($classDef);
     }
 
-    public function scopedAttributeTestProvider(): iterable
+    public static function scopedAttributeTestProvider(): iterable
     {
         yield 'Incl by default: true; scope: One' => [
             'subject' => ClassWithScopes::class,
@@ -741,9 +741,9 @@ public function scopedAttributeTestProvider(): iterable
     /**
      * @see analyze_objects()
      */
-    public function attributeObjectTestProvider(): iterable
+    public static function attributeObjectTestProvider(): iterable
     {
-        $tests = iterator_to_array($this->attributeTestProvider());
+        $tests = iterator_to_array(self::attributeTestProvider());
 
         // For enum tests, skip those entirely since there's nothing to instantiate.
         if (function_exists('\enum_exists')) {
diff --git a/tests/ReflectTest.php b/tests/ReflectTest.php
@@ -47,7 +47,7 @@ public function analyze_enums(string $subject, callable $test): void
         $test($classDef);
     }
 
-    public function enumAttributeExamples(): iterable
+    public static function enumAttributeExamples(): iterable
     {
         yield Suit::class => [
             'subject' => Suit::class,
@@ -86,7 +86,7 @@ public function enumAttributeExamples(): iterable
         ];
     }
 
-    public function classAttributeExamples(): iterable
+    public static function classAttributeExamples(): iterable
     {
         yield NoProps::class => [
             'subject' => NoProps::class,
diff --git a/tests/TypeDefTest.php b/tests/TypeDefTest.php
@@ -27,7 +27,7 @@ public function typedefs(string $methodName, callable $test): void
         $test($def);
     }
 
-    public function typeDefProvider(): iterable
+    public static function typeDefProvider(): iterable
     {
         yield 'simpleInt' => [
             'subject' => 'simpleInt',

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function analyze_enums(string $subject, callable $test): void`
`47`	`47`	`$test($classDef);`
`48`	`48`	`}`
`49`	`49`
`50`		`- public function enumAttributeExamples(): iterable`
	`50`	`+ public static function enumAttributeExamples(): iterable`
`51`	`51`	`{`
`52`	`52`	`yield Suit::class => [`
`53`	`53`	`'subject' => Suit::class,`
`@@ -86,7 +86,7 @@ public function enumAttributeExamples(): iterable`
`86`	`86`	`];`
`87`	`87`	`}`
`88`	`88`
`89`		`- public function classAttributeExamples(): iterable`
	`89`	`+ public static function classAttributeExamples(): iterable`
`90`	`90`	`{`
`91`	`91`	`yield NoProps::class => [`
`92`	`92`	`'subject' => NoProps::class,`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function typedefs(string $methodName, callable $test): void`
`27`	`27`	`$test($def);`
`28`	`28`	`}`
`29`	`29`
`30`		`- public function typeDefProvider(): iterable`
	`30`	`+ public static function typeDefProvider(): iterable`
`31`	`31`	`{`
`32`	`32`	`yield 'simpleInt' => [`
`33`	`33`	`'subject' => 'simpleInt',`