Merge Automattic fork changes

.gitattributes

@@ -5,10 +5,9 @@
 composer.json export-ignore
 phpcs.xml.dist export-ignore
 phpunit.xml.dist export-ignore
+wp-setup.sh export-ignore
 /.github export-ignore
 /grammar-tools export-ignore
 /tests export-ignore
-/wip export-ignore
-/wp-includes/mysql export-ignore
-/wp-includes/parser export-ignore
 /wp-includes/sqlite/class-wp-sqlite-crosscheck-db.php export-ignore
+/wordpress export-ignore

.github/workflows/phpunit-tests.yml

@@ -17,10 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        # NOTE: There does not appear to be a single phpunit version that supports all
-        # PHP versions tested here. For now, we are removing PHP 7.0. and 7.1 tests
-        # in order to run a single phpunit version for PHP 7.2 and up.
-        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
+        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
 
     with:
       os: ${{ matrix.os }}

.github/workflows/verify-version.yml

@@ -0,0 +1,35 @@
+name: Verify plugin version
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  verify-version:
+    name: Assert the WordPress plugin header declares the same version as the SQLITE_DRIVER_VERSION constant
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Extract version from "load.php"
+        id: load_version
+        run: |
+          VERSION=$(grep "Version:" load.php | sed "s/.*Version: \([^ ]*\).*/\1/")
+          echo "load_version=$VERSION" >> $GITHUB_OUTPUT
+
+      - name: Extract version from "version.php"
+        id: const_version
+        run: |
+          VERSION=$(php -r "require 'version.php'; echo SQLITE_DRIVER_VERSION;")
+          echo "const_version=$VERSION" >> $GITHUB_OUTPUT
+
+      - name: Compare versions
+        run: |
+          if [ "${{ steps.load_version.outputs.load_version }}" != "${{ steps.const_version.outputs.const_version }}" ]; then
+            echo "Version mismatch detected!"
+            echo "  load.php version:     ${{ steps.load_version.outputs.load_version }}"
+            echo "  version.php constant: ${{ steps.const_version.outputs.const_version }}"
+            exit 1
+          fi

.github/workflows/wp-tests-phpunit-run.js

@@ -0,0 +1,142 @@
+/*
+ * Wrap the "composer run wp-tests-phpunit" command to process tests
+ * that are expected to error and fail at the moment.
+ *
+ * This makes sure that the CI job passes, while explicitly tracking
+ * the issues that need to be addressed. Ideally, over time this script
+ * will become obsolete when all errors and failures are resolved.
+ */
+const { execSync } = require( 'child_process' );
+const fs = require( 'fs' );
+const path = require( 'path' );
+
+const expectedErrors = [
+	'Tests_DB_Charset::test_strip_invalid_text',
+	'Tests_DB::test_db_reconnect',
+	'Tests_DB::test_get_col_info',
+	'Tests_DB::test_process_fields_value_too_long_for_field with data set "invalid chars"',
+	'Tests_DB::test_process_fields_value_too_long_for_field with data set "too long"',
+	'Tests_DB::test_process_fields',
+];
+
+const expectedFailures = [
+	'Tests_Admin_wpSiteHealth::test_object_cache_thresholds with data set #2',
+	'Tests_Admin_wpSiteHealth::test_object_cache_thresholds with data set #3',
+	'Tests_Comment::test_wp_new_comment_respects_comment_field_lengths',
+	'Tests_Comment::test_wp_update_comment',
+	'Tests_DB_dbDelta::test_spatial_indices',
+	'Tests_DB::test_charset_switched_to_utf8mb4',
+	'Tests_DB::test_close',
+	'Tests_DB::test_delete_value_too_long_for_field with data set "too long"',
+	'Tests_DB::test_has_cap',
+	'Tests_DB::test_insert_value_too_long_for_field with data set "too long"',
+	'Tests_DB::test_mysqli_flush_sync',
+	'Tests_DB::test_non_unicode_collations',
+	'Tests_DB::test_query_value_contains_invalid_chars',
+	'Tests_DB::test_replace_value_too_long_for_field with data set "too long"',
+	'Tests_DB::test_replace',
+	'Tests_DB::test_supports_collation',
+	'Tests_DB::test_update_value_too_long_for_field with data set "too long"',
+	'Tests_Menu_Walker_Nav_Menu::test_start_el_with_empty_attributes with data set #1',
+	'Tests_Menu_Walker_Nav_Menu::test_start_el_with_empty_attributes with data set #2',
+	'Tests_Menu_Walker_Nav_Menu::test_start_el_with_empty_attributes with data set #3',
+	'Tests_Menu_Walker_Nav_Menu::test_start_el_with_empty_attributes with data set #4',
+	'Tests_Menu_Walker_Nav_Menu::test_start_el_with_empty_attributes with data set #5',
+	'Tests_Menu_Walker_Nav_Menu::test_start_el_with_empty_attributes with data set #6',
+	'Tests_Menu_Walker_Nav_Menu::test_start_el_with_empty_attributes with data set #7',
+	'Tests_Menu_wpNavMenu::test_wp_nav_menu_should_not_have_has_children_class_with_custom_depth',
+	'WP_Test_REST_Posts_Controller::test_get_items_orderby_modified_query',
+];
+
+console.log( 'Running WordPress PHPUnit tests with expected failures tracking...' );
+console.log( 'Expected errors:', expectedErrors );
+console.log( 'Expected failures:', expectedFailures );
+
+try {
+	try {
+		execSync(
+			`composer run wp-test-phpunit -- --log-junit=phpunit-results.xml --verbose`,
+			{ stdio: 'inherit' }
+		);
+		console.log( '\n⚠️ All tests passed, checking if expected errors/failures occurred...' );
+	} catch ( error ) {
+		console.log( '\n⚠️ Some tests errored/failed (expected). Analyzing results...' );
+	}
+
+	// Read the JUnit XML test output:
+	const junitOutputFile = path.join( __dirname, '..', '..', 'wordpress', 'phpunit-results.xml' );
+	if ( ! fs.existsSync( junitOutputFile ) ) {
+		console.error( 'Error: JUnit output file not found!' );
+		process.exit( 1 );
+	}
+	const junitXml = fs.readFileSync( junitOutputFile, 'utf8' );
+
+	// Extract test info from the XML:
+	const actualErrors = [];
+	const actualFailures = [];
+	for ( const testcase of junitXml.matchAll( /<testcase([^>]*)\/>|<testcase([^>]*)>([\s\S]*?)<\/testcase>/g ) ) {
+		const attributes = {};
+		const attributesString = testcase[2] ?? testcase[1];
+		for ( const attribute of attributesString.matchAll( /(\w+)="([^"]*)"/g ) ) {
+			attributes[attribute[1]] = attribute[2];
+		}
+
+		const content = testcase[3] ?? '';
+		const fqn = attributes.class ? `${attributes.class}::${attributes.name}` : attributes.name;
+		const hasError = content.includes( '<error' );
+		const hasFailure = content.includes( '<failure' );
+
+		if ( hasError ) {
+			actualErrors.push( fqn );
+		}
+
+		if ( hasFailure ) {
+			actualFailures.push( fqn );
+		}
+	}
+
+	let isSuccess = true;
+
+	// Check if all expected errors actually errored
+	const unexpectedNonErrors = expectedErrors.filter( test => ! actualErrors.includes( test ) );
+	if ( unexpectedNonErrors.length > 0 ) {
+		console.error( '\n❌ The following tests were expected to error but did not:' );
+		unexpectedNonErrors.forEach( test => console.error( `  - ${test}` ) );
+		isSuccess = false;
+	}
+
+	// Check if all expected failures actually failed
+	const unexpectedPasses = expectedFailures.filter( test => ! actualFailures.includes( test ) );
+	if ( unexpectedPasses.length > 0 ) {
+		console.error( '\n❌ The following tests were expected to fail but passed:' );
+		unexpectedPasses.forEach( test => console.error( `  - ${test}` ) );
+		isSuccess = false;
+	}
+
+	// Check for unexpected errors
+	const unexpectedErrors = actualErrors.filter( test => ! expectedErrors.includes( test ) );
+	if ( unexpectedErrors.length > 0 ) {
+		console.error( '\n❌ The following tests errored unexpectedly:' );
+		unexpectedErrors.forEach( test => console.error( `  - ${test}` ) );
+		isSuccess = false;
+	}
+
+	// Check for unexpected failures
+	const unexpectedFailures = actualFailures.filter( test => ! expectedFailures.includes( test ) );
+	if ( unexpectedFailures.length > 0 ) {
+		console.error( '\n❌ The following tests failed unexpectedly:' );
+		unexpectedFailures.forEach( test => console.error( `  - ${test}` ) );
+		isSuccess = false;
+	}
+
+	if ( isSuccess ) {
+		console.log( '\n✅ All tests behaved as expected!' );
+		process.exit( 0 );
+	} else {
+		console.log( '\n❌ Some tests did not behave as expected!' );
+		process.exit( 1 );
+	}
+} catch ( error ) {
+	console.error( '\n❌ Script execution error:', error.message );
+	process.exit( 1 );
+}

.github/workflows/wp-tests-phpunit.yml

@@ -0,0 +1,38 @@
+name: WordPress Tests
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  test:
+    name: WordPress PHPUnit Tests
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Set UID and GID for PHP in WordPress images
+        run: |
+          echo "PHP_FPM_UID=$(id -u)" >> $GITHUB_ENV
+          echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
+
+      - name: Setup WordPress test environment
+        run: composer run wp-setup
+
+      - name: Start WordPress test environment
+        run: composer run wp-test-start
+
+      - name: Run WordPress PHPUnit tests
+        run: node .github/workflows/wp-tests-phpunit-run.js
+
+      - name: Stop Docker containers
+        if: always()
+        run: composer run wp-test-clean

.gitignore

@@ -5,3 +5,4 @@ composer.lock
 ._.DS_Store
 .DS_Store
 ._*
+/wordpress

activate.php

@@ -75,8 +75,8 @@ function ( $result ) {
  * When the plugin gets merged in wp-core, this is not to be ported.
  */
 function sqlite_plugin_copy_db_file() {
-	// Bail early if the SQLite3 class does not exist.
-	if ( ! class_exists( 'SQLite3' ) ) {
+	// Bail early if the PDO SQLite extension is not loaded.
+	if ( ! extension_loaded( 'pdo_sqlite' ) ) {
 		return;
 	}
 

admin-notices.php

@@ -19,11 +19,11 @@ function sqlite_plugin_admin_notice() {
 		return;
 	}
 
-	// If SQLite is not detected, bail early.
-	if ( ! class_exists( 'SQLite3' ) ) {
+	// If PDO SQLite is not loaded, bail early.
+	if ( ! extension_loaded( 'pdo_sqlite' ) ) {
 		printf(
 			'<div class="notice notice-error"><p>%s</p></div>',
-			esc_html__( 'The SQLite Integration plugin is active, but the SQLite3 class is missing from your server. Please make sure that SQLite is enabled in your PHP installation.', 'sqlite-database-integration' )
+			esc_html__( 'The SQLite Integration plugin is active, but the PDO SQLite extension is missing from your server. Please make sure that PDO SQLite is enabled in your PHP installation.', 'sqlite-database-integration' )
 		);
 		return;
 	}

admin-page.php

@@ -47,11 +47,7 @@ function sqlite_integration_admin_screen() {
 				?>
 			</p>
 		<?php else : ?>
-			<?php if ( ! class_exists( 'SQLite3' ) ) : ?>
-				<div class="notice notice-error">
-					<p><?php esc_html_e( 'We detected that the SQLite3 class is missing from your server. Please make sure that SQLite is enabled in your PHP installation before proceeding.', 'sqlite-database-integration' ); ?></p>
-				</div>
-			<?php elseif ( ! extension_loaded( 'pdo_sqlite' ) ) : ?>
+			<?php if ( ! extension_loaded( 'pdo_sqlite' ) ) : ?>
 				<div class="notice notice-error">
 					<p><?php esc_html_e( 'We detected that the PDO SQLite driver is missing from your server (the pdo_sqlite extension is not loaded). Please make sure that SQLite is enabled in your PHP installation before proceeding.', 'sqlite-database-integration' ); ?></p>
 				</div>
@@ -130,7 +126,8 @@ function sqlite_plugin_adminbar_item( $admin_bar ) {
 	global $wpdb;
 
 	if ( defined( 'SQLITE_DB_DROPIN_VERSION' ) && defined( 'DB_ENGINE' ) && 'sqlite' === DB_ENGINE ) {
-		$title = '<span style="color:#46B450;">' . __( 'Database: SQLite', 'sqlite-database-integration' ) . '</span>';
+		$suffix = defined( 'WP_SQLITE_AST_DRIVER' ) && WP_SQLITE_AST_DRIVER ? ' (AST)' : '';
+		$title  = '<span style="color:#46B450;">' . __( 'Database: SQLite', 'sqlite-database-integration' ) . $suffix . '</span>';
 	} elseif ( stripos( $wpdb->db_server_info(), 'maria' ) !== false ) {
 		$title = '<span style="color:#DC3232;">' . __( 'Database: MariaDB', 'sqlite-database-integration' ) . '</span>';
 	} else {

composer.json

@@ -8,7 +8,9 @@
 		"issues": "https://github.com/wordpress/sqlite-database-integration/issues"
 	},
 	"require": {
-		"php": ">=7.0"
+		"php": ">=7.2",
+		"ext-pdo": "*",
+		"ext-pdo_sqlite": "*"
 	},
 	"require-dev": {
 		"ext-mbstring": "*",
@@ -24,7 +26,8 @@
 		"allow-plugins": {
 			"dealerdirect/phpcodesniffer-composer-installer": true,
 			"phpstan/extension-installer": true
-		}
+		},
+		"process-timeout": 3600
 	},
 	"scripts": {
 		"check-cs": [
@@ -35,6 +38,22 @@
 		],
 		"test": [
 			"phpunit"
+		],
+		"wp-setup": [
+			"./wp-setup.sh"
+		],
+		"wp-run": [
+			"npm --prefix wordpress run"
+		],
+		"wp-test-start": [
+			"npm --prefix wordpress run env:start",
+			"npm --prefix wordpress run env:install"
+		],
+		"wp-test-phpunit": [
+			"npm --prefix wordpress run test:php --"
+		],
+		"wp-test-clean": [
+			"npm --prefix wordpress run env:clean"
 		]
 	}
 }

constants.php

@@ -51,3 +51,8 @@
 		define( 'FQDB', FQDBDIR . '.ht.sqlite' );
 	}
 }
+
+// Allow enabling the SQLite AST driver via environment variable.
+if ( ! defined( 'WP_SQLITE_AST_DRIVER' ) && isset( $_ENV['WP_SQLITE_AST_DRIVER'] ) && 'true' === $_ENV['WP_SQLITE_AST_DRIVER'] ) {
+	define( 'WP_SQLITE_AST_DRIVER', true );
+}