Upgrade phpunit to version ^10.5

aplus-framework · Jan 6, 2024 · b13a3b7 · b13a3b7
1 parent 73e9afd
commit b13a3b7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
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
@@ -68,7 +68,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"
-         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>
+         bootstrap="vendor/autoload.php" colors="true" stopOnError="false" stopOnFailure="false"
+         stopOnIncomplete="false" stopOnSkipped="false"
+         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"/>
@@ -28,4 +25,9 @@
         <env name="REDIS_HOST" value="redis"/>
         <env name="XDEBUG_MODE" value="coverage"/>
     </php>
+    <source>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/tests/LanguagesTest.php b/tests/LanguagesTest.php
@@ -18,16 +18,16 @@
  */
 final class LanguagesTest extends TestCase
 {
-    protected string $langDir = __DIR__ . '/../src/Languages/';
+    protected static string $langDir = __DIR__ . '/../src/Languages/';
 
     /**
      * @return array<int,string>
      */
     protected function getCodes() : array
     {
         // @phpstan-ignore-next-line
-        $codes = \array_filter((array) \glob($this->langDir . '*'), 'is_dir');
-        $length = \strlen($this->langDir);
+        $codes = \array_filter((array) \glob(self::$langDir . '*'), 'is_dir');
+        $length = \strlen(self::$langDir);
         $result = [];
         foreach ($codes as &$dir) {
             if ($dir === false) {
@@ -47,7 +47,7 @@ protected function getCodes() : array
     public function testKeys(array $rules, string $file) : void
     {
         foreach ($this->getCodes() as $code) {
-            $lines = require $this->langDir . $code . '/' . $file . '.php';
+            $lines = require self::$langDir . $code . '/' . $file . '.php';
             $lines = \array_keys($lines);
             \sort($lines);
             self::assertSame($rules, $lines, 'File: ' . $file . '. Language: ' . $code);
@@ -57,15 +57,15 @@ public function testKeys(array $rules, string $file) : void
     /**
      * @return array<string,array<mixed>>
      */
-    public function languageProvider() : array
+    public static function languageProvider() : array
     {
         $files = [
             'validation',
         ];
         $data = [];
         foreach ($files as $file) {
             $data[$file] = [
-                \array_keys(require $this->langDir . 'en/' . $file . '.php'),
+                \array_keys(require self::$langDir . 'en/' . $file . '.php'),
                 $file,
             ];
         }