Changeset 49580

Timestamp:

11/12/2020 08:18:08 PM (4 years ago)

Author:

johnbillion

Message:

General: Convert wp_array_get() to a "private" function and add tests.

This function may be promoted in the future if it's deemed useful enough.

Props dd32, jorgefilipecosta, Hareesh Pillai

Fixes #51720

Location:

trunk/src/wp-includes

Files:

• block-supports/align.php (modified) (2 diffs)
• block-supports/colors.php (modified) (2 diffs)
• block-supports/custom-classname.php (modified) (2 diffs)
• block-supports/generated-classname.php (modified) (1 diff)
• block-supports/typography.php (modified) (2 diffs)
• functions.php (modified) (1 diff)

trunk/src/wp-includes/block-supports/align.php

@@ -16 +16 @@
     $has_align_support = false;
     if ( property_exists( $block_type, 'supports' ) ) {
-        $has_align_support = wp_array_get( $block_type->supports, array( 'align' ), false );
+        $has_align_support = _wp_array_get( $block_type->supports, array( 'align' ), false );
     }
     if ( $has_align_support ) {
@@ -47 +47 @@
     $has_align_support = false;
     if ( property_exists( $block_type, 'supports' ) ) {
-        $has_align_support = wp_array_get( $block_type->supports, array( 'align' ), false );
+        $has_align_support = _wp_array_get( $block_type->supports, array( 'align' ), false );
     }
     if ( $has_align_support ) {

trunk/src/wp-includes/block-supports/colors.php

@@ -16 +16 @@
     $color_support = false;
     if ( property_exists( $block_type, 'supports' ) ) {
-        $color_support = wp_array_get( $block_type->supports, array( '__experimentalColor' ), false );
+        $color_support = _wp_array_get( $block_type->supports, array( '__experimentalColor' ), false );
     }
-    $has_text_colors_support       = true === $color_support || ( is_array( $color_support ) && wp_array_get( $color_support, array( 'text' ), true ) );
-    $has_background_colors_support = true === $color_support || ( is_array( $color_support ) && wp_array_get( $color_support, array( 'background' ), true ) );
-    $has_gradients_support         = wp_array_get( $color_support, array( 'gradients' ), false );
+    $has_text_colors_support       = true === $color_support || ( is_array( $color_support ) && _wp_array_get( $color_support, array( 'text' ), true ) );
+    $has_background_colors_support = true === $color_support || ( is_array( $color_support ) && _wp_array_get( $color_support, array( 'background' ), true ) );
+    $has_gradients_support         = _wp_array_get( $color_support, array( 'gradients' ), false );
 
     if ( ! $block_type->attributes ) {
@@ -64 +64 @@
  */
 function wp_apply_colors_support( $block_type, $block_attributes ) {
-    $color_support                 = wp_array_get( $block_type->supports, array( '__experimentalColor' ), false );
-    $has_text_colors_support       = true === $color_support || ( is_array( $color_support ) && wp_array_get( $color_support, array( 'text' ), true ) );
-    $has_background_colors_support = true === $color_support || ( is_array( $color_support ) && wp_array_get( $color_support, array( 'background' ), true ) );
-    $has_link_colors_support       = wp_array_get( $color_support, array( 'linkColor' ), false );
-    $has_gradients_support         = wp_array_get( $color_support, array( 'gradients' ), false );
+    $color_support                 = _wp_array_get( $block_type->supports, array( '__experimentalColor' ), false );
+    $has_text_colors_support       = true === $color_support || ( is_array( $color_support ) && _wp_array_get( $color_support, array( 'text' ), true ) );
+    $has_background_colors_support = true === $color_support || ( is_array( $color_support ) && _wp_array_get( $color_support, array( 'background' ), true ) );
+    $has_link_colors_support       = _wp_array_get( $color_support, array( 'linkColor' ), false );
+    $has_gradients_support         = _wp_array_get( $color_support, array( 'gradients' ), false );
     $classes                       = array();
     $styles                        = array();

trunk/src/wp-includes/block-supports/custom-classname.php

@@ -16 +16 @@
     $has_custom_classname_support = true;
     if ( property_exists( $block_type, 'supports' ) ) {
-        $has_custom_classname_support = wp_array_get( $block_type->supports, array( 'customClassName' ), true );
+        $has_custom_classname_support = _wp_array_get( $block_type->supports, array( 'customClassName' ), true );
     }
     if ( $has_custom_classname_support ) {
@@ -45 +45 @@
     $attributes                   = array();
     if ( property_exists( $block_type, 'supports' ) ) {
-        $has_custom_classname_support = wp_array_get( $block_type->supports, array( 'customClassName' ), true );
+        $has_custom_classname_support = _wp_array_get( $block_type->supports, array( 'customClassName' ), true );
     }
     if ( $has_custom_classname_support ) {

trunk/src/wp-includes/block-supports/generated-classname.php

@@ -48 +48 @@
     $attributes                      = array();
     if ( property_exists( $block_type, 'supports' ) ) {
-        $has_generated_classname_support = wp_array_get( $block_type->supports, array( 'className' ), true );
+        $has_generated_classname_support = _wp_array_get( $block_type->supports, array( 'className' ), true );
     }
     if ( $has_generated_classname_support ) {

trunk/src/wp-includes/block-supports/typography.php

@@ -16 +16 @@
     $has_font_size_support = false;
     if ( property_exists( $block_type, 'supports' ) ) {
-        $has_font_size_support = wp_array_get( $block_type->supports, array( '__experimentalFontSize' ), false );
+        $has_font_size_support = _wp_array_get( $block_type->supports, array( '__experimentalFontSize' ), false );
     }
 
     $has_line_height_support = false;
     if ( property_exists( $block_type, 'supports' ) ) {
-        $has_line_height_support = wp_array_get( $block_type->supports, array( '__experimentalLineHeight' ), false );
+        $has_line_height_support = _wp_array_get( $block_type->supports, array( '__experimentalLineHeight' ), false );
     }
 
@@ -57 +57 @@
     $styles                = array();
     if ( property_exists( $block_type, 'supports' ) ) {
-        $has_font_size_support = wp_array_get( $block_type->supports, array( 'fontSize' ), false );
+        $has_font_size_support = _wp_array_get( $block_type->supports, array( 'fontSize' ), false );
     }
 
     $has_line_height_support = false;
     if ( property_exists( $block_type, 'supports' ) ) {
-        $has_line_height_support = wp_array_get( $block_type->supports, array( 'lineHeight' ), false );
+        $has_line_height_support = _wp_array_get( $block_type->supports, array( 'lineHeight' ), false );
     }
 

trunk/src/wp-includes/functions.php

@@ -4529 +4529 @@
  * Accesses an array in depth based on a path of keys.
  *
- * It is the PHP equivalent of JavaScript's lodash.get, and mirroring it may help other components
+ * It is the PHP equivalent of JavaScript's `lodash.get()` and mirroring it may help other components
  * retain some symmetry between client and server implementations.
  *
+ * Example usage:
+ *
+ *     $array = array(
+ *         'a' => array(
+ *             'b' => array(
+ *                 'c' => 1,
+ *             ),
+ *         ),
+ *     );
+ *     _wp_array_get( $array, array( 'a', 'b', 'c' );
+ *
+ * @internal
+ *
  * @since 5.6.0
+ * @access private
  *
  * @param array $array   An array from which we want to retrieve some information.
  * @param array $path    An array of keys describing the path with which to retrieve information.
- * @param array $default The return value if the path is not set on the array,
- *                       or if the types of array and path are not arrays.
- * @return array An array matching the path specified.
- */
-function wp_array_get( $array, $path, $default = array() ) {
-    // Confirm input values are expected type to avoid notice warnings.
-    if ( ! is_array( $array ) || ! is_array( $path ) ) {
+ * @param mixed $default The return value if the path does not exist within the array,
+ *                       or if `$array` or `$path` are not arrays.
+ * @return mixed The value from the path specified.
+ */
+function _wp_array_get( $array, $path, $default = null ) {
+    // Confirm $path is valid.
+    if ( ! is_array( $path ) || 0 === count( $path ) ) {
         return $default;
     }
 
-    $path_length = count( $path );
-
-    for ( $i = 0; $i < $path_length; ++$i ) {
-        if ( ! isset( $array[ $path[ $i ] ] ) ) {
+    foreach ( $path as $path_element ) {
+        if (
+            ! is_array( $array ) ||
+            ( ! is_string( $path_element ) && ! is_integer( $path_element ) && ! is_null( $path_element ) ) ||
+            ! array_key_exists( $path_element, $array )
+        ) {
             return $default;
         }
-        $array = $array[ $path[ $i ] ];
+        $array = $array[ $path_element ];
     }