Ticket #3610: wp-env-phpunit-upgrade.patch

.gitignore

@@ -14 +14 @@
 /phpcs.xml
 /phpunit.xml
 /pnpm-lock.yaml
+.phpunit.result.cache
 
 # Output directory.
 /build/

composer.json

@@ -5 +5 @@
         "require-dev": {
                 "phpcompatibility/phpcompatibility-wp": "^2.1",
                 "wp-coding-standards/wpcs": "^2.3",
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2"
+                "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
+                "phpunit/phpunit": "^9",
+                "yoast/phpunit-polyfills": "^3.0"
         },
         "minimum-stability": "dev",
         "prefer-stable": true,
@@ -15 +17 @@
                 ],
                 "lint": [
                         "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs"
+                ],
+                "test": [
+                        "@php ./vendor/bin/phpunit -c phpunit.xml.dist"
+                ],
+                "phpunit": [
+                        "@test"
                 ]
+        },
+        "config": {
+                "allow-plugins": {
+                        "composer/installers": true,
+                        "dealerdirect/phpcodesniffer-composer-installer": true
+                }
         }
 }

package.json

@@ -30 +30 @@
         "devDependencies": {
                 "@wordpress/browserslist-config": "~2.1.3",
                 "@wordpress/stylelint-config": "~22.4.0",
+                "@wordpress/env": "^10.8.0",
                 "autoprefixer": "~8.2.0",
                 "browserslist": "~4.23.2",
                 "grunt": "~1.6.1",
@@ -48 +49 @@
                 "grunt-postcss": "~0.9.0",
                 "grunt-rtlcss": "~2.0.2",
                 "grunt-sass": "~3.1.0",
-                "grunt-stylelint": "~0.8.0",
+                "grunt-stylelint": "~0.18",
                 "grunt-terser": "~2.0.0",
                 "grunt-wp-i18n": "~1.0.3",
+                "grunt-composer": "~0.4.5",
                 "matchdep": "~2.0.0",
                 "node-sass": "~9.0.0",
                 "postcss": "~8.4.40",
                 "postcss-markdown": "~1.2.0",
                 "postcss-scss": "~1.0.2",
-                "stylelint": "~15.11.0",
-                "stylelint-scss": "~6.4.1",
+                "stylelint": "~14",
+                "stylelint-scss": "~5",
                 "terser": "~5.31.3"
+        },
+        "scripts": {
+                "wp-env": "wp-env",
+                "test-php": "npm run wp-env run cli -- --env-cwd=wp-content/plugins/bbPress composer test"
         }
 }

phpunit.xml.dist

@@ -7 +7 @@
         convertWarningsToExceptions="true"
         >
         <testsuites>
-                <testsuite>
+                <testsuite name="bbPress Test Suite">
                         <directory suffix=".php">tests/phpunit/testcases/</directory>
                 </testsuite>
         </testsuites>
@@ -27 +27 @@
                         <!-- </arguments>-->
                 <!-- </listener>-->
         <!-- </listeners>-->
-        <filter>
-                <whitelist processUncoveredFilesFromWhitelist="true">
-                        <directory suffix=".php">src</directory>
-                </whitelist>
-        </filter>
+        <coverage>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+        <exclude>
+            <directory suffix=".php">./tests</directory>
+            <directory suffix=".php">./vendor</directory>
+        </exclude>
+    </coverage>
 </phpunit>

tests/phpunit/includes/testcase.php

@@ -7 +7 @@
         /**
          * Fake WP mail globals, to avoid errors
          */
-        public static function setUpBeforeClass() {
+        public static function setUpBeforeClass(): void {
                 add_filter( 'wp_mail',      array( 'BBP_UnitTestCase', 'setUp_wp_mail'    ) );
                 add_filter( 'wp_mail_from', array( 'BBP_UnitTestCase', 'tearDown_wp_mail' ) );
         }
 
-        public function setUp() {
+        public function setUp(): void {
                 parent::setUp();
 
                 $this->factory = new BBP_UnitTest_Factory;
@@ -30 +30 @@
                 }
         }
 
-        public function tearDown() {
+        public function tearDown(): void {
                 global $wpdb;
 
                 parent::tearDown();
@@ -56 +56 @@
                 parent::clean_up_global_scope();
         }
 
-        function assertPreConditions() {
+        function assertPreConditions(): void {
                 parent::assertPreConditions();
         }
 

tests/phpunit/testcases/admin/tools.php

@@ -7 +7 @@
  */
 class BBP_Tests_Admin_Tools extends BBP_UnitTestCase {
         protected $old_current_user = 0;
+        protected $keymaster_id;
 
-        public function setUp() {
+        public function setUp(): void {
                 parent::setUp();
                 $this->old_current_user = get_current_user_id();
                 $this->set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
@@ -22 +23 @@
                 }
         }
 
-        public function tearDown() {
+        public function tearDown(): void {
                 parent::tearDown();
                 $this->set_current_user( $this->old_current_user );
         }

tests/phpunit/testcases/common/functions.php

@@ -8 +8 @@
 
 class BBP_Tests_Common_Functions extends BBP_UnitTestCase {
 
+        protected $old_current_user;
+        protected $moderator_id;
+        protected $keymaster_id;
+
         /**
          * @covers ::bbp_number_format
          * @todo   Implement test_bbp_number_format().

tests/phpunit/testcases/common/verify-nonce.php

@@ -10 +10 @@
         private $server_port = '';
         private $request_uri = '';
 
-        public function setUp() {
+        public function setUp(): void {
                 parent::setUp();
 
                 if ( isset( $_SERVER['HTTP_HOST'] ) ) {
@@ -26 +26 @@
                 }
         }
 
-        public function tearDown() {
+        public function tearDown(): void {
                         $_SERVER['HTTP_HOST'] = $this->http_host;
 
                         $_SERVER['SERVER_PORT'] = $this->server_port;

tests/phpunit/testcases/replies/template/status.php

@@ -9 +9 @@
  */
 class BBP_Tests_Repliess_Template_Status extends BBP_UnitTestCase {
         protected $old_current_user = 0;
+        protected $keymaster_id;
 
-        public function setUp() {
+        public function setUp(): void {
                 parent::setUp();
                 $this->old_current_user = get_current_user_id();
                 $this->set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
@@ -18 +19 @@
                 bbp_set_user_role( $this->keymaster_id, bbp_get_keymaster_role() );
         }
 
-        public function tearDown() {
+        public function tearDown(): void {
                 parent::tearDown();
                 $this->set_current_user( $this->old_current_user );
         }

tests/phpunit/testcases/topics/functions/topic.php

@@ -9 +9 @@
  */
 class BBP_Tests_Topics_Functions_Topic extends BBP_UnitTestCase {
 
+        protected $old_current_user;
+    protected $keymaster_id;
+
         /**
          * @group canonical
          * @covers ::bbp_insert_topic

tests/phpunit/testcases/users/template/user.php

@@ -8 +8 @@
  */
 class BBP_Tests_Users_Template_User extends BBP_UnitTestCase {
 
+    protected $keymaster_userdata;
+        protected $keymaster_id;
         protected $old_current_user = 0;
 
-        public function setUp() {
+        public function setUp(): void {
                 parent::setUp();
                 $this->old_current_user = get_current_user_id();
                 $this->set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
@@ -19 +21 @@
                 bbp_set_user_role( $this->keymaster_id, bbp_get_keymaster_role() );
         }
 
-        public function tearDown() {
+        public function tearDown(): void {
                 parent::tearDown();
                 $this->set_current_user( $this->old_current_user );
         }
@@ -37 +39 @@
                 $this->assertSame( $this->keymaster_id, $user_id );
 
                 // Output.
-                $this->expectOutputString( $formatted_value );
-                bbp_user_id( $this->keymaster_id );
+                $this->expectOutputRegex( '/' . preg_quote($formatted_value, '/') . '/' );
+        bbp_user_id( $this->keymaster_id );
         }
 
         /**