Merge branch 'WordPress:trunk' into fix-wp-tests-charset-etc

Author: chloe-pomegranate

composer.json

@@ -65,7 +65,7 @@
 		],
 		"wp-test-php": [
 			"@wp-test-ensure-env @no_additional_args",
-			"rm -rf wordpress/src/wp-content/database/.ht.sqlite.php @no_additional_args",
+			"rm -rf wordpress/src/wp-content/database/.ht.sqlite @no_additional_args",
 			"npm --prefix wordpress run test:php -- @additional_args"
 		],
 		"wp-test-e2e": [
@@ -74,7 +74,7 @@
 		],
 		"wp-test-clean": [
 			"npm --prefix wordpress run env:clean",
-			"rm -rf wordpress/src/wp-content/database/.ht.sqlite.php"
+			"rm -rf wordpress/src/wp-content/database/.ht.sqlite"
 		]
 	}
 }

constants.php

@@ -48,7 +48,7 @@
 	if ( defined( 'DB_FILE' ) ) {
 		define( 'FQDB', FQDBDIR . DB_FILE );
 	} else {
-		define( 'FQDB', FQDBDIR . '.ht.sqlite.php' );
+		define( 'FQDB', FQDBDIR . '.ht.sqlite' );
 	}
 }
 

db.copy

@@ -46,7 +46,10 @@ add_action(
 		if ( ! function_exists( 'activate_plugin' ) ) {
 			require_once ABSPATH . 'wp-admin/includes/plugin.php';
 		}
-		if ( is_plugin_inactive( '{SQLITE_PLUGIN}' ) ) {
+
+		$plugin_path = WP_PLUGIN_DIR . '/' . '{SQLITE_PLUGIN}';
+
+		if ( file_exists( $plugin_path ) && is_plugin_inactive( '{SQLITE_PLUGIN}' ) ) {
 			// If `activate_plugin()` returns a value other than null (like WP_Error),
 			// the plugin could not be found. Try with a hardcoded string,
 			// because that probably means the file was directly copy-pasted.

load.php

@@ -3,7 +3,7 @@
  * Plugin Name: SQLite Database Integration
  * Description: SQLite database driver drop-in.
  * Author: The WordPress Team
- * Version: 2.2.19
+ * Version: 2.2.20
  * Requires PHP: 7.2
  * Textdomain: sqlite-database-integration
  *

php-polyfills.php

@@ -1,6 +1,10 @@
 <?php
 /**
- * Polyfills for php 7 & 8 functions
+ * Polyfills for PHP 8.0 string functions.
+ *
+ * Implementation follows the Symfony polyfill-php80 package.
+ *
+ * @see https://github.com/symfony/polyfill-php80
  *
  * @package wp-sqlite-integration
  */
@@ -17,7 +21,7 @@
 	 * @return bool
 	 */
 	function str_starts_with( string $haystack, string $needle ) {
-		return empty( $needle ) || 0 === strpos( $haystack, $needle );
+		return 0 === strncmp( $haystack, $needle, strlen( $needle ) );
 	}
 }
 
@@ -33,7 +37,7 @@ function str_starts_with( string $haystack, string $needle ) {
 	 * @return bool
 	 */
 	function str_contains( string $haystack, string $needle ) {
-		return empty( $needle ) || false !== strpos( $haystack, $needle );
+		return '' === $needle || false !== strpos( $haystack, $needle );
 	}
 }
 
@@ -49,6 +53,16 @@ function str_contains( string $haystack, string $needle ) {
 	 * @return bool
 	 */
 	function str_ends_with( string $haystack, string $needle ) {
-		return empty( $needle ) || substr( $haystack, -strlen( $needle ) === $needle );
+		if ( '' === $needle || $needle === $haystack ) {
+			return true;
+		}
+
+		if ( '' === $haystack ) {
+			return false;
+		}
+
+		$needle_length = strlen( $needle );
+
+		return $needle_length <= strlen( $haystack ) && 0 === substr_compare( $haystack, $needle, -$needle_length );
 	}
 }

readme.txt

@@ -4,7 +4,7 @@ Contributors:      wordpressdotorg, aristath, janjakes, zieladam, berislav.grgic
 Requires at least: 6.4
 Tested up to:      6.9
 Requires PHP:      7.2
-Stable tag:        2.2.19
+Stable tag:        2.2.20
 License:           GPLv2 or later
 License URI:       https://www.gnu.org/licenses/gpl-2.0.html
 Tags:              performance, database

tests/WP_SQLite_Driver_Tests.php

@@ -15,12 +15,7 @@ public function setUp(): void {
 		$this->sqlite = new $pdo_class( 'sqlite::memory:' );
 
 		$this->engine = new WP_SQLite_Driver(
-			new WP_SQLite_Connection(
-				array(
-					'pdo'            => $this->sqlite,
-					'application_id' => 42, // Test application ID.
-				)
-			),
+			new WP_SQLite_Connection( array( 'pdo' => $this->sqlite ) ),
 			'wp'
 		);
 		$this->engine->query(
@@ -56,11 +51,6 @@ private function assertQueryError( $sql, $error_message ) {
 		$this->assertSame( $error_message, $exception->getMessage() );
 	}
 
-	public function testApplicationID() {
-		$app_id = $this->sqlite->query( 'PRAGMA application_id' )->fetchColumn();
-		$this->assertSame( 42, (int) $app_id );
-	}
-
 	public function testRegexp() {
 		$this->assertQuery(
 			"INSERT INTO _options (option_name, option_value) VALUES ('rss_0123456789abcdef0123456789abcdef', '1');"

tests/bootstrap.php

@@ -1,12 +1,7 @@
 <?php
 
-// Configure the test environment.
-error_reporting( E_ALL );
-define( 'FQDB', ':memory:' );
-define( 'FQDBDIR', __DIR__ . '/../testdb' );
-
+require_once __DIR__ . '/../php-polyfills.php';
 require_once __DIR__ . '/wp-sqlite-schema.php';
-require_once __DIR__ . '/../constants.php';
 require_once __DIR__ . '/../wp-pdo-mysql-on-sqlite.php';
 require_once __DIR__ . '/../wp-includes/sqlite/class-wp-sqlite-query-rewriter.php';
 require_once __DIR__ . '/../wp-includes/sqlite/class-wp-sqlite-lexer.php';
@@ -20,6 +15,11 @@
 	define( 'WP_SQLITE_UNSAFE_ENABLE_UNSUPPORTED_VERSIONS', true );
 }
 
+// Configure the test environment.
+error_reporting( E_ALL );
+define( 'FQDB', ':memory:' );
+define( 'FQDBDIR', __DIR__ . '/../testdb' );
+
 // Polyfill WPDB globals.
 $GLOBALS['table_prefix'] = 'wptests_';
 $GLOBALS['wpdb']         = new class() {
@@ -51,57 +51,6 @@ function apply_filters( $tag, $value, ...$args ) {
 	}
 }
 
-/**
- * Polyfills for php 7 & 8 functions
- */
-
-if ( ! function_exists( 'str_starts_with' ) ) {
-	/**
-	 * Check if a string starts with a specific substring.
-	 *
-	 * @param string $haystack The string to search in.
-	 * @param string $needle The string to search for.
-	 *
-	 * @see https://www.php.net/manual/en/function.str-starts-with
-	 *
-	 * @return bool
-	 */
-	function str_starts_with( string $haystack, string $needle ) {
-		return empty( $needle ) || 0 === strpos( $haystack, $needle );
-	}
-}
-
-if ( ! function_exists( 'str_contains' ) ) {
-	/**
-	 * Check if a string contains a specific substring.
-	 *
-	 * @param string $haystack The string to search in.
-	 * @param string $needle The string to search for.
-	 *
-	 * @see https://www.php.net/manual/en/function.str-contains
-	 *
-	 * @return bool
-	 */
-	function str_contains( string $haystack, string $needle ) {
-		return empty( $needle ) || false !== strpos( $haystack, $needle );
-	}
-}
-
-if ( ! function_exists( 'str_ends_with' ) ) {
-	/**
-	 * Check if a string ends with a specific substring.
-	 *
-	 * @param string $haystack The string to search in.
-	 * @param string $needle The string to search for.
-	 *
-	 * @see https://www.php.net/manual/en/function.str-ends-with
-	 *
-	 * @return bool
-	 */
-	function str_ends_with( string $haystack, string $needle ) {
-		return empty( $needle ) || substr( $haystack, -strlen( $needle ) ) === $needle;
-	}
-}
 if ( extension_loaded( 'mbstring' ) ) {
 
 	if ( ! function_exists( 'mb_str_starts_with' ) ) {

version.php

@@ -5,4 +5,4 @@
  *
  * This constant needs to be updated on plugin release!
  */
-define( 'SQLITE_DRIVER_VERSION', '2.2.19' );
+define( 'SQLITE_DRIVER_VERSION', '2.2.20' );

wp-includes/sqlite-ast/class-wp-sqlite-connection.php

@@ -63,7 +63,6 @@ class WP_SQLite_Connection {
 	 *     @type int|null    $timeout      Optional. SQLite timeout in seconds.
 	 *                                     The time to wait for a writable lock.
 	 *     @type string|null $journal_mode Optional. SQLite journal mode.
-	 *     @type int|null $application_id  Optional. SQLite application ID.
 	 * }
 	 *
 	 * @throws InvalidArgumentException When some connection options are invalid.
@@ -97,10 +96,6 @@ public function __construct( array $options ) {
 		if ( $journal_mode && in_array( $journal_mode, self::SQLITE_JOURNAL_MODES, true ) ) {
 			$this->query( 'PRAGMA journal_mode = ' . $journal_mode );
 		}
-
-		if ( isset( $options['application_id'] ) ) {
-			$this->query( 'PRAGMA application_id = ' . (int) $options['application_id'] );
-		}
 	}
 
 	/**