Automattic · kraftbj · Jan 13, 2025 · Jan 16, 2025 · Jan 21, 2025 · Jan 21, 2025
diff --git a/.github/files/setup-wordpress-env.sh b/.github/files/setup-wordpress-env.sh
@@ -33,6 +33,12 @@ git clone --depth=1 --branch "$WORDPRESS_TAG" git://develop.git.wordpress.org/ "
 # We need a built version of WordPress to test against, so download that into the src directory instead of what's in wordpress-develop.
 rm -rf "/tmp/wordpress-$WP_BRANCH/src"
 git clone --depth=1 --branch "$WORDPRESS_TAG" git://core.git.wordpress.org/ "/tmp/wordpress-$WP_BRANCH/src"
+
+echo "::group::Setting up WordPress uploads directory"
+mkdir -p "/tmp/wordpress-$WP_BRANCH/src/wp-content/uploads"
+chmod -R 777 "/tmp/wordpress-$WP_BRANCH/src/wp-content/uploads"
+echo "::endgroup::"
+
 echo "::endgroup::"
 
 if [[ -n "$GITHUB_ENV" ]]; then
@@ -105,19 +111,6 @@ for PLUGIN in projects/plugins/*/composer.json; do
 	fi
 	cd "$BASE"
 
-	# Upgrade/downgrade WorDBless if necessary.
-	if [[ ( "$WP_BRANCH" == 'trunk' || "$WP_BRANCH" == 'previous' ) && "$TEST_SCRIPT" == "test-php" ]]; then
-		VER=$(composer --format=json --working-dir="$DIR" show | jq -r '.installed[] | select( .name == "roots/wordpress" ) | .version')
-		if [[ -n "$VER" ]]; then
-			INSVER=$WORDPRESS_TAG
-			[[ "$WORDPRESS_TAG" == 'trunk' ]] && INSVER="dev-main as $VER"
-			echo "Supposed to run tests against WordPress $WORDPRESS_TAG, so setting roots/wordpress and roots/wordpress-no-content to \"$INSVER\""
-			# Composer seems to sometimes have issues with deleting the wordpress dir on its own, so do it manually first.
-			rm -rf "$DIR/wordpress"
-			composer --working-dir="$DIR" require --dev roots/wordpress="$INSVER" roots/wordpress-no-content="$INSVER"
-		fi
-	fi
-
 	cp -r "$DIR" "/tmp/wordpress-$WP_BRANCH/src/wp-content/plugins/$NAME"
 	# Plugin dir for tests in WP >= 5.6-beta1
 	ln -s "/tmp/wordpress-$WP_BRANCH/src/wp-content/plugins/$NAME" "/tmp/wordpress-$WP_BRANCH/tests/phpunit/data/plugins/$NAME"

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -85,14 +85,6 @@ jobs:
           pnpm install
           echo "::endgroup::"
 
-          # If we're going to be making WorDBless use WP "nightlies", remove the relevant package from Composer's cache to get the latest version.
-          if [[ "$WP_BRANCH" == 'trunk' && ( "$TEST_SCRIPT" == "test-php" || "$TEST_SCRIPT" == "test-coverage" ) ]]; then
-            echo "::group::Clear composer cache for roots/wordpress"
-            DIR=$(composer config cache-files-dir)
-            rm -rf "$DIR/roots/wordpress" "$DIR/roots/wordpress-no-content"
-            echo "::endgroup::"
-          fi
-
       - name: Detect changed projects
         id: changed
         run: |
@@ -109,9 +101,53 @@ jobs:
           echo "any-plugins=${ANY_PLUGINS}" >> "$GITHUB_OUTPUT"
 
       - name: Select WordPress version
-        if: steps.changed.outputs.any-plugins != 'true' && matrix.wp != 'none'
+        if: matrix.wp != 'none'
         run: .github/files/select-wordpress-tag.sh
 
+      - name: Composer Install
+        run: |
+          # If we're going to be making WorDBless use WP "nightlies", remove the relevant package from Composer's cache to get the latest version.
+          if [[ "$WP_BRANCH" == 'trunk' && ( "$TEST_SCRIPT" == "test-php" || "$TEST_SCRIPT" == "test-coverage" ) ]]; then
+            echo "::group::Clear composer cache for roots/wordpress"
+            DIR=$(composer config cache-files-dir)
+            rm -rf "$DIR/roots/wordpress" "$DIR/roots/wordpress-no-content"
+            echo "::endgroup::"
+          fi
+
+          echo "::group::Composer"
+          composer install --working-dir=tools/php-test-env
+
+          # Add WorDBless for image-cdn package tests since concurrency can nuke uploads that are in use.
+          if [[ "$TEST_SCRIPT" =~ ^test-(php|coverage)$ ]] && jq -e '.name == "automattic/jetpack-image-cdn"' projects/packages/image-cdn/composer.json >/dev/null; then
+            echo "Adding WordBless for image-cdn tests"
+            composer require --working-dir=projects/packages/image-cdn automattic/wordbless:^0.4.2 --dev
+          fi
+
+          # Add WorDBles for publicize package tests since concurrency can nuke uploads that are in use.
+          if [[ "$TEST_SCRIPT" =~ ^test-(php|coverage)$ ]] && jq -e '.name == "automattic/jetpack-publicize"' projects/packages/publicize/composer.json >/dev/null; then
+            echo "Adding WorDBless for publicize tests"
+            composer require --working-dir=projects/packages/publicize automattic/wordbless:^0.4.2 --dev
+          fi
+
+          # Add WorDBles for videopress package tests since concurrency can nuke uploads that are in use.
+          if [[ "$TEST_SCRIPT" =~ ^test-(php|coverage)$ ]] && jq -e '.name == "automattic/jetpack-videopress"' projects/packages/videopress/composer.json >/dev/null; then
+            echo "Adding WorDBless for videopress tests"
+            composer require --working-dir=projects/packages/videopress automattic/wordbless:^0.4.2 --dev
+          fi
+
+          if [[ ( "$TEST_SCRIPT" == "test-php" || "$TEST_SCRIPT" == "test-coverage" ) && ( "$WP_BRANCH" == 'trunk' || "$WP_BRANCH" == 'previous' ) ]]; then
+            VER=$(composer --format=json --working-dir="tools/php-test-env" show | jq -r '.installed[] | select( .name == "roots/wordpress" ) | .version')
+            if [[ -n "$VER" ]]; then
+              INSVER=$WORDPRESS_TAG
+              [[ "$WORDPRESS_TAG" == 'trunk' ]] && INSVER="dev-main as $VER"
+              echo "Supposed to run tests against WordPress $WORDPRESS_TAG, so setting roots/wordpress and roots/wordpress-no-content to \"$INSVER\""
+              # Composer seems to sometimes have issues with deleting the wordpress dir on its own, so do it manually first.
+              rm -rf "tools/php-test-env/wordpress"
+              composer --working-dir="tools/php-test-env" require --dev "roots/wordpress:$INSVER" "roots/wordpress-no-content:$INSVER"
+            fi
+          fi
+          echo "::endgroup::"
+
       - name: Setup WordPress environment for plugin tests
         env:
           API_TOKEN_GITHUB: ${{ secrets.GITHUB_TOKEN }}
@@ -195,18 +231,6 @@ jobs:
                       echo 'Platform reqs failed, running `composer update`'
                       composer --working-dir="$DIR" update
                     fi
-
-                    if [[ "$WP_BRANCH" == 'trunk' || "$WP_BRANCH" == 'previous' ]]; then
-                      VER=$(composer --format=json --working-dir="$DIR" show | jq -r '.installed[] | select( .name == "roots/wordpress" ) | .version')
-                      if [[ -n "$VER" ]]; then
-                        INSVER=$WORDPRESS_TAG
-                        [[ "$WORDPRESS_TAG" == 'trunk' ]] && INSVER="dev-main as $VER"
-                        echo "Supposed to run tests against WordPress $WORDPRESS_TAG, so setting roots/wordpress and roots/wordpress-no-content to \"$INSVER\""
-                        # Composer seems to sometimes have issues with deleting the wordpress dir on its own, so do it manually first.
-                        rm -rf "$DIR/wordpress"
-                        composer --working-dir="$DIR" require --dev roots/wordpress="$INSVER" roots/wordpress-no-content="$INSVER"
-                      fi
-                    fi
                   fi
                 fi
 

diff --git a/.phan/config.base.php b/.phan/config.base.php
@@ -134,6 +134,25 @@ function make_phan_config( $dir, $options = array() ) {
 		$internal_stubs[ $stub ] = $stub_file_path;
 	}
 
+	// Check if test-environment is a dependency and add WorDBless if it is
+	$composer_json = $dir . '/composer.json';
+	if ( file_exists( $composer_json ) ) {
+		$composer_data = json_decode( file_get_contents( $composer_json ), true );
+		foreach ( array( 'require', 'require-dev' ) as $require_type ) {
+			if ( isset( $composer_data[ $require_type ]['automattic/jetpack-test-environment'] ) ) {
+				// Use absolute path to ensure WorDBless is found
+				$wordbless_path = dirname( __DIR__ ) . '/tools/php-test-env/vendor/automattic/wordbless';
+				if ( is_dir( $wordbless_path ) ) {
+					// Only include the src directory
+					$options['directory_list'][] = $wordbless_path . '/src';
+					// Exclude from analysis
+					$options['exclude_analysis_directory_list'][] = $wordbless_path;
+				}
+				break;
+			}
+		}
+	}
+
 	$config = array(
 		// Apparently this is only useful when upgrading from php 5, not for 7-to-8.
 		'backward_compatibility_checks'          => false,

diff --git a/.phan/config.php b/.phan/config.php
@@ -27,6 +27,8 @@
 				// Ignore stuff in various subdirs too.
 				'.*/node_modules/',
 				'tools/docker/',
+				'tools/php-test-env/wordpress/',
+				'tools/php-test-env/vendor/',
 				// Don't load the stubs. (if we need to start loading _a_ stub for the "monorepo", do like `(?!filename\.php)` to exclude it from the exclusion.)
 				'.phan/stubs/',
 			),

diff --git a/composer.json b/composer.json
@@ -69,6 +69,12 @@
 		],
 		"test-js": [
 			"cd tools/cli && pnpm test"
+		],
+		"post-install-cmd": [
+			"cd tools/php-test-env && composer install"
+		],
+		"post-update-cmd": [
+			"cd tools/php-test-env && composer update"
 		]
 	},
 	"scripts-descriptions": {

diff --git a/composer.lock b/composer.lock
diff --git a/projects/packages/admin-ui/changelog/try-one-wordpress-to-rule-them-all b/projects/packages/admin-ui/changelog/try-one-wordpress-to-rule-them-all
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Update development platform only
+
+
diff --git a/projects/packages/admin-ui/composer.json b/projects/packages/admin-ui/composer.json
@@ -10,7 +10,7 @@
 		"yoast/phpunit-polyfills": "^1.1.1",
 		"automattic/jetpack-changelogger": "@dev",
 		"automattic/jetpack-logo": "@dev",
-		"automattic/wordbless": "^0.4.2"
+		"automattic/jetpack-test-environment": "@dev"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
@@ -29,9 +29,7 @@
 		],
 		"test-php": [
 			"@composer phpunit"
-		],
-		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy"
+		]
 	},
 	"repositories": [
 		{

diff --git a/projects/packages/admin-ui/tests/php/bootstrap.php b/projects/packages/admin-ui/tests/php/bootstrap.php
@@ -12,4 +12,5 @@
 
 define( 'WP_DEBUG', true );
 
-\WorDBless\Load::load();
+// Initialize WordPress test environment
+\Automattic\Jetpack\Test_Environment::init();
diff --git a/projects/packages/backup-helper-script-manager/changelog/try-one-wordpress-to-rule-them-all b/projects/packages/backup-helper-script-manager/changelog/try-one-wordpress-to-rule-them-all
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Update development platform only
+
+
diff --git a/projects/packages/backup-helper-script-manager/composer.json b/projects/packages/backup-helper-script-manager/composer.json
@@ -9,7 +9,7 @@
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
 		"automattic/jetpack-changelogger": "@dev",
-		"automattic/wordbless": "^0.4.2"
+		"automattic/jetpack-test-environment": "@dev"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
@@ -28,9 +28,7 @@
 		],
 		"test-php": [
 			"@composer phpunit"
-		],
-		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy"
+		]
 	},
 	"repositories": [
 		{

diff --git a/projects/packages/backup-helper-script-manager/tests/php/bootstrap.php b/projects/packages/backup-helper-script-manager/tests/php/bootstrap.php
@@ -12,4 +12,5 @@
 
 define( 'WP_DEBUG', true );
 
-\WorDBless\Load::load();
+// Initialize WordPress test environment
+\Automattic\Jetpack\Test_Environment::init();
diff --git a/projects/packages/backup/changelog/try-one-wordpress-to-rule-them-all b/projects/packages/backup/changelog/try-one-wordpress-to-rule-them-all
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Update development platform only
+
+
diff --git a/projects/packages/backup/composer.json b/projects/packages/backup/composer.json
@@ -19,7 +19,7 @@
 	"require-dev": {
 		"automattic/jetpack-changelogger": "@dev",
 		"yoast/phpunit-polyfills": "^1.1.1",
-		"automattic/wordbless": "^0.4.2"
+		"automattic/jetpack-test-environment": "@dev"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
@@ -43,8 +43,6 @@
 		"test-php": [
 			"@composer phpunit"
 		],
-		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy",
 		"build-development": [
 			"pnpm run build"
 		],

diff --git a/projects/packages/backup/tests/php/bootstrap.php b/projects/packages/backup/tests/php/bootstrap.php
@@ -12,4 +12,5 @@
 
 define( 'WP_DEBUG', true );
 
-\WorDBless\Load::load();
+// Initialize WordPress test environment
+\Automattic\Jetpack\Test_Environment::init();
diff --git a/projects/packages/blaze/changelog/try-one-wordpress-to-rule-them-all b/projects/packages/blaze/changelog/try-one-wordpress-to-rule-them-all
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Update development platform only
+
+
diff --git a/projects/packages/blaze/composer.json b/projects/packages/blaze/composer.json
@@ -16,7 +16,7 @@
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^1.1.1",
 		"automattic/jetpack-changelogger": "@dev",
-		"automattic/wordbless": "^0.4.2"
+		"automattic/jetpack-test-environment": "@dev"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
@@ -45,9 +45,7 @@
 		"watch": [
 			"Composer\\Config::disableProcessTimeout",
 			"pnpm run watch"
-		],
-		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy"
+		]
 	},
 	"repositories": [
 		{

diff --git a/projects/packages/blaze/tests/php/bootstrap.php b/projects/packages/blaze/tests/php/bootstrap.php
@@ -10,7 +10,5 @@
  */
 require_once __DIR__ . '/../../vendor/autoload.php';
 
-/**
- * Load WorDBless
- */
-\WorDBless\Load::load();
+// Initialize WordPress test environment
+\Automattic\Jetpack\Test_Environment::init();
diff --git a/projects/packages/blocks/changelog/try-one-wordpress-to-rule-them-all b/projects/packages/blocks/changelog/try-one-wordpress-to-rule-them-all
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Update development platform only
+
+
diff --git a/projects/packages/blocks/composer.json b/projects/packages/blocks/composer.json
@@ -8,7 +8,7 @@
 		"automattic/jetpack-constants": "@dev"
 	},
 	"require-dev": {
-		"automattic/wordbless": "^0.4.2",
+		"automattic/jetpack-test-environment": "@dev",
 		"brain/monkey": "^2.6.2",
 		"yoast/phpunit-polyfills": "^1.1.1",
 		"automattic/jetpack-changelogger": "@dev"
@@ -25,8 +25,6 @@
 		"phpunit": [
 			"./vendor/phpunit/phpunit/phpunit --colors=always"
 		],
-		"post-install-cmd": "WorDBless\\Composer\\InstallDropin::copy",
-		"post-update-cmd": "WorDBless\\Composer\\InstallDropin::copy",
 		"test-coverage": [
 			"php -dpcov.directory=. ./vendor/bin/phpunit --coverage-php \"$COVERAGE_DIR/php.cov\""
 		],

diff --git a/projects/packages/blocks/tests/php/bootstrap.php b/projects/packages/blocks/tests/php/bootstrap.php
@@ -10,7 +10,5 @@
  */
 require_once __DIR__ . '/../../vendor/autoload.php';
 
-/**
- * Load WorDBless
- */
-\WorDBless\Load::load();
+// Initialize WordPress test environment
+\Automattic\Jetpack\Test_Environment::init();
diff --git a/projects/packages/connection/changelog/try-one-wordpress-to-rule-them-all b/projects/packages/connection/changelog/try-one-wordpress-to-rule-them-all
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Update development platform only
+
+