From dfb5454fc611c35dc1389341857366996bd81215 Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Tue, 9 Jan 2024 16:15:56 -0300 Subject: [PATCH 1/6] Remove space from extension --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 2daea10..18b84df 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,7 +8,7 @@ indent_style = space insert_final_newline = true trim_trailing_whitespace = true -[*.{md, rst}] +[*.{md,rst}] trim_trailing_whitespace = false [*.yml] From 2a516a43cea987bb510d0f204076f93d639ad3d7 Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Tue, 9 Jan 2024 16:16:33 -0300 Subject: [PATCH 2/6] Update issues link --- guide/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guide/index.rst b/guide/index.rst index 4a9cca0..6bdfbc5 100644 --- a/guide/index.rst +++ b/guide/index.rst @@ -593,5 +593,5 @@ The more you use it, the more you will learn. .. note:: Did you find something wrong? Be sure to let us know about it with an - `issue `_. + `issue `_. Thank you! From f737e1d351b7f49b122d55cfcb6e42dd5c0c793f Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Tue, 9 Jan 2024 16:17:21 -0300 Subject: [PATCH 3/6] Run service with PHP latest version --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f5e3237..ad310a2 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-routing-last + package-latest: + image: registry.gitlab.com/aplus-framework/images/package:latest + container_name: package-routing-latest working_dir: /package volumes: - .:/package From 7fc1b0ac9565e27062c213f9bbb592ace8570645 Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Tue, 9 Jan 2024 16:17:46 -0300 Subject: [PATCH 4/6] Run jobs with PHP latest version --- .github/workflows/tests.yml | 6 +++--- .gitlab-ci.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d6b4be7..b0713de 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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 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: From 5802745b0f725aa7cb182ec786608eda3172162c Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Tue, 9 Jan 2024 16:20:15 -0300 Subject: [PATCH 5/6] Upgrade phpunit to version ^10.5 --- .github/workflows/tests.yml | 4 ++-- .gitignore | 1 + composer.json | 2 +- phpunit.xml.dist | 18 ++++++++++-------- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b0713de..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: @@ -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/composer.json b/composer.json index ce80fd5..d3fc618 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/phpunit.xml.dist b/phpunit.xml.dist index 4678fae..190a258 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"> + @@ -21,4 +18,9 @@ + + + src + + From 956afbd00b64a3baeedb9e8ab91c568e54836960 Mon Sep 17 00:00:00 2001 From: Natan Felles Date: Tue, 9 Jan 2024 16:21:45 -0300 Subject: [PATCH 6/6] Fix typo --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d3fc618..fe09f82 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "resource", "presenter", "rest", - "restfull" + "restful" ], "authors": [ {