Update PHPUnit 10

lcharette · lcharette · commit a2b1d4b7dd9c · 2024-04-01T21:11:45.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -54,6 +54,7 @@ vagrant/Homestead/
 
 # Ignore dev utility cache
 .phpunit.result.cache
+.phpunit.cache
 .php_cs.cache
 
 # Ignore api doc
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [5.0.1](https://github.com/lcharette/UF_FormGenerator/compare/5.0.1...6.0.0)
 - Require UserFrosting 5.1
+- Update PHPUnit 10
 
 ## [5.0.1](https://github.com/lcharette/UF_FormGenerator/compare/5.0.0...5.0.1)
 - Update PHP & JS dependencies
diff --git a/app/tests/ElementTest.php b/app/tests/ElementTest.php
@@ -66,7 +66,7 @@ public function testElement(string $elementName, string $class, $value, array $e
      *
      * @return mixed[]
      */
-    public function elementsProvider(): array
+    public static function elementsProvider(): array
     {
         return [
             // TEXT - With Null value
diff --git a/app/tests/FormTest.php b/app/tests/FormTest.php
@@ -71,11 +71,8 @@ public function testForm(string $file, $data, array $expected): void
      *
      * @return mixed[]
      */
-    public function formProvider(): array
+    public static function formProvider(): array
     {
-        $stub = $this->createMock(Model::class);
-        $stub->method('toArray')->willReturn(['name' => 'Bar project']);
-
         return [
             // WITH NO DATA
             [
@@ -244,7 +241,7 @@ public function formProvider(): array
             // WITH DATA AS MODEL
             [
                 '/good.json',
-                $stub,
+                new MockModel(),
                 [
                     'name' => [
                         'autocomplete' => 'off',
@@ -681,3 +678,12 @@ protected function applyTransformations(): void
         ], $this->element);
     }
 }
+
+class MockModel extends Model
+{
+    /** @return array<string, string> */
+    public function toArray()
+    {
+        return ['name' => 'Bar project'];
+    }
+}
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-strict-rules": "^1.0",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.5",
         "fakerphp/faker": "^1.17",
         "slam/phpstan-extensions": "^6.0",
         "userfrosting/theme-adminlte": "^5.0"
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,22 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     backupGlobals="false" 
-    backupStaticAttributes="false" 
     bootstrap="vendor/autoload.php" 
     colors="true" 
-    convertErrorsToExceptions="true" 
-    convertNoticesToExceptions="true" 
-    convertWarningsToExceptions="true" 
     processIsolation="false" 
     stderr="true" 
     stopOnFailure="false" 
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
->
-  <coverage includeUncoveredFiles="true" processUncoveredFiles="false">
-    <include>
-      <directory suffix=".php">app/src/</directory>
-      <directory suffix=".php">public/src/</directory>
-    </include>
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" 
+    cacheDirectory=".phpunit.cache" 
+    backupStaticProperties="false">
+  <coverage includeUncoveredFiles="true">
     <report>
       <clover outputFile="_meta/coverage.xml"/>
       <html outputDirectory="_meta/coverage"/>
@@ -31,4 +24,10 @@
   <php>
     <env name="UF_MODE" value="testing"/>
   </php>
+  <source>
+    <include>
+      <directory suffix=".php">app/src/</directory>
+      <directory suffix=".php">public/src/</directory>
+    </include>
+  </source>
 </phpunit>

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function testElement(string $elementName, string $class, $value, array $e`
`66`	`66`	`*`
`67`	`67`	`* @return mixed[]`
`68`	`68`	`*/`
`69`		`- public function elementsProvider(): array`
	`69`	`+ public static function elementsProvider(): array`
`70`	`70`	`{`
`71`	`71`	`return [`
`72`	`72`	`// TEXT - With Null value`
Original file line number	Diff line number	Diff line change
`@@ -71,11 +71,8 @@ public function testForm(string $file, $data, array $expected): void`
`71`	`71`	`*`
`72`	`72`	`* @return mixed[]`
`73`	`73`	`*/`
`74`		`- public function formProvider(): array`
	`74`	`+ public static function formProvider(): array`
`75`	`75`	`{`
`76`		`- $stub = $this->createMock(Model::class);`
`77`		`- $stub->method('toArray')->willReturn(['name' => 'Bar project']);`
`78`		`-`
`79`	`76`	`return [`
`80`	`77`	`// WITH NO DATA`
`81`	`78`	`[`
`@@ -244,7 +241,7 @@ public function formProvider(): array`
`244`	`241`	`// WITH DATA AS MODEL`
`245`	`242`	`[`
`246`	`243`	`'/good.json',`
`247`		`- $stub,`
	`244`	`+ new MockModel(),`
`248`	`245`	`[`
`249`	`246`	`'name' => [`
`250`	`247`	`'autocomplete' => 'off',`
`@@ -681,3 +678,12 @@ protected function applyTransformations(): void`
`681`	`678`	`], $this->element);`
`682`	`679`	`}`
`683`	`680`	`}`
	`681`	`+`
	`682`	`+class MockModel extends Model`
	`683`	`+{`
	`684`	`+ /** @return array<string, string> */`
	`685`	`+ public function toArray()`
	`686`	`+ {`
	`687`	`+ return ['name' => 'Bar project'];`
	`688`	`+ }`
	`689`	`+}`