Changeset 55994 for trunk/src/wp-includes/class-wpdb.php

Timestamp:

06/23/2023 12:15:06 PM (19 months ago)

Author:

SergeyBiryukov

Message:

Database: Replace str_contains() and str_ends_with() usage in wpdb methods.

This avoids fatal errors on PHP < 8.0 if the file is included directly outside of WordPress core, e.g. by HyperDB.

While WordPress core does include polyfills for these functions, they are not directly loaded in the wpdb class.

Follow-up to [54384], [55157], [55158], [55988], [55990].

Props dd32, ryelle, joedolson.
See #58206.

File:

• trunk/src/wp-includes/class-wpdb.php (modified) (5 diffs)

trunk/src/wp-includes/class-wpdb.php

@@ -1497 +1497 @@
         }
 
-        // This is not meant to be foolproof -- but it will catch obviously incorrect usage.
-        if ( ! str_contains( $query, '%' ) ) {
+        /*
+         * This is not meant to be foolproof -- but it will catch obviously incorrect usage.
+         *
+         * Note: str_contains() is not used here, as this file can be included
+         * directly outside of WordPress core, e.g. by HyperDB, in which case
+         * the polyfills from wp-includes/compat.php are not loaded.
+         */
+        if ( false === strpos( $query, '%' ) ) {
             wp_load_translations_early();
             _doing_it_wrong(
@@ -1565 +1571 @@
 
             if ( 'f' === $type && true === $this->allow_unsafe_unquoted_parameters
-                && str_ends_with( $split_query[ $key - 1 ], '%' )
+                /*
+                 * Note: str_ends_with() is not used here, as this file can be included
+                 * directly outside of WordPress core, e.g. by HyperDB, in which case
+                 * the polyfills from wp-includes/compat.php are not loaded.
+                 */
+                && '%' === substr( $split_query[ $key - 1 ], -1, 1 )
             ) {
 
@@ -1626 +1637 @@
                      */
                     if ( true !== $this->allow_unsafe_unquoted_parameters
-                        || ( '' === $format && ! str_ends_with( $split_query[ $key - 1 ], '%' ) )
+                        /*
+                         * Note: str_ends_with() is not used here, as this file can be included
+                         * directly outside of WordPress core, e.g. by HyperDB, in which case
+                         * the polyfills from wp-includes/compat.php are not loaded.
+                         */
+                        || ( '' === $format && '%' !== substr( $split_query[ $key - 1 ], -1, 1 ) )
                     ) {
                         $placeholder = "'%" . $format . "s'";
@@ -4039 +4055 @@
         $db_server_info = $this->db_server_info();
 
-        // Account for MariaDB version being prefixed with '5.5.5-' on older PHP versions.
-        if ( '5.5.5' === $db_version && str_contains( $db_server_info, 'MariaDB' )
+        /*
+         * Account for MariaDB version being prefixed with '5.5.5-' on older PHP versions.
+         *
+         * Note: str_contains() is not used here, as this file can be included
+         * directly outside of WordPress core, e.g. by HyperDB, in which case
+         * the polyfills from wp-includes/compat.php are not loaded.
+         */
+        if ( '5.5.5' === $db_version && false !== strpos( $db_server_info, 'MariaDB' )
             && PHP_VERSION_ID < 80016 // PHP 8.0.15 or older.
         ) {
@@ -4068 +4090 @@
                  * libmysql has supported utf8mb4 since 5.5.3, same as the MySQL server.
                  * mysqlnd has supported utf8mb4 since 5.0.9.
+                 *
+                 * Note: str_contains() is not used here, as this file can be included
+                 * directly outside of WordPress core, e.g. by HyperDB, in which case
+                 * the polyfills from wp-includes/compat.php are not loaded.
                  */
-                if ( str_contains( $client_version, 'mysqlnd' ) ) {
+                if ( false !== strpos( $client_version, 'mysqlnd' ) ) {
                     $client_version = preg_replace( '/^\D+([\d.]+).*/', '$1', $client_version );
                     return version_compare( $client_version, '5.0.9', '>=' );