Changeset 57751 for trunk/src/wp-includes/class-wp-theme-json.php

Timestamp:

03/02/2024 01:39:43 PM (2 years ago)

Author:

swissspidy

Message:

Editor: Simplify sanitization code path in WP_Theme_JSON after [57496]

Removes the custom WP_Theme_JSON::is_assoc() method again in favor of the existing wp_is_numeric_array() helper function.

Props mmaattiiaass, costdev, swissspidy, spacedmonkey.
Fixes #60360.

File:

• trunk/src/wp-includes/class-wp-theme-json.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-theme-json.php

@@ -1066 +1066 @@
                         }
 
-                        // Check if the value is an array and requires further processing.
-                        if ( is_array( $value ) && is_array( $schema[ $key ] ) ) {
-                                // Determine if it is an associative or indexed array.
-                                $schema_is_assoc = self::is_assoc( $value );
-
-                                if ( $schema_is_assoc ) {
-                                        // If associative, process as a single object.
-                                        $tree[ $key ] = self::remove_keys_not_in_schema( $value, $schema[ $key ] );
-
-                                        if ( empty( $tree[ $key ] ) ) {
-                                                unset( $tree[ $key ] );
-                                        }
-                                } else {
+                        if ( is_array( $schema[ $key ] ) ) {
+                                if ( ! is_array( $value ) ) {
+                                        unset( $tree[ $key ] );
+                                } elseif ( wp_is_numeric_array( $value ) ) {
                                         // If indexed, process each item in the array.
                                         foreach ( $value as $item_key => $item_value ) {
@@ -1088 +1079 @@
                                                 }
                                         }
-                                }
-                        } elseif ( is_array( $schema[ $key ] ) && ! is_array( $tree[ $key ] ) ) {
-                                unset( $tree[ $key ] );
-                        }
-                }
-
+                                } else {
+                                        // If associative, process as a single object.
+                                        $tree[ $key ] = self::remove_keys_not_in_schema( $value, $schema[ $key ] );
+
+                                        if ( empty( $tree[ $key ] ) ) {
+                                                unset( $tree[ $key ] );
+                                        }
+                                }
+                        }
+                }
                 return $tree;
-        }
-
-        /**
-         * Checks if the given array is associative.
-         *
-         * @since 6.5.0
-         * @param array $data The array to check.
-         * @return bool True if the array is associative, false otherwise.
-         */
-        protected static function is_assoc( $data ) {
-                if ( array() === $data ) {
-                        return false;
-                }
-                return array_keys( $data ) !== range( 0, count( $data ) - 1 );
         }