Merge pull request #32 from Automattic/fix-reflection-exception

Fix some WP unit test errors

Author: JanJakes

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

@@ -11,29 +11,11 @@ const fs = require( 'fs' );
 const path = require( 'path' );
 
 const expectedErrors = [
-	'Tests_Admin_wpSiteHealth::test_object_cache_default_thresholds_non_multisite',
-	'Tests_Admin_wpSiteHealth::test_object_cache_thresholds with data set #0',
-	'Tests_Admin_wpSiteHealth::test_object_cache_thresholds with data set #1',
-	'Tests_Admin_wpSiteHealth::test_object_cache_thresholds with data set #2',
-	'Tests_Admin_wpSiteHealth::test_object_cache_thresholds with data set #3',
-	'Tests_Admin_wpSiteHealth::test_object_cache_thresholds with data set #4',
 	'Tests_Comment_WpComment::test_get_instance_should_succeed_for_float_that_is_equal_to_post_id',
 	'Tests_Cron_getCronArray::test_get_cron_array_output_validation with data set "null"',
 	'Tests_DB_Charset::test_strip_invalid_text',
 	'Tests_DB::test_db_reconnect',
 	'Tests_DB::test_get_col_info',
-	'Tests_DB::test_prepare_should_respect_the_allow_unsafe_unquoted_parameters_property with data set "escaped-false-1"',
-	'Tests_DB::test_prepare_should_respect_the_allow_unsafe_unquoted_parameters_property with data set "escaped-false-2"',
-	'Tests_DB::test_prepare_should_respect_the_allow_unsafe_unquoted_parameters_property with data set "escaped-true-1"',
-	'Tests_DB::test_prepare_should_respect_the_allow_unsafe_unquoted_parameters_property with data set "escaped-true-2"',
-	'Tests_DB::test_prepare_should_respect_the_allow_unsafe_unquoted_parameters_property with data set "format-false-1"',
-	'Tests_DB::test_prepare_should_respect_the_allow_unsafe_unquoted_parameters_property with data set "format-false-2"',
-	'Tests_DB::test_prepare_should_respect_the_allow_unsafe_unquoted_parameters_property with data set "format-true-1"',
-	'Tests_DB::test_prepare_should_respect_the_allow_unsafe_unquoted_parameters_property with data set "format-true-2"',
-	'Tests_DB::test_prepare_should_respect_the_allow_unsafe_unquoted_parameters_property with data set "numbered-false-1"',
-	'Tests_DB::test_prepare_should_respect_the_allow_unsafe_unquoted_parameters_property with data set "numbered-false-2"',
-	'Tests_DB::test_prepare_should_respect_the_allow_unsafe_unquoted_parameters_property with data set "numbered-true-1"',
-	'Tests_DB::test_prepare_should_respect_the_allow_unsafe_unquoted_parameters_property with data set "numbered-true-2"',
 	'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',
@@ -45,6 +27,8 @@ const expectedErrors = [
 ];
 
 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',

wp-includes/sqlite/class-wp-sqlite-crosscheck-db.php

@@ -2,8 +2,8 @@
 
 class WP_SQLite_Crosscheck_DB_ extends WP_SQLite_DB {
 
-	public function __construct() {
-		parent::__construct();
+	public function __construct( string $dbname ) {
+		parent::__construct( $dbname );
 		$GLOBALS['sqlite'] = $this;
 		$GLOBALS['mysql']  = new wpdb(
 			DB_USER,

wp-includes/sqlite/class-wp-sqlite-db.php

@@ -21,12 +21,24 @@ class WP_SQLite_DB extends wpdb {
 	protected $dbh;
 
 	/**
-	 * Constructor
+	 * Backward compatibility, see wpdb::$allow_unsafe_unquoted_parameters.
 	 *
-	 * Unlike wpdb, no credentials are needed.
+	 * This property is mirroring "wpdb::$allow_unsafe_unquoted_parameters",
+	 * because some tests are accessing it externally using PHP reflection.
+	 *
+	 * @var
+	 */
+	private $allow_unsafe_unquoted_parameters = true;
+
+	/**
+	 * Connects to the SQLite database.
+	 *
+	 * Unlike for MySQL, no credentials and host are needed.
+	 *
+	 * @param string $dbname Database name.
 	 */
-	public function __construct() {
-		parent::__construct( '', '', '', '' );
+	public function __construct( $dbname ) {
+		parent::__construct( '', '', $dbname, '' );
 		$this->charset = 'utf8mb4';
 	}
 
@@ -289,6 +301,33 @@ public function check_connection( $allow_bail = true ) {
 		return true;
 	}
 
+	/**
+	 * Prepares a SQL query for safe execution.
+	 *
+	 * See "wpdb::prepare()". This override only fixes a WPDB test issue.
+	 *
+	 * @param string      $query   Query statement with `sprintf()`-like placeholders.
+	 * @param array|mixed $args    The array of variables or the first variable to substitute.
+	 * @param mixed       ...$args Further variables to substitute when using individual arguments.
+	 * @return string|void         Sanitized query string, if there is a query to prepare.
+	 */
+	public function prepare( $query, ...$args ) {
+		/*
+		 * Sync "$allow_unsafe_unquoted_parameters" with the WPDB parent property.
+		 * This is only needed because some WPDB tests are accessing the private
+		 * property externally via PHP reflection. This should be fixed WP tests.
+		 */
+		$wpdb_allow_unsafe_unquoted_parameters = $this->__get( 'allow_unsafe_unquoted_parameters' );
+		if ( $wpdb_allow_unsafe_unquoted_parameters !== $this->allow_unsafe_unquoted_parameters ) {
+			$property = new ReflectionProperty( 'wpdb', 'allow_unsafe_unquoted_parameters' );
+			$property->setAccessible( true );
+			$property->setValue( $this, $this->allow_unsafe_unquoted_parameters );
+			$property->setAccessible( false );
+		}
+
+		return parent::prepare( $query, ...$args );
+	}
+
 	/**
 	 * Performs a database query.
 	 *

wp-includes/sqlite/db.php

@@ -59,7 +59,7 @@
 $crosscheck_tests_file_path = dirname( __DIR__, 2 ) . '/tests/class-wp-sqlite-crosscheck-db.php';
 if ( defined( 'SQLITE_DEBUG_CROSSCHECK' ) && SQLITE_DEBUG_CROSSCHECK && file_exists( $crosscheck_tests_file_path ) ) {
 	require_once $crosscheck_tests_file_path;
-	$GLOBALS['wpdb'] = new WP_SQLite_Crosscheck_DB();
+	$GLOBALS['wpdb'] = new WP_SQLite_Crosscheck_DB( DB_NAME );
 } else {
-	$GLOBALS['wpdb'] = new WP_SQLite_DB();
+	$GLOBALS['wpdb'] = new WP_SQLite_DB( DB_NAME );
 }