From 4527d1aeb271a1ca3459b276e137a38159c051f5 Mon Sep 17 00:00:00 2001
From: Alain Schlesser <alain.schlesser@gmail.com>
Date: Thu, 2 Dec 2021 12:06:18 -0500
Subject: [PATCH] Support PHP 8.1

---
 composer.json             | 13 +++++--------
 tests/test-behat-tags.php | 23 ++++++++++++++++++-----
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/composer.json b/composer.json
index bb4836c71..f1d3938e1 100644
--- a/composer.json
+++ b/composer.json
@@ -13,22 +13,19 @@
         "behat/behat": "^3.7",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || ^0.5 || ^0.6.2 || ^0.7.1",
         "php-parallel-lint/php-console-highlighter": "^0.5",
-        "php-parallel-lint/php-parallel-lint": "^1.2",
-        "phpcompatibility/php-compatibility": "^9.3",
+        "php-parallel-lint/php-parallel-lint": "^1.3.1",
+        "phpcompatibility/php-compatibility": "^9.3.5",
         "wp-cli/config-command": "^1 || ^2",
         "wp-cli/core-command": "^1 || ^2",
         "wp-cli/eval-command": "^1 || ^2",
-        "wp-cli/wp-cli": "^2",
-        "wp-coding-standards/wpcs": "^2.3",
-        "yoast/phpunit-polyfills": "^1.0"
+        "wp-cli/wp-cli": "dev-master as 2.5.1",
+        "wp-coding-standards/wpcs": "^2.3.0",
+        "yoast/phpunit-polyfills": "^1.0.3"
     },
     "require-dev": {
         "roave/security-advisories": "dev-latest"
     },
     "config": {
-        "platform": {
-            "php": "5.6"
-        },
         "sort-packages": true
     },
     "extra": {
diff --git a/tests/test-behat-tags.php b/tests/test-behat-tags.php
index 51b7a73c3..1cf82c7f3 100644
--- a/tests/test-behat-tags.php
+++ b/tests/test-behat-tags.php
@@ -1,20 +1,21 @@
 <?php
 
+use WP_CLI\Tests\TestCase;
 use WP_CLI\Utils;
 
-class BehatTagsTest extends PHPUnit_Framework_TestCase {
+class BehatTagsTest extends TestCase {
 
 	public $temp_dir;
 
-	protected function setUp() {
-		parent::setUp();
+	protected function set_up() {
+		parent::set_up();
 
 		$this->temp_dir = Utils\get_temp_dir() . uniqid( 'wp-cli-test-behat-tags-', true );
 		mkdir( $this->temp_dir );
 		mkdir( $this->temp_dir . '/features' );
 	}
 
-	protected function tearDown() {
+	protected function tear_down() {
 
 		if ( $this->temp_dir && file_exists( $this->temp_dir ) ) {
 			foreach ( glob( $this->temp_dir . '/features/*' ) as $feature_file ) {
@@ -24,7 +25,7 @@ protected function tearDown() {
 			rmdir( $this->temp_dir );
 		}
 
-		parent::tearDown();
+		parent::tear_down();
 	}
 
 	/**
@@ -97,6 +98,18 @@ public function test_behat_tags_php_version() {
 		} elseif ( '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 ) {
+			$contents = '@require-php-7.2 @require-php-7.3 @require-php-7.4 @less-than-php-7.2 @less-than-php-7.3 @less-than-php-7.4';
+			$expected = '~@require-php-7.4&&~@less-than-php-7.2&&~@less-than-php-7.3';
+		} elseif ( '7.4' === $php_version ) {
+			$contents = '@require-php-7.3 @require-php-7.4 @require-php-8.0 @less-than-php-7.3 @less-than-php-7.4 @less-than-php-8.0';
+			$expected = '~@require-php-8.0&&~@less-than-php-7.3&&~@less-than-php-7.4';
+		} elseif ( '8.0' === $php_version ) {
+			$contents = '@require-php-7.4 @require-php-8.0 @require-php-8.1 @less-than-php-7.4 @less-than-php-8.0 @less-than-php-8.1';
+			$expected = '~@require-php-8.1&&~@less-than-php-7.4&&~@less-than-php-8.0';
+		} 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';
 		} else {
 			$this->markTestSkipped( "No test for PHP_VERSION $php_version." );
 		}