From 5220d79c4461fd58ed2f573ded23abdbb6cfab19 Mon Sep 17 00:00:00 2001 From: Pascal Birchler Date: Sat, 17 May 2025 13:21:15 +0200 Subject: [PATCH 1/6] Use PHPUnit Polyfills v4 --- composer.json | 2 +- tests/tests/TestBehatTags.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8e678002b..508784fac 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "wp-cli/eval-command": "^1 || ^2", "wp-cli/wp-cli": "^2.12", "wp-coding-standards/wpcs": "^3", - "yoast/phpunit-polyfills": "^1.0.3 || ^2.0.1" + "yoast/phpunit-polyfills": "^4.0.0" }, "require-dev": { "roave/security-advisories": "dev-latest" diff --git a/tests/tests/TestBehatTags.php b/tests/tests/TestBehatTags.php index f9c435df6..ab2e13498 100644 --- a/tests/tests/TestBehatTags.php +++ b/tests/tests/TestBehatTags.php @@ -2,6 +2,7 @@ use WP_CLI\Tests\TestCase; use WP_CLI\Utils; +use PHPUnit\Framework\Attributes\DataProvider; class TestBehatTags extends TestCase { @@ -37,6 +38,7 @@ protected function tear_down(): void { * @param string $env * @param string $expected */ + #[DataProvider('data_behat_tags_wp_version_github_token')] public function test_behat_tags_wp_version_github_token( $env, $expected ): void { $env_wp_version = getenv( 'WP_VERSION' ); $env_github_token = getenv( 'GITHUB_TOKEN' ); From 9252dadf8cdb04753b3d49f1f59ca750d5d8a205 Mon Sep 17 00:00:00 2001 From: Pascal Birchler Date: Sat, 17 May 2025 13:39:21 +0200 Subject: [PATCH 2/6] Add missing schema --- phpunit.xml.dist | 3 +++ 1 file changed, 3 insertions(+) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 6e20198df..b7619f503 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,3 +1,4 @@ + From 9a410df8359986326c33c39b91b56ce43bf0fbe0 Mon Sep 17 00:00:00 2001 From: Pascal Birchler Date: Sat, 17 May 2025 13:39:37 +0200 Subject: [PATCH 3/6] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9069d567c..33c01b909 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,5 @@ phpunit.xml phpcs.xml .phpcs.xml .phpunit.result.cache +.phpunit.cache build/logs From 7d63f33011ffddedb505d5bb6e7542a0f3262248 Mon Sep 17 00:00:00 2001 From: Pascal Birchler Date: Sat, 17 May 2025 13:43:28 +0200 Subject: [PATCH 4/6] Lint fix --- tests/tests/TestBehatTags.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests/TestBehatTags.php b/tests/tests/TestBehatTags.php index ab2e13498..421a42c1a 100644 --- a/tests/tests/TestBehatTags.php +++ b/tests/tests/TestBehatTags.php @@ -38,7 +38,7 @@ protected function tear_down(): void { * @param string $env * @param string $expected */ - #[DataProvider('data_behat_tags_wp_version_github_token')] + #[DataProvider( 'data_behat_tags_wp_version_github_token' )] public function test_behat_tags_wp_version_github_token( $env, $expected ): void { $env_wp_version = getenv( 'WP_VERSION' ); $env_github_token = getenv( 'GITHUB_TOKEN' ); From 79c90006c809be3f84f2b87ea9299d15c45ef18a Mon Sep 17 00:00:00 2001 From: Pascal Birchler Date: Sat, 17 May 2025 13:47:10 +0200 Subject: [PATCH 5/6] Ignore warning --- tests/tests/TestBehatTags.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests/TestBehatTags.php b/tests/tests/TestBehatTags.php index 421a42c1a..fe5dc3585 100644 --- a/tests/tests/TestBehatTags.php +++ b/tests/tests/TestBehatTags.php @@ -38,7 +38,7 @@ protected function tear_down(): void { * @param string $env * @param string $expected */ - #[DataProvider( 'data_behat_tags_wp_version_github_token' )] + #[DataProvider( 'data_behat_tags_wp_version_github_token' )] // phpcs:ignore PHPCompatibility.Attributes.NewAttributes.PHPUnitAttributeFound public function test_behat_tags_wp_version_github_token( $env, $expected ): void { $env_wp_version = getenv( 'WP_VERSION' ); $env_github_token = getenv( 'GITHUB_TOKEN' ); From c7995a39809035d0e27d7997d7f0a5a9224534bb Mon Sep 17 00:00:00 2001 From: Pascal Birchler Date: Sat, 17 May 2025 14:00:53 +0200 Subject: [PATCH 6/6] Update BehatTags test while we're at it --- tests/tests/TestBehatTags.php | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/tests/tests/TestBehatTags.php b/tests/tests/TestBehatTags.php index fe5dc3585..bc4468090 100644 --- a/tests/tests/TestBehatTags.php +++ b/tests/tests/TestBehatTags.php @@ -112,25 +112,7 @@ public function test_behat_tags_php_version(): void { $contents = ''; $expected = ''; - if ( '5.3' === $php_version ) { - $contents = '@require-php-5.2 @require-php-5.3 @require-php-5.4 @less-than-php-5.2 @less-than-php-5.3 @less-than-php-5.4'; - $expected = '~@require-php-5.4&&~@less-than-php-5.2&&~@less-than-php-5.3'; - } elseif ( '5.4' === $php_version ) { - $contents = '@require-php-5.3 @require-php-5.4 @require-php-5.5 @less-than-php-5.3 @less-than-php-5.4 @less-than-php-5.5'; - $expected = '~@require-php-5.5&&~@less-than-php-5.3&&~@less-than-php-5.4'; - } elseif ( '5.5' === $php_version ) { - $contents = '@require-php-5.4 @require-php-5.5 @require-php-5.6 @less-than-php-5.4 @less-than-php-5.5 @less-than-php-5.6'; - $expected = '~@require-php-5.6&&~@less-than-php-5.4&&~@less-than-php-5.5'; - } elseif ( '5.6' === $php_version ) { - $contents = '@require-php-5.5 @require-php-5.6 @require-php-7.0 @less-than-php-5.5 @less-than-php-5.6 @less-than-php-7.0'; - $expected = '~@require-php-7.0&&~@less-than-php-5.5&&~@less-than-php-5.6'; - } elseif ( '7.0' === $php_version ) { - $contents = '@require-php-5.6 @require-php-7.0 @require-php-7.1 @less-than-php-5.6 @less-than-php-7.0 @less-than-php-7.1'; - $expected = '~@require-php-7.1&&~@less-than-php-5.6&&~@less-than-php-7.0'; - } elseif ( '7.1' === $php_version ) { - $contents = '@require-php-7.0 @require-php-7.1 @require-php-7.2 @less-than-php-7.0 @less-than-php-7.1 @less-than-php-7.2'; - $expected = '~@require-php-7.2&&~@less-than-php-7.0&&~@less-than-php-7.1'; - } elseif ( '7.2' === $php_version ) { + if ( '7.2' === $php_version ) { $contents = '@require-php-7.1 @require-php-7.2 @require-php-7.3 @less-than-php-7.1 @less-than-php-7.2 @less-than-php-7.3'; $expected = '~@require-php-7.3&&~@less-than-php-7.1&&~@less-than-php-7.2'; } elseif ( '7.3' === $php_version ) { @@ -145,6 +127,15 @@ public function test_behat_tags_php_version(): void { } elseif ( '8.1' === $php_version ) { $contents = '@require-php-8.0 @require-php-8.1 @require-php-8.2 @less-than-php-8.0 @less-than-php-8.1 @less-than-php-8.2'; $expected = '~@require-php-8.2&&~@less-than-php-8.0&&~@less-than-php-8.1'; + } elseif ( '8.2' === $php_version ) { + $contents = '@require-php-8.0 @require-php-8.1 @require-php-8.2 @require-php-8.3 @less-than-php-8.0 @less-than-php-8.1 @less-than-php-8.2 @less-than-php-8.3 @less-than-php-8.4'; + $expected = '~@require-php-8.3&&~@less-than-php-8.0&&~@less-than-php-8.1&&~@less-than-php-8.2'; + } elseif ( '8.3' === $php_version ) { + $contents = '@require-php-8.1 @require-php-8.2 @require-php-8.3 @require-php-8.4 @less-than-php-8.0 @less-than-php-8.1 @less-than-php-8.2 @less-than-php-8.3 @less-than-php-8.4'; + $expected = '~@require-php-8.4&&~@less-than-php-8.0&&~@less-than-php-8.1&&~@less-than-php-8.2&&~@less-than-php-8.3'; + } elseif ( '8.4' === $php_version ) { + $contents = '@require-php-8.2 @require-php-8.3 @require-php-8.4 @require-php-8.5 @less-than-php-8.0 @less-than-php-8.1 @less-than-php-8.2 @less-than-php-8.3 @less-than-php-8.4 @less-than-php-8.5'; + $expected = '~@require-php-8.5&&~@less-than-php-8.0&&~@less-than-php-8.1&&~@less-than-php-8.2&&~@less-than-php-8.3&&~@less-than-php-8.4'; } else { $this->markTestSkipped( "No test for PHP_VERSION $php_version." ); }