Changeset 57926 for trunk/tests/phpunit/tests/db/charset.php

Timestamp:

04/04/2024 03:11:37 PM (3 years ago)

Author:

johnbillion

Message:

Database: Remove back-compat for database servers that don't support utf8mb4.

Since WordPress 6.5, the minimum supported version of MySQL and MariaDB is 5.5.5. This means all supported database servers now support the utf8mb4 character set and therefore the conditional logic for this is no longer necessary.

Props l1nuxjedi, craigfrancis, OllieJones, johnbillion

Fixes #60096

File:

• trunk/tests/phpunit/tests/db/charset.php (modified) (6 diffs)

trunk/tests/phpunit/tests/db/charset.php

@@ -521 +521 @@
                 } else {
                         $new_charset = $data[0]['charset'];
-                }
-
-                if ( 'utf8mb4' === $new_charset && ! self::$_wpdb->has_cap( 'utf8mb4' ) ) {
-                        $this->markTestSkipped( "The current MySQL server doesn't support the utf8mb4 character set." );
                 }
 
@@ -796 +792 @@
         public function test_get_table_charset( $drop, $create, $table, $expected_charset ) {
                 self::$_wpdb->query( $drop );
-
-                if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
-                        $this->markTestSkipped( "This version of MySQL doesn't support utf8mb4." );
-                }
-
                 self::$_wpdb->query( $create );
 
@@ -837 +828 @@
         public function test_get_column_charset( $drop, $create, $table, $expected_charset ) {
                 self::$_wpdb->query( $drop );
-
-                if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
-                        $this->markTestSkipped( "This version of MySQL doesn't support utf8mb4." );
-                }
-
                 self::$_wpdb->query( $create );
 
@@ -865 +851 @@
                 self::$_wpdb->query( $drop );
 
-                if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
-                        $this->markTestSkipped( "This version of MySQL doesn't support utf8mb4." );
-                }
-
                 self::$_wpdb->is_mysql = false;
 
@@ -891 +873 @@
         public function test_get_column_charset_is_mysql_undefined( $drop, $create, $table, $columns ) {
                 self::$_wpdb->query( $drop );
-
-                if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
-                        $this->markTestSkipped( "This version of MySQL doesn't support utf8mb4." );
-                }
 
                 unset( self::$_wpdb->is_mysql );
@@ -953 +931 @@
         public function test_strip_invalid_text_from_query( $create, $query, $expected, $drop ) {
                 self::$_wpdb->query( $drop );
-
-                if ( ! self::$_wpdb->has_cap( 'utf8mb4' ) && preg_match( '/utf8mb[34]/i', $create ) ) {
-                        $this->markTestSkipped( "This version of MySQL doesn't support utf8mb4." );
-                }
-
                 self::$_wpdb->query( $create );