Ticket #49344: Make_tests_running_with_MySQL_8_0.patch

tests/phpunit/tests/dbdelta.php

@@ -562 +562 @@
                         "
                         CREATE TABLE {$wpdb->prefix}spatial_index_test (
                                 non_spatial bigint(20) unsigned NOT NULL,
-                                spatial_value geometrycollection NOT NULL,
+                                spatial_value geometrycollection NOT NULL SRID 0,
                                 KEY non_spatial (non_spatial),
                                 SPATIAL KEY spatial_key (spatial_value)
                         ) ENGINE=MyISAM;

tests/phpunit/tests/db.php

@@ -295 +295 @@
 
                 $current_modes = $wpdb->get_var( 'SELECT @@SESSION.sql_mode;' );
 
-                $new_modes = array( 'IGNORE_SPACE', 'NO_AUTO_CREATE_USER' );
+                $new_modes = array( 'IGNORE_SPACE', 'NO_AUTO_VALUE_ON_ZERO' );
 
                 $wpdb->set_sql_mode( $new_modes );
 
@@ -333 +333 @@
 
                 $current_modes = $wpdb->get_var( 'SELECT @@SESSION.sql_mode;' );
 
-                $new_modes = array( 'IGNORE_SPACE', 'ONLY_FULL_GROUP_BY', 'NO_AUTO_CREATE_USER' );
+                $new_modes = array( 'IGNORE_SPACE', 'STRICT_TRANS_TABLES', 'NO_AUTO_VALUE_ON_ZERO' );
 
                 add_filter( 'incompatible_sql_modes', array( $this, 'filter_allowed_incompatible_sql_mode' ), 1, 1 );
                 $wpdb->set_sql_mode( $new_modes );
                 remove_filter( 'incompatible_sql_modes', array( $this, 'filter_allowed_incompatible_sql_mode' ), 1 );
 
                 $check_new_modes = $wpdb->get_var( 'SELECT @@SESSION.sql_mode;' );
-                $this->assertContains( 'ONLY_FULL_GROUP_BY', explode( ',', $check_new_modes ) );
+                $this->assertContains( 'STRICT_TRANS_TABLES', explode( ',', $check_new_modes ) );
 
                 $wpdb->set_sql_mode( explode( ',', $current_modes ) );
         }
 
         public function filter_allowed_incompatible_sql_mode( $modes ) {
-                $pos = array_search( 'ONLY_FULL_GROUP_BY', $modes, true );
+                $pos = array_search( 'STRICT_TRANS_TABLES', $modes, true );
                 $this->assertGreaterThanOrEqual( 0, $pos );
 
                 if ( false === $pos ) {