diff --git a/.github/workflows/php-qa.yml b/.github/workflows/php-qa.yml index c170644..344ee2f 100644 --- a/.github/workflows/php-qa.yml +++ b/.github/workflows/php-qa.yml @@ -38,7 +38,7 @@ jobs: uses: inpsyde/reusable-workflows/.github/workflows/lint-php.yml@main strategy: matrix: - php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] with: PHP_VERSION: ${{ matrix.php }} LINT_ARGS: '-e php --colors --show-deprecated ./src' @@ -54,7 +54,7 @@ jobs: uses: inpsyde/reusable-workflows/.github/workflows/static-analysis-php.yml@main strategy: matrix: - php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] include: - php: '7.4' composer: '--ignore-platform-req=php' diff --git a/.github/workflows/php-unit-tests.yml b/.github/workflows/php-unit-tests.yml index b5be886..ead69f3 100644 --- a/.github/workflows/php-unit-tests.yml +++ b/.github/workflows/php-unit-tests.yml @@ -29,7 +29,7 @@ jobs: strategy: matrix: - php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3'] container-version: [ '^1.1.0', '^2' ] dependency-versions: [ 'lowest', 'highest' ] include: @@ -55,7 +55,7 @@ jobs: - name: Setup dependencies for PSR-11 target version run: | - composer remove inpsyde/php-coding-standards --dev --no-update + composer remove syde/phpcs --dev --no-update composer require "psr/container:${{ matrix.container-version }}" --no-update composer config --no-plugins allow-plugins.roots/wordpress-core-installer false @@ -76,3 +76,9 @@ jobs: files: ./coverage.xml flags: unittests verbose: true + # PHP 8.4 causes many failures with "lowest" dependency version due incompatibility. + # So, we're running it in an isolated step. + test-phpunit-84: + uses: inpsyde/reusable-workflows/.github/workflows/tests-unit-php.yml@main + with: + PHP_VERSION: "8.4" \ No newline at end of file diff --git a/composer.json b/composer.json index 7ca5348..2176dd3 100644 --- a/composer.json +++ b/composer.json @@ -21,13 +21,13 @@ } ], "require": { - "php": ">=7.4 <8.4", + "php": ">=7.4", "ext-json": "*", "psr/container": "^1.1.0 || ^2" }, "require-dev": { "brain/monkey": "^2.6.1", - "inpsyde/wp-stubs-versions": "dev-latest", + "inpsyde/wp-stubs-versions": "6.7", "mikey179/vfsstream": "^v1.6.11", "phpstan/phpstan": "^2.1.1", "phpstan/phpstan-deprecation-rules": "^2.0.1", diff --git a/phpstan.neon.dist b/phpstan.neon.dist index d8320c0..0f92929 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -8,7 +8,7 @@ parameters: dynamicConstantNames: - WP_DEBUG scanFiles: - - vendor/inpsyde/wp-stubs-versions/latest.php + - vendor/inpsyde/wp-stubs-versions/6.7.php paths: - src/ - tests/ diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 0f556dd..be947cc 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -9,7 +9,8 @@ convertWarningsToExceptions="true" convertDeprecationsToExceptions="false" backupGlobals="false" - stopOnFailure="false"> + stopOnFailure="false" + failOnWarning="false">