From c613f29a13e1ae64d0c93cfabee0dd86afa3772b Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Fri, 26 Jul 2024 12:52:16 +0545 Subject: [PATCH 1/2] chore: add PHP 8.4 to CI --- .github/workflows/ci.yml | 8 +++++++- composer.json | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3c94ac02..d3c65bbba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,10 +14,16 @@ jobs: matrix: php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3'] coverage: ['pcov'] + code-style: ['no'] code-analysis: ['no'] include: - php-versions: '7.1' coverage: 'none' + code-style: 'yes' + code-analysis: 'yes' + - php-versions: '8.4' + coverage: 'none' + code-style: 'no' code-analysis: 'yes' steps: - name: Checkout @@ -48,7 +54,7 @@ jobs: run: composer install --no-progress --prefer-dist --optimize-autoloader - name: Code Analysis (PHP CS-Fixer) - if: matrix.code-analysis == 'yes' + if: matrix.code-style == 'yes' run: php vendor/bin/php-cs-fixer fix --dry-run --diff - name: Code Analysis (PHPStan) diff --git a/composer.json b/composer.json index b08684bce..601cca825 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ }, "require-dev" : { "friendsofphp/php-cs-fixer": "~2.17.1", - "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0", + "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.6", "phpunit/php-invoker" : "^2.0 || ^3.1", "phpstan/phpstan": "^0.12" }, From 41dc45ef06cc15cd23c3edb044d75fed6547a999 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Fri, 26 Jul 2024 13:37:58 +0545 Subject: [PATCH 2/2] chore: allow phpstan v1 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 601cca825..df0261feb 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,7 @@ "friendsofphp/php-cs-fixer": "~2.17.1", "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.6", "phpunit/php-invoker" : "^2.0 || ^3.1", - "phpstan/phpstan": "^0.12" + "phpstan/phpstan": "^0.12 || ^1.11" }, "suggest" : { "hoa/bench" : "If you would like to run the benchmark scripts"