diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d6b4be7..46d68d2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -48,7 +48,7 @@ jobs: vendor/bin/phpstan analyse -vvv - name: PHPUnit - run: vendor/bin/phpunit --verbose + run: vendor/bin/phpunit - name: Upload coverage results to Coveralls env: @@ -59,14 +59,14 @@ jobs: composer global require php-coveralls/php-coveralls php-coveralls --coverage_clover=build/logs/clover.xml -v - tests-last: + tests-latest: runs-on: ubuntu-22.04 timeout-minutes: 10 strategy: fail-fast: true - name: PHP 8.2 - Last + name: PHP Latest steps: - name: Checkout @@ -75,7 +75,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.2 + php-version: latest tools: composer coverage: xdebug @@ -84,4 +84,4 @@ jobs: composer update - name: PHPUnit - run: vendor/bin/phpunit --verbose + run: vendor/bin/phpunit diff --git a/.gitignore b/.gitignore index 592d95b..d6a2742 100644 --- 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 index fa70f4d..0e317ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,8 +30,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 index a24a2fb..b45eed9 100644 --- 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/docker-compose.yml b/docker-compose.yml index a5b2f7f..7d3d85e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,9 +7,9 @@ services: volumes: - .:/package tty: true - package-last: - image: registry.gitlab.com/aplus-framework/images/package:3 - container_name: package-validation-last + package-latest: + image: registry.gitlab.com/aplus-framework/images/package:latest + container_name: package-validation-latest working_dir: /package volumes: - .:/package diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 741d40f..905c202 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,13 +1,10 @@ - - - src - + 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"> + @@ -18,4 +15,9 @@ tests + + + src + +