Upgrade phpunit to version ^10.5

natanfelles · natanfelles · commit e3577cda7153 · 2023-12-08T16:44:57.000-03:00
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ build/
 raw-tests/
 vendor/
 .php-cs-fixer.cache
+.phpunit.cache
 .phpunit.result.cache
 composer.lock
 composer.phar
diff --git a/composer.json b/composer.json
@@ -45,7 +45,7 @@
         "jetbrains/phpstorm-attributes": "^1.0",
         "phpmd/phpmd": "^2.13",
         "phpstan/phpstan": "^1.9",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^10.5"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false"
-         bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnError="false"
+         bootstrap="vendor/autoload.php" colors="true" stopOnError="false"
          stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         cacheDirectory=".phpunit.cache">
+    <coverage>
         <report>
             <clover outputFile="build/coverage/clover.xml"/>
             <html outputDirectory="build/coverage"/>
@@ -27,4 +24,9 @@
         <env name="DB_SCHEMA" value="framework-tests"/>
         <env name="XDEBUG_MODE" value="coverage"/>
     </php>
+    <source>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/tests/Result/FieldTest.php b/tests/Result/FieldTest.php
@@ -14,10 +14,26 @@
 
 final class FieldTest extends TestCase
 {
+    /**
+     * @param int $type
+     * @param string|null $typeName
+     *
+     * @dataProvider typeProvider
+     */
+    public function testType(int $type, ?string $typeName) : void
+    {
+        $object = new \stdClass();
+        $object->flags = $type;
+        $object->type = $type;
+        $field = new Field($object);
+        self::assertSame($type, $field->type);
+        self::assertSame($typeName, $field->typeName);
+    }
+
     /**
      * @return array<array<mixed>>
      */
-    public function typeProvider() : array
+    public static function typeProvider() : array
     {
         return [
             [\MYSQLI_TYPE_BIT, 'bit'],
@@ -52,20 +68,4 @@ public function typeProvider() : array
             [-1, null],
         ];
     }
-
-    /**
-     * @param int $type
-     * @param string|null $typeName
-     *
-     * @dataProvider typeProvider
-     */
-    public function testType(int $type, ?string $typeName) : void
-    {
-        $object = new \stdClass();
-        $object->flags = $type;
-        $object->type = $type;
-        $field = new Field($object);
-        self::assertSame($type, $field->type);
-        self::assertSame($typeName, $field->typeName);
-    }
 }
