Merge branch 'new' into development

natanfelles · natanfelles · commit e7156eaceb63 · 2024-01-06T19:34:42.000-03:00
# Conflicts:
#	composer.json
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 10
 
     strategy:
@@ -74,7 +74,7 @@ jobs:
           DB_HOST: 127.0.0.1
           MEMCACHED_HOST: 127.0.0.1
           REDIS_HOST: 127.0.0.1
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit
 
       - name: Upload coverage results to Coveralls
         env:
@@ -85,8 +85,8 @@ jobs:
           composer global require php-coveralls/php-coveralls
           php-coveralls --coverage_clover=build/logs/clover.xml -v
 
-  tests-last:
-    runs-on: ubuntu-20.04
+  tests-latest:
+    runs-on: ubuntu-22.04
     timeout-minutes: 10
 
     strategy:
@@ -114,7 +114,7 @@ jobs:
         ports:
           - 6379:6379
 
-    name: PHP 8.2 - Last
+    name: PHP Latest
 
     steps:
       - name: Checkout
@@ -123,7 +123,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: latest
           tools: composer
           coverage: xdebug
 
@@ -136,4 +136,4 @@ jobs:
           DB_HOST: 127.0.0.1
           MEMCACHED_HOST: 127.0.0.1
           REDIS_HOST: 127.0.0.1
-        run: vendor/bin/phpunit --verbose
+        run: vendor/bin/phpunit
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/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -37,8 +37,8 @@ test:php:
       - build/docs/
   coverage: '/^\s*Lines:\s*\d+.\d+\%/'
 
-test:php-last:
-  image: registry.gitlab.com/aplus-framework/images/base:3
+test:php-latest:
+  image: registry.gitlab.com/aplus-framework/images/base:latest
   stage: test
   timeout: 10 minutes
   cache:
diff --git a/composer.json b/composer.json
@@ -68,7 +68,7 @@
         "jetbrains/phpstorm-attributes": "^1.0",
         "phpmd/phpmd": "^2.13",
         "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^9.6"
+        "phpunit/phpunit": "^10.5"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -9,9 +9,9 @@ services:
     depends_on:
       - mariadb
     tty: true
-  package-last:
-    image: registry.gitlab.com/aplus-framework/images/package:3
-    container_name: package-mvc-last
+  package-latest:
+    image: registry.gitlab.com/aplus-framework/images/package:latest
+    container_name: package-mvc-latest
     working_dir: /package
     volumes:
       - .:/package
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,
             ];
         }
