Changeset 56137

Timestamp:

07/05/2023 10:44:20 AM (3 years ago)

Author:

SergeyBiryukov

Message:

General: Compare values as strings in WP_List_Util::filter() and ::sort_callback().

This aims to preserve backward compatibility for code relying on type juggling when using the wp_list_filter() function, e.g. comparing a numeric string to an integer.

Follow-up to [55908].

Props azaozz, jeremyfelt, david.binda.
See #57839.

Location:

trunk

Files:

• src/wp-includes/class-wp-list-util.php (modified) (2 diffs)
• tests/phpunit/tests/functions/wpListFilter.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-list-util.php

@@ -117 +117 @@
                                 if ( is_array( $obj ) ) {
                                         // Treat object as an array.
-                                        if ( array_key_exists( $m_key, $obj ) && ( $m_value === $obj[ $m_key ] ) ) {
+                                        if ( array_key_exists( $m_key, $obj )
+                                                && ( (string) $m_value === (string) $obj[ $m_key ] )
+                                        ) {
                                                 $matched++;
                                         }
                                 } elseif ( is_object( $obj ) ) {
                                         // Treat object as an object.
-                                        if ( isset( $obj->{$m_key} ) && ( $m_value === $obj->{$m_key} ) ) {
+                                        if ( isset( $obj->{$m_key} )
+                                                && ( (string) $m_value === (string) $obj->{$m_key} )
+                                        ) {
                                                 $matched++;
                                         }
@@ -277 +281 @@
                         }
 
-                        if ( $a[ $field ] === $b[ $field ] ) {
+                        if ( (string) $a[ $field ] === (string) $b[ $field ] ) {
                                 continue;
                         }

trunk/tests/phpunit/tests/functions/wpListFilter.php

@@ -211 +211 @@
                                 ),
                         ),
+                        'string to int comparison' => array(
+                                array(
+                                        (object) array(
+                                                'foo' => '1',
+                                        ),
+                                ),
+                                array( 'foo' => 1 ),
+                                'AND',
+                                array(
+                                        0 => (object) array(
+                                                'foo' => '1',
+                                        ),
+                                ),
+                        ),
                 );
         }