Merge pull request #5472 from Automattic/staging

Production release: v20240416.0

.github/actions/run-wp-tests/action.yml

@@ -61,7 +61,7 @@ runs:
         fi
 
     - name: Set up PHP
-      uses: shivammathur/setup-php@2.30.1
+      uses: shivammathur/setup-php@2.30.2
       with:
         coverage: ${{ steps.coverage.outputs.coverage }}
         ini-values: ${{ steps.coverage.outputs.ini }}
@@ -126,7 +126,7 @@ runs:
         "${PHPUNIT}" ${OPTIONS}
 
     - name: Upload coverage report
-      uses: codecov/codecov-action@v4.1.0
+      uses: codecov/codecov-action@v4.2.0
       with:
         files: ${{ inputs.coverage-file }}
         flags: ${{ inputs.coverage-flags }}

.github/workflows/changelog-summary-prod.yml

@@ -64,7 +64,7 @@ jobs:
         uses: actions/checkout@v4.1.2
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.30.1
+        uses: shivammathur/setup-php@2.30.2
 
       - name: Install
         uses: ramsey/composer-install@3.0.0

.github/workflows/changelog-summary-staging.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v4.1.2
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.30.1
+        uses: shivammathur/setup-php@2.30.2
 
       - name: Install
         uses: ramsey/composer-install@3.0.0

.github/workflows/codeql-analysis.yml

@@ -32,10 +32,10 @@ jobs:
         uses: actions/checkout@v4.1.2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.24.9
+        uses: github/codeql-action/init@v3.24.10
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql-config.yml
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.24.9
+        uses: github/codeql-action/analyze@v3.24.10

.github/workflows/core-tests.yml

@@ -67,7 +67,7 @@ jobs:
           cache-dependency-path: 'wordpress/package-lock.json'
 
       - name: Set up PHP
-        uses: shivammathur/setup-php@2.30.1
+        uses: shivammathur/setup-php@2.30.2
         with:
           php-version: 8.0
           coverage: none
@@ -97,11 +97,11 @@ jobs:
 
       - name: WordPress Docker container debug information
         run: |
-          docker-compose run --rm mysql mysql --version
-          docker-compose run --rm php php --version
-          docker-compose run --rm php php -m
-          docker-compose run --rm php php -i
-          docker-compose run --rm php locale -a
+          docker compose run --rm mysql mysql --version
+          docker compose run --rm php php --version
+          docker compose run --rm php php -m
+          docker compose run --rm php php -i
+          docker compose run --rm php locale -a
         working-directory: wordpress
 
       - name: Install WordPress
@@ -122,6 +122,5 @@ jobs:
 
       - name: Run external HTTP tests
         run: |
-          sed -i 's/ test_multiple_location_headers/ disabled_test_multiple_location_headers/' tests/phpunit/tests/http/base.php
           node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c phpunit.xml.dist --group external-http
         working-directory: wordpress

.github/workflows/lint.yml

@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v4.1.2
 
       - name: Set up PHP
-        uses: shivammathur/setup-php@2.30.1
+        uses: shivammathur/setup-php@2.30.2
         with:
           coverage: none
         env:

001-core/options-api.php

@@ -39,8 +39,16 @@ function pre_wp_load_alloptions_protections( $pre_loaded_alloptions, $force_cach
 	}
 
 	// 3) Otherwise query the DB for fresh results.
+	if ( function_exists( 'wp_autoload_values_to_autoload' ) ) {
+		$values = wp_autoload_values_to_autoload();
+	} else {
+		$values = [ 'yes' ];
+	}
+
+	/** @var string[] $values */
+
 	$suppress      = $wpdb->suppress_errors();
-	$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" );
+	$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload IN ( '" . implode( "', '", esc_sql( $values ) ) . "' )" );
 	$wpdb->suppress_errors( $suppress );
 
 	$alloptions = [];

composer.json

@@ -1,13 +1,13 @@
 {
     "require-dev": {
-        "phpunit/phpunit": "9.6.18",
+        "phpunit/phpunit": "9.6.19",
         "automattic/vipwpcs": "3.0.0",
         "phpcompatibility/phpcompatibility-wp": "2.1.4",
         "erusev/parsedown": "1.7.4",
         "dms/phpunit-arraysubset-asserts": "0.5.0",
-        "yoast/phpunit-polyfills": "2.0.0",
-        "johnpbloch/wordpress-core": "6.4.3",
-        "wp-phpunit/wp-phpunit": "6.4.2",
+        "yoast/phpunit-polyfills": "2.0.1",
+        "johnpbloch/wordpress-core": "6.5.0",
+        "wp-phpunit/wp-phpunit": "6.5.0",
         "wp-cli/wp-cli": "2.10.0"
     },
     "config": {