Unit Tests: Run under PHP 8.1, same as production

.docker/bin/install-wp-tests.sh

@@ -91,8 +91,6 @@ install_wp() {
 		download https://wordpress.org/${ARCHIVE_NAME}.tar.gz  $TMPDIR/wordpress.tar.gz
 		tar --strip-components=1 -zxmf $TMPDIR/wordpress.tar.gz -C $WP_CORE_DIR
 	fi
-
-	download https://raw.github.com/markoheijnen/wp-mysqli/master/db.php $WP_CORE_DIR/wp-content/db.php
 }
 
 install_test_suite() {

.github/workflows/linter.yml

@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       with:
         path: '**/node_modules'
         key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
@@ -35,8 +35,18 @@ jobs:
       run: |
         sudo apt-get update && sudo apt-get install -y subversion
 
+    - name: Set PHP version
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '8.1'
+        coverage: none
+        tools: composer:v2
+      env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
     - name: composer install
       run: |
+        rm composer.lock || true
         composer install
 
     - name: yarn install and build

.github/workflows/unit-tests.yml

@@ -5,6 +5,7 @@ on:
   pull_request:
     paths:
     - public_html/**
+    - .github/**
   push:
     branches: [production]
     paths:
@@ -17,9 +18,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       with:
         path: '**/node_modules'
         key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
@@ -45,7 +46,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4'] # 8.0 -- Add back to matrix when 8.0 is supported.
+        php-version: ['8.1']
 
     services:
       mysql:
@@ -59,7 +60,7 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Install SVN
       run: sudo apt-get update && sudo apt-get install -y subversion
@@ -69,13 +70,17 @@ jobs:
       with:
         php-version: ${{ matrix.php-version }}
         coverage: none
-        tools: composer:v1
+        tools: composer:v2
+      env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Start mysql service
       run: sudo /etc/init.d/mysql start
 
     - name: Install dependencies
-      run: composer install
+      run: |
+        rm composer.lock || true
+        composer install
 
     - name: Install WordPress
       run: |

composer.json

@@ -139,7 +139,7 @@
 		"wpackagist-plugin/email-post-changes": "dev-trunk",
 		"wpackagist-plugin/gutenberg": "*",
 		"wpackagist-plugin/hyperdb": "dev-trunk",
-		"wpackagist-plugin/jetpack": "*",
+		"wpackagist-plugin/jetpack": "13.7.1",
 		"wpackagist-plugin/liveblog": "*",
 		"wpackagist-plugin/public-post-preview": "*",
 		"wpackagist-plugin/pwa": "*",
@@ -174,6 +174,7 @@
 		"tw": "@test:watch",
 		"twg": "@test:watch:group",
 		"post-update-cmd": [
+			"[ $COMPOSER_DEV_MODE -eq 0 ] || mkdir -p public_html/wp-content/mu-plugins-private/wporg-mu-plugins/pub-sync",
 			"[ $COMPOSER_DEV_MODE -eq 0 ] || rm -rf public_html/wp-content/mu-plugins-private/wporg-mu-plugins/pub-sync/*",
 			"[ $COMPOSER_DEV_MODE -eq 0 ] || mv public_html/wp-content/mu-plugins-private/wporg-mu-plugins/tmp/mu-plugins/* public_html/wp-content/mu-plugins-private/wporg-mu-plugins/pub-sync",
 			"[ $COMPOSER_DEV_MODE -eq 0 ] || rm -rf public_html/wp-content/mu-plugins-private/wporg-mu-plugins/tmp/"

phpunit-bootstrap.php

@@ -66,3 +66,48 @@
  * This has to be done after Core's bootstrapper finished, so that PHPUnit classes will be available.
  */
 require_once( __DIR__ . '/phpunit-database-testcase.php' );
+
+
+/**
+ * If a site creation attempts to occur with a specific blog_id, force it.
+ *
+ * WordCamp operates on a number of assumptions that require specific blog_ids to be used.
+ * This is a hacky hack to ensure that the blog_ids are always what we expect them to be.
+ *
+ * @see WordCamp\Tests\Database_TestCase::wpSetUpBeforeClass()
+ */
+function normalize_site_data( $data ) {
+	if (
+		// Nothing specified.
+		! isset( $data['blog_id'] ) ||
+		// Site exists, don't mess with it.. This will likely cause test failures.
+		get_site( $data['blog_id'] )
+	) {
+		return $data;
+	}
+
+	// Filter the WPDB::update() call to include the `blog_id` field..
+	add_filter(
+		'query',
+		$callback = static function ( $query ) use ( $data, &$callback ) {
+			global $wpdb;
+
+			if ( str_starts_with( $query, "INSERT INTO `{$wpdb->blogs}`" ) ) {
+				$blog_id = intval( $data['blog_id'] );
+				$query   = preg_replace(
+					"/(INSERT INTO `{$wpdb->blogs}`)\s*\((.+)\) VALUES \(/",
+					'$1 (`blog_id`, $2 ) VALUES ( ' . $blog_id . ', ',
+					$query
+				);
+
+				// Unhook, we've done our job.
+				remove_filter( 'query', $callback );
+			}
+
+			return $query;
+		}
+	);
+
+	return $data;
+}
+tests_add_filter( 'wp_normalize_site_data', __NAMESPACE__ . '\normalize_site_data', 10, 2 );

phpunit-database-testcase.php

@@ -3,7 +3,6 @@
 namespace WordCamp\Tests;
 use WP_UnitTestCase, WP_UnitTest_Factory;
 
-
 /**
  * Provides a mock WordCamp.org network of sites to test against.
  *
@@ -15,6 +14,8 @@
  */
 class Database_TestCase extends WP_UnitTestCase {
 	protected static $central_site_id;
+	protected static $events_root_site_id;
+	protected static $wordcamp_root_site_id;
 	protected static $year_dot_2018_site_id;
 	protected static $year_dot_2019_site_id;
 	protected static $slash_year_2016_site_id;
@@ -29,6 +30,39 @@ class Database_TestCase extends WP_UnitTestCase {
 	 * @param WP_UnitTest_Factory $factory
 	 */
 	public static function wpSetUpBeforeClass( $factory ) {
+		ms_upload_constants();
+
+		global $wpdb;
+		// Reset the sites table, so the IDs are predictable. WordPress doesn't respect network_id=1.
+		$wpdb->query( "TRUNCATE TABLE $wpdb->site" );
+		$wpdb->query( "TRUNCATE TABLE $wpdb->sitemeta" );
+
+		$factory->network->create( array(
+			'domain'           => 'wordcamp.test',
+			'path'              => '/',
+			'subdomain_install' => true,
+			'network_id'        => WORDCAMP_NETWORK_ID,
+		) );
+		$factory->network->create( array(
+			'domain'     => 'events.wordpress.test',
+			'path'       => '/',
+			'network_id' => EVENTS_NETWORK_ID,
+		) );
+
+		self::$wordcamp_root_site_id = $factory->blog->create( array(
+			'domain'     => 'wordcamp.test',
+			'path'       => '/',
+			'blog_id'    => WORDCAMP_ROOT_BLOG_ID,
+			'network_id' => WORDCAMP_NETWORK_ID,
+		) );
+
+		self::$events_root_site_id = $factory->blog->create( array(
+			'domain'     => 'events.wordpress.test',
+			'path'       => '/',
+			'blog_id'    => EVENTS_ROOT_BLOG_ID,
+			'network_id' => EVENTS_NETWORK_ID,
+		) );
+
 		self::$central_site_id = $factory->blog->create( array(
 			'domain'     => 'central.wordcamp.test',
 			'path'       => '/',
@@ -93,13 +127,17 @@ public static function wpTearDownAfterClass() {
 		global $wpdb;
 
 		wp_delete_site( self::$central_site_id );
+		wp_delete_site( self::$wordcamp_root_site_id );
+		wp_delete_site( self::$events_root_site_id );
 		wp_delete_site( self::$year_dot_2018_site_id );
 		wp_delete_site( self::$year_dot_2019_site_id );
 		wp_delete_site( self::$slash_year_2016_site_id );
 		wp_delete_site( self::$slash_year_2018_dev_site_id );
 		wp_delete_site( self::$slash_year_2020_site_id );
 
-		$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->sitemeta} WHERE site_id = %d", WORDCAMP_NETWORK_ID ) );
-		$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->site}     WHERE id      = %d", WORDCAMP_NETWORK_ID ) );
+		foreach ( [ WORDCAMP_NETWORK_ID, EVENTS_NETWORK_ID ] as $network_id ) {
+			$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->sitemeta} WHERE site_id = %d", $network_id ) );
+			$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->site}     WHERE id      = %d", $network_id ) );
+		}
 	}
 }

public_html/wp-content/mu-plugins/3-helpers-misc.php

@@ -158,6 +158,9 @@ function wcorg_skip_feature( $flag, $blog_id = null ) {
 	}
 
 	$flags = get_site_meta( $blog_id, 'wordcamp_skip_feature' );
+	if ( ! $flags ) {
+		$flags = [];
+	}
 
 	return in_array( $flag, $flags, true );
 }

public_html/wp-content/mu-plugins/tests/test-jetpack-css-sanitization.php

@@ -15,7 +15,7 @@
  *
  * @package WordCamp\Tests
  */
-class Test_Jetpack_CSS_Sanitization extends WP_UnitTestCase {
+class Test_Jetpack_CSS_Sanitization extends Database_TestCase {
 
 	/**
 	 * Test that no selector characters are encoded.

public_html/wp-content/mu-plugins/tests/test-lets-encrypt-helper.php

@@ -31,6 +31,7 @@ public static function wpSetUpBeforeClass( $factory ) {
 		$database_sites = array(
 			'example.org', // The default site in WP's test suite.
 			'central.wordcamp.test',
+			'wordcamp.test',
 
 			// It should contain a city root site entry for the year.city domains that exist in the db.
 			'seattle.wordcamp.test',

public_html/wp-content/mu-plugins/tests/test-sunrise-events.php

@@ -11,6 +11,7 @@
 
 
 namespace WordCamp\Sunrise\Events;
+use WordCamp\Tests\Database_TestCase;
 use WP_UnitTestCase;
 
 defined( 'WPINC' ) || die();
@@ -19,7 +20,7 @@
  * @group sunrise
  * @group mu-plugins
  */
-class Test_Sunrise_Events extends WP_UnitTestCase {
+class Test_Sunrise_Events extends Database_TestCase {
 	/**
 	 * @covers WordCamp\Sunrise\get_redirect_url
 	 *

public_html/wp-content/mu-plugins/tests/test-trusted-deputy-capabilities.php

@@ -2,6 +2,7 @@
 
 namespace WordCamp\Trusted_Deputy_Capabilities\Tests;
 
+use WordCamp\Tests\Database_TestCase;
 use WP_UnitTestCase, WP_UnitTest_Factory;
 use function WordCamp\Trusted_Deputy_Capabilities\{ is_deputy };
 
@@ -11,7 +12,7 @@
  * @group mu-plugins
  * @group trusted-deputies
  */
-class Test_Trusted_Deputy_Capabilities extends WP_UnitTestCase {
+class Test_Trusted_Deputy_Capabilities extends Database_TestCase {
 	/**
 	 * Note: `wporg_remove_super_caps()` denies `import` to non-Super Admins if the domain isn't wordcamp.org,
 	 * which results in a false-negative on sandboxes with alternate domain names.
@@ -54,9 +55,11 @@ class Test_Trusted_Deputy_Capabilities extends WP_UnitTestCase {
 	/**
 	 * Setup shared fixtures before any tests are run.
 	 */
-	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) : void {
+	public static function wpSetUpBeforeClass( $factory ) : void {
 		global $trusted_deputies;
 
+		parent::wpSetUpBeforeClass( $factory );
+
 		self::$subscriber_id = self::factory()->user->create( array(
 			'role' => 'subscriber',
 		) );

public_html/wp-content/mu-plugins/tests/test-wcorg-subroles.php

@@ -4,6 +4,7 @@
 
 use WP_UnitTestCase;
 use WordCamp\SubRoles;
+use WordCamp\Tests\Database_TestCase;
 
 defined( 'WPINC' ) || die();
 
@@ -15,7 +16,7 @@
  *
  * @package WordCamp\Tests
  */
-class Test_SubRoles extends WP_UnitTestCase {
+class Test_SubRoles extends Database_TestCase {
 	/**
 	 * Reset global state between tests, for isolation.
 	 */

public_html/wp-content/plugins/wordcamp-organizer-reminders/tests/test-wcor-mailer.php

@@ -1,7 +1,8 @@
 <?php
 
 namespace WordCamp\Organizer_Reminders\Tests;
-use WP_UnitTestCase, WP_UnitTest_Factory;
+use WordCamp\Tests\Database_TestCase;
+use WP_UnitTest_Factory;
 use WCOR_Reminder, WCOR_Mailer;
 
 defined( 'WPINC' ) || die();
@@ -13,7 +14,7 @@
  *
  * @group organizer-reminders
  */
-class Test_WCOR_Mailer extends WP_UnitTestCase {
+class Test_WCOR_Mailer extends Database_TestCase {
 	/**
 	 * @var int $triggered_reminder_post_id The ID of an Organizer Reminder post which is configured to be sent on a trigger.
 	 */

public_html/wp-content/plugins/wordcamp-payments-network/tests/bootstrap.php

@@ -10,9 +10,7 @@
  * Load the plugins that we'll need to be active for the tests.
  */
 function manually_load_plugin() {
-	// @todo switch to `require_once` once it's accessible in all local environments.
-	// @link https://github.com/WordPress/wordcamp.org/issues/769
-	include_once SUT_WP_CONTENT_DIR . '/mu-plugins-private/wporg-mu-plugins/pub-sync/utilities/class-export-csv.php';
+	require_once SUT_WP_CONTENT_DIR . '/mu-plugins-private/wporg-mu-plugins/pub-sync/utilities/class-export-csv.php';
 
 	require_once WP_PLUGIN_DIR . '/wordcamp-payments/includes/wordcamp-budgets.php';
 	require_once WP_PLUGIN_DIR . '/wordcamp-payments/includes/payment-request.php';

public_html/wp-content/plugins/wordcamp-remote-css/app/synchronize-remote-css.php

@@ -77,7 +77,9 @@ function fetch_unsafe_remote_css( $remote_css_url ) {
  */
 function sanitize_unsafe_css( $unsafe_css ) {
 	if ( ! class_exists( 'Jetpack_Custom_CSS_Enhancements' ) ) {
-		if ( version_compare( JETPACK__VERSION, '11.6', '<' ) ) {
+		if ( version_compare( JETPACK__VERSION, '13.7.1', '>' ) ) {
+			return ''; // Custom CSS not included in Jetpack anymore.
+		} elseif ( version_compare( JETPACK__VERSION, '11.6', '<' ) ) {
 			require_once JETPACK__PLUGIN_DIR . '/modules/custom-css/custom-css-4.7.php';
 		} else {
 			require_once JETPACK__PLUGIN_DIR . '/modules/custom-css/custom-css.php';