From db215b0eb1990f34a9f092aeac12eff3eb3dc9fd Mon Sep 17 00:00:00 2001 From: Luis Rosales Date: Fri, 3 Nov 2023 18:14:40 +0100 Subject: [PATCH 01/15] refactor: Update package to support php >=8 and Psr Log 2 || 3 Updating dependencies to be able to work with newer Psr/Log BREAKING CHANGE: we are dropping support for PHP 7.x and Psr/Log 1.x --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 4a5c981..88d5db0 100644 --- a/composer.json +++ b/composer.json @@ -37,22 +37,22 @@ } ], "require": { - "php": ">=7.2 < 8.3", - "psr/log": "^1.1.4", + "php": ">=8.0", + "psr/log": "^2.0||^3.0", "wecodemore/wordpress-early-hook": "^1.1.0", "monolog/monolog": "^2.3.5" }, "require-dev": { - "phpunit/phpunit": "^8.5.33", "brain/monkey": "^2.6.1", "mockery/mockery": "^1.3.6", "mikey179/vfsstream": "~v1.6.11", "inpsyde/php-coding-standards": "^1", - "vimeo/psalm": "^4.30.0", "inpsyde/wp-stubs-versions": "dev-latest", "roots/wordpress-no-content": ">=6.1.1", "symfony/process": "^v4.4.44", - "globalis/wp-cli-bin": "^2.7.1" + "globalis/wp-cli-bin": "^2.7.1", + "vimeo/psalm": "^5.15", + "phpunit/phpunit": "^9.6" }, "provide": { "psr/log-implementation": "1.0.0" From 83e07a300749b74f164b010d89b059907f431f83 Mon Sep 17 00:00:00 2001 From: Luis Rosales Date: Fri, 3 Nov 2023 18:23:29 +0100 Subject: [PATCH 02/15] ci: remove php 7.x workflow run --- .github/workflows/php-integration-tests.yml | 2 +- .github/workflows/php-static-analysis.yml | 2 +- .github/workflows/php-unit-tests.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/php-integration-tests.yml b/.github/workflows/php-integration-tests.yml index 338cf1f..8bc1032 100644 --- a/.github/workflows/php-integration-tests.yml +++ b/.github/workflows/php-integration-tests.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - php-service: [ '72', '73', '74', '80', '81', '82' ] + php-service: [ '80', '81', '82' ] steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/php-static-analysis.yml b/.github/workflows/php-static-analysis.yml index dedcd5b..1559e72 100644 --- a/.github/workflows/php-static-analysis.yml +++ b/.github/workflows/php-static-analysis.yml @@ -31,7 +31,7 @@ jobs: uses: inpsyde/reusable-workflows/.github/workflows/lint-php.yml@main if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run lint only')) }} with: - PHP_MATRIX: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2"]' + PHP_MATRIX: '["8.0", "8.1", "8.2"]' coding-standards-analysis-php: if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run PHPCS only')) }} diff --git a/.github/workflows/php-unit-tests.yml b/.github/workflows/php-unit-tests.yml index 1953aff..0da81ca 100644 --- a/.github/workflows/php-unit-tests.yml +++ b/.github/workflows/php-unit-tests.yml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ] + php-versions: [ '8.0', '8.1', '8.2' ] steps: - name: Checkout From 80d0da68e8b3a425b8a9951036cc62e10088f5de Mon Sep 17 00:00:00 2001 From: Luis Rosales Date: Fri, 3 Nov 2023 18:35:22 +0100 Subject: [PATCH 03/15] chore: add static analysis for php 8.0 8.1 8.2 --- .github/workflows/php-static-analysis.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/php-static-analysis.yml b/.github/workflows/php-static-analysis.yml index 1559e72..5b7dfde 100644 --- a/.github/workflows/php-static-analysis.yml +++ b/.github/workflows/php-static-analysis.yml @@ -33,9 +33,21 @@ jobs: with: PHP_MATRIX: '["8.0", "8.1", "8.2"]' - coding-standards-analysis-php: + coding-standards-analysis-php-80: if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run PHPCS only')) }} uses: inpsyde/reusable-workflows/.github/workflows/coding-standards-php.yml@main + with: + PHP_VERSION: '8.0' + coding-standards-analysis-php-81: + if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run PHPCS only')) }} + uses: inpsyde/reusable-workflows/.github/workflows/coding-standards-php.yml@main + with: + PHP_VERSION: '8.1' + coding-standards-analysis-php-82: + if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run PHPCS only')) }} + uses: inpsyde/reusable-workflows/.github/workflows/coding-standards-php.yml@main + with: + PHP_VERSION: '8.2' static-code-analysis-php: if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run Psalm only')) }} From 3c14a3f001056c54e9729e7a6cc85672d6b9bfd4 Mon Sep 17 00:00:00 2001 From: Luis Rosales Date: Fri, 3 Nov 2023 18:39:29 +0100 Subject: [PATCH 04/15] chore: add static code analysis for different php versions --- .github/workflows/php-static-analysis.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/php-static-analysis.yml b/.github/workflows/php-static-analysis.yml index 5b7dfde..c7facd3 100644 --- a/.github/workflows/php-static-analysis.yml +++ b/.github/workflows/php-static-analysis.yml @@ -49,6 +49,19 @@ jobs: with: PHP_VERSION: '8.2' - static-code-analysis-php: + static-code-analysis-php-80: if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run Psalm only')) }} uses: inpsyde/reusable-workflows/.github/workflows/static-analysis-php.yml@main + with: + PHP_VERSION: '8.0' + static-code-analysis-php-81: + if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run Psalm only')) }} + uses: inpsyde/reusable-workflows/.github/workflows/static-analysis-php.yml@main + with: + PHP_VERSION: '8.1' + static-code-analysis-php-82: + if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run Psalm only')) }} + uses: inpsyde/reusable-workflows/.github/workflows/static-analysis-php.yml@main + with: + PHP_VERSION: '8.2' + From 0c2fe9cc3fcf1b85b24aef00297a942528f67c0a Mon Sep 17 00:00:00 2001 From: Luis Rosales Date: Fri, 3 Nov 2023 19:14:47 +0100 Subject: [PATCH 05/15] chore: fixes psalm error Ignore error comming from the different return type on earlier versions of WP In WP < 6.1 the return type was array[]|false --- src/HookListener/CronDebugListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/HookListener/CronDebugListener.php b/src/HookListener/CronDebugListener.php index 7e3d43c..1e17b78 100644 --- a/src/HookListener/CronDebugListener.php +++ b/src/HookListener/CronDebugListener.php @@ -83,7 +83,7 @@ private function registerEventListener(LogActionUpdater $updater): void } $cronArray = _get_cron_array(); - /** @psalm-suppress DocblockTypeContradiction */ + /** @psalm-suppress TypeDoesNotContainType,DocblockTypeContradiction */ if (!$cronArray || !is_array($cronArray)) { return; } From e9dfe4e1a60e1b47c9297063e2229b7e21650713 Mon Sep 17 00:00:00 2001 From: Luis Rosales Date: Mon, 6 Nov 2023 11:19:12 +0100 Subject: [PATCH 06/15] chore: fix psalm and require the test package --- .gitignore | 4 ++++ composer.json | 3 ++- src/Data/FailedLogin.php | 14 ++++++++++++-- src/DefaultHandler/LogsFolder.php | 4 ++++ src/PsrBridge.php | 2 +- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a57a787..6a78a68 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,7 @@ # Docker .github/workflows/docker/php*/*.sh + +# Adding a folder to put things temporarily +temp/ + diff --git a/composer.json b/composer.json index 88d5db0..df2b4e3 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,8 @@ "symfony/process": "^v4.4.44", "globalis/wp-cli-bin": "^2.7.1", "vimeo/psalm": "^5.15", - "phpunit/phpunit": "^9.6" + "phpunit/phpunit": "^9.6", + "fig/log-test": "^1.1" }, "provide": { "psr/log-implementation": "1.0.0" diff --git a/src/Data/FailedLogin.php b/src/Data/FailedLogin.php index 8daec23..101b4e6 100644 --- a/src/Data/FailedLogin.php +++ b/src/Data/FailedLogin.php @@ -107,15 +107,25 @@ private function countAttempts(int $ttl = 300): void || !isset($attempts[$userIp]['count']) || !isset($attempts[$userIp]['last_logged']) ) { - $attempts[$userIp] = ['count' => 0, 'last_logged' => 0]; + /** + * @var array $data + */ + $data = ['count' => 0, 'last_logged' => 0]; + $attempts[$userIp] = $data; } /** @psalm-suppress MixedOperand */ $attempts[$userIp]['count']++; - /** @psalm-suppress PropertyTypeCoercion */ + /** @psalm-suppress InvalidPropertyAssignmentValue */ $this->attemptsData = $attempts; + /** + * Psalm warns us about count and last_logged possibly being bool to int converted + * We assume the value retrieved when calling get_site_transient is an integer on both + * @psalm-suppress RiskyCast + */ $count = (int)$attempts[$userIp]['count']; + /** @psalm-suppress RiskyCast */ $lastLogged = (int)$attempts[$userIp]['last_logged']; /** diff --git a/src/DefaultHandler/LogsFolder.php b/src/DefaultHandler/LogsFolder.php index ef4736b..7ab3ba4 100644 --- a/src/DefaultHandler/LogsFolder.php +++ b/src/DefaultHandler/LogsFolder.php @@ -35,7 +35,11 @@ public static function determineFolder(?string $customFolder = null): ?string * them, and package could be fully functional even if failures happen. * Silence looks like best option here. * + * Also for some reason __return_true seems not to be a valid argument¿? + * I found this related issue https://github.com/vimeo/psalm/issues/3571 + * * phpcs:disable WordPress.PHP.DevelopmentFunctions.error_log_set_error_handler + * @psalm-suppress PossiblyInvalidArgument */ set_error_handler('__return_true'); diff --git a/src/PsrBridge.php b/src/PsrBridge.php index d2eaf65..182a7fc 100644 --- a/src/PsrBridge.php +++ b/src/PsrBridge.php @@ -72,7 +72,7 @@ public function withDefaultChannel(string $defaultChannel): PsrBridge * * phpcs:disable Generic.Metrics.CyclomaticComplexity */ - public function log($level, $message, array $context = []) + public function log($level, $message, array $context = []): void { // phpcs:enable Generic.Metrics.CyclomaticComplexity $throwable = null; From 685d0d38e0ead8c89b8114c69cc68cb171a35ae2 Mon Sep 17 00:00:00 2001 From: Luis Rosales Date: Mon, 6 Nov 2023 11:31:06 +0100 Subject: [PATCH 07/15] chore: remove deprecation warning in tests --- tests/unit/HookListener/CronDebugListenerTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unit/HookListener/CronDebugListenerTest.php b/tests/unit/HookListener/CronDebugListenerTest.php index ae5eebf..0df22a5 100644 --- a/tests/unit/HookListener/CronDebugListenerTest.php +++ b/tests/unit/HookListener/CronDebugListenerTest.php @@ -109,8 +109,8 @@ static function (LogData $log) use (&$logs): void { $regxp = '~^Cron action "%s" performed\. Duration: [0|1]\.[0-9]+ seconds\.$~'; - static::assertRegExp(sprintf($regxp, 'wp_scheduled_delete'), $logs[0]); - static::assertRegExp(sprintf($regxp, 'wp_update_plugins'), $logs[1]); - static::assertRegExp(sprintf($regxp, 'wp_version_check'), $logs[2]); + static::assertMatchesRegularExpression(sprintf($regxp, 'wp_scheduled_delete'), $logs[0]); + static::assertMatchesRegularExpression(sprintf($regxp, 'wp_update_plugins'), $logs[1]); + static::assertMatchesRegularExpression(sprintf($regxp, 'wp_version_check'), $logs[2]); } } From c3b39a28439b0a15b8500421c56e3af68ab228df Mon Sep 17 00:00:00 2001 From: Luis Rosales Date: Mon, 6 Nov 2023 11:46:52 +0100 Subject: [PATCH 08/15] chore: remove phpunit warning about config file using outdated schema --- phpunit.xml.dist | 60 ++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index d2d7421..85875ac 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,34 +1,30 @@ - - - - - - - - - tests/unit - - - tests/integration - - - - - - src - - + + + + src + + + + + + + + tests/unit + + + tests/integration + + From 2c9d84edab88d044eb6b6c5c51360e66d95cb285 Mon Sep 17 00:00:00 2001 From: Luis Rosales Date: Mon, 6 Nov 2023 11:52:56 +0100 Subject: [PATCH 09/15] chore: increase the php unit test matrix to use prefer lowest and regular --- .github/workflows/php-unit-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/php-unit-tests.yml b/.github/workflows/php-unit-tests.yml index 0da81ca..776b49c 100644 --- a/.github/workflows/php-unit-tests.yml +++ b/.github/workflows/php-unit-tests.yml @@ -26,6 +26,7 @@ jobs: fail-fast: false matrix: php-versions: [ '8.0', '8.1', '8.2' ] + dependency-versions: ['highest', 'lowest'] steps: - name: Checkout @@ -44,6 +45,8 @@ jobs: - name: Install Composer dependencies uses: ramsey/composer-install@v2 + with: + dependency-versions: ${{ matrix.dependency-versions }} - name: Run unit tests run: composer tests:unit:${{ ((env.USE_COVERAGE == 'yes') && 'codecov') || 'no-cov' }} From 9a2ad1c471bc8dd3045c089299fbbe1146915efc Mon Sep 17 00:00:00 2001 From: Luis Rosales Date: Wed, 8 Nov 2023 10:05:03 +0100 Subject: [PATCH 10/15] chore: using matrix instead --- .github/workflows/php-static-analysis.yml | 35 +++++++---------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/.github/workflows/php-static-analysis.yml b/.github/workflows/php-static-analysis.yml index c7facd3..58261ce 100644 --- a/.github/workflows/php-static-analysis.yml +++ b/.github/workflows/php-static-analysis.yml @@ -33,35 +33,20 @@ jobs: with: PHP_MATRIX: '["8.0", "8.1", "8.2"]' - coding-standards-analysis-php-80: + coding-standards-analysis-php: if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run PHPCS only')) }} uses: inpsyde/reusable-workflows/.github/workflows/coding-standards-php.yml@main + strategy: + matrix: + php-version: ['8.0', '8.1', '8.2'] with: - PHP_VERSION: '8.0' - coding-standards-analysis-php-81: - if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run PHPCS only')) }} - uses: inpsyde/reusable-workflows/.github/workflows/coding-standards-php.yml@main - with: - PHP_VERSION: '8.1' - coding-standards-analysis-php-82: - if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run PHPCS only')) }} - uses: inpsyde/reusable-workflows/.github/workflows/coding-standards-php.yml@main - with: - PHP_VERSION: '8.2' + PHP_VERSION: ${{ matrix.php-version }} - static-code-analysis-php-80: + static-code-analysis-php: if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run Psalm only')) }} uses: inpsyde/reusable-workflows/.github/workflows/static-analysis-php.yml@main + strategy: + matrix: + php-version: [ '8.0', '8.1', '8.2' ] with: - PHP_VERSION: '8.0' - static-code-analysis-php-81: - if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run Psalm only')) }} - uses: inpsyde/reusable-workflows/.github/workflows/static-analysis-php.yml@main - with: - PHP_VERSION: '8.1' - static-code-analysis-php-82: - if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run Psalm only')) }} - uses: inpsyde/reusable-workflows/.github/workflows/static-analysis-php.yml@main - with: - PHP_VERSION: '8.2' - + PHP_VERSION: ${{ matrix.php-version }} From 1d5b573ade91c84c489405c8de0d15c426a6055c Mon Sep 17 00:00:00 2001 From: Luis Rosales Date: Wed, 8 Nov 2023 11:00:10 +0100 Subject: [PATCH 11/15] chore: be more specific in suportted php versions --- composer.json | 2 +- src/DefaultHandler/LogsFolder.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index df2b4e3..4befb5a 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ } ], "require": { - "php": ">=8.0", + "php": ">=8.0 < 8.3", "psr/log": "^2.0||^3.0", "wecodemore/wordpress-early-hook": "^1.1.0", "monolog/monolog": "^2.3.5" diff --git a/src/DefaultHandler/LogsFolder.php b/src/DefaultHandler/LogsFolder.php index 7ab3ba4..0954531 100644 --- a/src/DefaultHandler/LogsFolder.php +++ b/src/DefaultHandler/LogsFolder.php @@ -35,7 +35,7 @@ public static function determineFolder(?string $customFolder = null): ?string * them, and package could be fully functional even if failures happen. * Silence looks like best option here. * - * Also for some reason __return_true seems not to be a valid argument¿? + * Also for some reason __return_true seems not to be a valid argument? * I found this related issue https://github.com/vimeo/psalm/issues/3571 * * phpcs:disable WordPress.PHP.DevelopmentFunctions.error_log_set_error_handler From 6f2c987ddc11d1f576dd5496882423ffc441e51a Mon Sep 17 00:00:00 2001 From: Luis Rosales Date: Wed, 8 Nov 2023 14:43:33 +0100 Subject: [PATCH 12/15] chore: PHP CS will return same result for all versions --- .github/workflows/php-static-analysis.yml | 5 +---- .gitignore | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/php-static-analysis.yml b/.github/workflows/php-static-analysis.yml index 58261ce..2f084cb 100644 --- a/.github/workflows/php-static-analysis.yml +++ b/.github/workflows/php-static-analysis.yml @@ -36,11 +36,8 @@ jobs: coding-standards-analysis-php: if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run PHPCS only')) }} uses: inpsyde/reusable-workflows/.github/workflows/coding-standards-php.yml@main - strategy: - matrix: - php-version: ['8.0', '8.1', '8.2'] with: - PHP_VERSION: ${{ matrix.php-version }} + PHP_VERSION: '8.0' static-code-analysis-php: if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run Psalm only')) }} diff --git a/.gitignore b/.gitignore index 6a78a68..6c97b07 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,6 @@ # Adding a folder to put things temporarily temp/ +# IDE +.idea/ + From fdef8334c127138b079036c469d331d8aab769f5 Mon Sep 17 00:00:00 2001 From: Luis Rosales Date: Mon, 8 Jan 2024 16:11:50 +0100 Subject: [PATCH 13/15] feat: raise min version of PHP to 8.1 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4befb5a..45c9747 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ } ], "require": { - "php": ">=8.0 < 8.3", + "php": ">=8.1 < 8.3", "psr/log": "^2.0||^3.0", "wecodemore/wordpress-early-hook": "^1.1.0", "monolog/monolog": "^2.3.5" From 0a52460344d6a5de46561dea13397abd20f00799 Mon Sep 17 00:00:00 2001 From: Luis Rosales Date: Mon, 8 Jan 2024 16:17:04 +0100 Subject: [PATCH 14/15] ci: align ci --- .github/workflows/php-integration-tests.yml | 2 +- .github/workflows/php-static-analysis.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/php-integration-tests.yml b/.github/workflows/php-integration-tests.yml index 8bc1032..3f13a32 100644 --- a/.github/workflows/php-integration-tests.yml +++ b/.github/workflows/php-integration-tests.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - php-service: [ '80', '81', '82' ] + php-service: [ '81', '82' ] steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/php-static-analysis.yml b/.github/workflows/php-static-analysis.yml index 2f084cb..1bed93c 100644 --- a/.github/workflows/php-static-analysis.yml +++ b/.github/workflows/php-static-analysis.yml @@ -31,19 +31,19 @@ jobs: uses: inpsyde/reusable-workflows/.github/workflows/lint-php.yml@main if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run lint only')) }} with: - PHP_MATRIX: '["8.0", "8.1", "8.2"]' + PHP_MATRIX: '["8.1", "8.2"]' coding-standards-analysis-php: if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run PHPCS only')) }} uses: inpsyde/reusable-workflows/.github/workflows/coding-standards-php.yml@main with: - PHP_VERSION: '8.0' + PHP_VERSION: '8.1' static-code-analysis-php: if: ${{ (github.event_name != 'workflow_dispatch') || ((github.event.inputs.jobs == 'Run all') || (github.event.inputs.jobs == 'Run Psalm only')) }} uses: inpsyde/reusable-workflows/.github/workflows/static-analysis-php.yml@main strategy: matrix: - php-version: [ '8.0', '8.1', '8.2' ] + php-version: [ '8.1', '8.2' ] with: PHP_VERSION: ${{ matrix.php-version }} From 68615148e25b26d456ec78684f6ca785e62821a9 Mon Sep 17 00:00:00 2001 From: Luis Rosales Date: Mon, 8 Jan 2024 16:18:32 +0100 Subject: [PATCH 15/15] ci: align missing file --- .github/workflows/php-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php-unit-tests.yml b/.github/workflows/php-unit-tests.yml index 776b49c..24be9b0 100644 --- a/.github/workflows/php-unit-tests.yml +++ b/.github/workflows/php-unit-tests.yml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: [ '8.0', '8.1', '8.2' ] + php-versions: [ '8.1', '8.2' ] dependency-versions: ['highest', 'lowest'] steps: