Changeset 38863

Timestamp:

10/21/2016 05:00:29 PM (8 years ago)

Author:

ocean90

Message:

Revert [38859] due to an incomplete implementation.

See https://core.trac.wordpress.org/ticket/37128#comment:27.
See #37128.

Location:

trunk

Files:

• src/wp-includes/category-template.php (modified) (1 diff)
• src/wp-includes/class-wp-list-util.php (deleted)
• src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php (modified) (1 diff)
• src/wp-includes/customize/class-wp-customize-nav-menu-setting.php (modified) (3 diffs)
• src/wp-includes/deprecated.php (modified) (1 diff)
• src/wp-includes/functions.php (modified) (6 diffs)
• src/wp-includes/link-template.php (modified) (1 diff)
• src/wp-includes/nav-menu.php (modified) (3 diffs)
• src/wp-settings.php (modified) (1 diff)
• tests/phpunit/tests/functions/wpListUtil.php (deleted)

trunk/src/wp-includes/category-template.php

@@ -98 +98 @@
      */
     return apply_filters( 'get_the_categories', $categories, $id );
+}
+
+/**
+ * Sort categories by name.
+ *
+ * Used by usort() as a callback, should not be used directly. Can actually be
+ * used to sort any term object.
+ *
+ * @since 2.3.0
+ * @access private
+ *
+ * @param object $a
+ * @param object $b
+ * @return int
+ */
+function _usort_terms_by_name( $a, $b ) {
+    return strcmp( $a->name, $b->name );
+}
+
+/**
+ * Sort categories by ID.
+ *
+ * Used by usort() as a callback, should not be used directly. Can actually be
+ * used to sort any term object.
+ *
+ * @since 2.3.0
+ * @access private
+ *
+ * @param object $a
+ * @param object $b
+ * @return int
+ */
+function _usort_terms_by_ID( $a, $b ) {
+    if ( $a->term_id > $b->term_id )
+        return 1;
+    elseif ( $a->term_id < $b->term_id )
+        return -1;
+    else
+        return 0;
 }
 

trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php

@@ -533 +533 @@
 
         if ( ARRAY_A === $args['output'] ) {
-            $items = wp_list_sort( $items, array(
-                $args['output_key'] => 'ASC',
-            ) );
+            $GLOBALS['_menu_item_sort_prop'] = $args['output_key'];
+            usort( $items, '_sort_nav_menu_items' );
             $i = 1;
 

trunk/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php

@@ -288 +288 @@
         // Make sure the menu objects get re-sorted after an update/insert.
         if ( ! $is_delete && ! empty( $args['orderby'] ) ) {
-            $menus = wp_list_sort( $menus, array(
-                $args['orderby'] => 'ASC',
-            ) );
+            $this->_current_menus_sort_orderby = $args['orderby'];
+            usort( $menus, array( $this, '_sort_menus_by_orderby' ) );
         }
         // @todo add support for $args['hide_empty'] === true
@@ -315 +314 @@
      *
      * @since 4.3.0
-     * @deprecated 4.7.0 Use wp_list_sort()
      * @access protected
-     *
      * @param object $menu1
      * @param object $menu2
@@ -325 +322 @@
      */
     protected function _sort_menus_by_orderby( $menu1, $menu2 ) {
-        _deprecated_function( __METHOD__, '4.7.0', 'wp_list_sort' );
-
         $key = $this->_current_menus_sort_orderby;
         return strcmp( $menu1->$key, $menu2->$key );

trunk/src/wp-includes/deprecated.php

@@ -3799 +3799 @@
     return preg_replace( '%&\s*\{[^}]*(\}\s*;?|$)%', '', $string );
 }
-
-/**
- * Sort categories by ID.
- *
- * Used by usort() as a callback, should not be used directly. Can actually be
- * used to sort any term object.
- *
- * @since 2.3.0
- * @deprecated 4.7.0 Use wp_list_sort()
- * @access private
- *
- * @param object $a
- * @param object $b
- * @return int
- */
-function _usort_terms_by_ID( $a, $b ) {
-    _deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort' );
-
-    if ( $a->term_id > $b->term_id )
-        return 1;
-    elseif ( $a->term_id < $b->term_id )
-        return -1;
-    else
-        return 0;
-}
-
-/**
- * Sort categories by name.
- *
- * Used by usort() as a callback, should not be used directly. Can actually be
- * used to sort any term object.
- *
- * @since 2.3.0
- * @deprecated 4.7.0 Use wp_list_sort()
- * @access private
- *
- * @param object $a
- * @param object $b
- * @return int
- */
-function _usort_terms_by_name( $a, $b ) {
-    _deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort' );
-
-    return strcmp( $a->name, $b->name );
-}
-
-/**
- * Sort menu items by the desired key.
- *
- * @since 3.0.0
- * @deprecated 4.7.0 Use wp_list_sort()
- * @access private
- *
- * @global string $_menu_item_sort_prop
- *
- * @param object $a The first object to compare
- * @param object $b The second object to compare
- * @return int -1, 0, or 1 if $a is considered to be respectively less than, equal to, or greater than $b.
- */
-function _sort_nav_menu_items( $a, $b ) {
-    global $_menu_item_sort_prop;
-
-    _deprecated_function( __FUNCTION__, '4.7.0', 'wp_list_sort' );
-
-    if ( empty( $_menu_item_sort_prop ) )
-        return 0;
-
-    if ( ! isset( $a->$_menu_item_sort_prop ) || ! isset( $b->$_menu_item_sort_prop ) )
-        return 0;
-
-    $_a = (int) $a->$_menu_item_sort_prop;
-    $_b = (int) $b->$_menu_item_sort_prop;
-
-    if ( $a->$_menu_item_sort_prop == $b->$_menu_item_sort_prop )
-        return 0;
-    elseif ( $_a == $a->$_menu_item_sort_prop && $_b == $b->$_menu_item_sort_prop )
-        return $_a < $_b ? -1 : 1;
-    else
-        return strcmp( $a->$_menu_item_sort_prop, $b->$_menu_item_sort_prop );
-}

trunk/src/wp-includes/functions.php

@@ -3490 +3490 @@
  *
  * @since 3.0.0
- * @since 4.7.0 Uses WP_List_Util class.
  *
  * @param array       $list     An array of objects to filter
@@ -3504 +3503 @@
  */
 function wp_filter_object_list( $list, $args = array(), $operator = 'and', $field = false ) {
-    if ( ! is_array( $list ) ) {
+    if ( ! is_array( $list ) )
         return array();
-    }
-
-    $util = new WP_List_Util( $list );
-
-    $util->filter( $args, $operator );
-
-    if ( $field ) {
-        $util->pluck( $field );
-    }
-
-    return $util->get_output();
+
+    $list = wp_list_filter( $list, $args, $operator );
+
+    if ( $field )
+        $list = wp_list_pluck( $list, $field );
+
+    return $list;
 }
 
@@ -3523 +3518 @@
  *
  * @since 3.1.0
- * @since 4.7.0 Uses WP_List_Util class.
  *
  * @param array  $list     An array of objects to filter.
@@ -3535 +3529 @@
  */
 function wp_list_filter( $list, $args = array(), $operator = 'AND' ) {
-    if ( ! is_array( $list ) ) {
+    if ( ! is_array( $list ) )
         return array();
-    }
-
-    $util = new WP_List_Util( $list );
-    return $util->filter( $args, $operator );
+
+    if ( empty( $args ) )
+        return $list;
+
+    $operator = strtoupper( $operator );
+    $count = count( $args );
+    $filtered = array();
+
+    foreach ( $list as $key => $obj ) {
+        $to_match = (array) $obj;
+
+        $matched = 0;
+        foreach ( $args as $m_key => $m_value ) {
+            if ( array_key_exists( $m_key, $to_match ) && $m_value == $to_match[ $m_key ] )
+                $matched++;
+        }
+
+        if ( ( 'AND' == $operator && $matched == $count )
+          || ( 'OR' == $operator && $matched > 0 )
+          || ( 'NOT' == $operator && 0 == $matched ) ) {
+            $filtered[$key] = $obj;
+        }
+    }
+
+    return $filtered;
 }
 
@@ -3551 +3566 @@
  * @since 3.1.0
  * @since 4.0.0 $index_key parameter added.
- * @since 4.7.0 Uses WP_List_Util class.
  *
  * @param array      $list      List of objects or arrays
@@ -3562 +3576 @@
  */
 function wp_list_pluck( $list, $field, $index_key = null ) {
-    $util = new WP_List_Util( $list );
-    return $util->pluck( $field, $index_key );
-}
-
-/**
- * Sorts a list of objects, based on one or more orderby arguments.
- *
- * @since 4.7.0
- *
- * @param array        $list    An array of objects to filter.
- * @param string|array $orderby Optional. Either the field name to order by or an array
- *                              of multiple orderby fields as $orderby => $order.
- * @param string       $order   Optional. Either 'ASC' or 'DESC'. Only used if $orderby
- *                              is a string.
- * @return array The sorted array.
- */
-function wp_list_sort( $list, $orderby = array(), $order = 'ASC' ) {
-    if ( ! is_array( $list ) ) {
-        return array();
-    }
-
-    $util = new WP_List_Util( $list );
-    return $util->sort( $orderby, $order );
+    if ( ! $index_key ) {
+        /*
+         * This is simple. Could at some point wrap array_column()
+         * if we knew we had an array of arrays.
+         */
+        foreach ( $list as $key => $value ) {
+            if ( is_object( $value ) ) {
+                $list[ $key ] = $value->$field;
+            } else {
+                $list[ $key ] = $value[ $field ];
+            }
+        }
+        return $list;
+    }
+
+    /*
+     * When index_key is not set for a particular item, push the value
+     * to the end of the stack. This is how array_column() behaves.
+     */
+    $newlist = array();
+    foreach ( $list as $value ) {
+        if ( is_object( $value ) ) {
+            if ( isset( $value->$index_key ) ) {
+                $newlist[ $value->$index_key ] = $value->$field;
+            } else {
+                $newlist[] = $value->$field;
+            }
+        } else {
+            if ( isset( $value[ $index_key ] ) ) {
+                $newlist[ $value[ $index_key ] ] = $value[ $field ];
+            } else {
+                $newlist[] = $value[ $field ];
+            }
+        }
+    }
+
+    return $newlist;
 }
 

trunk/src/wp-includes/link-template.php

@@ -170 +170 @@
             $cats = get_the_category($post->ID);
             if ( $cats ) {
-                $cats = wp_list_sort( $cats, array(
-                    'term_id' => 'ASC',
-                ) );
+                usort($cats, '_usort_terms_by_ID'); // order by ID
 
                 /**

trunk/src/wp-includes/nav-menu.php

@@ -559 +559 @@
 
 /**
+ * Sort menu items by the desired key.
+ *
+ * @since 3.0.0
+ * @access private
+ *
+ * @global string $_menu_item_sort_prop
+ *
+ * @param object $a The first object to compare
+ * @param object $b The second object to compare
+ * @return int -1, 0, or 1 if $a is considered to be respectively less than, equal to, or greater than $b.
+ */
+function _sort_nav_menu_items( $a, $b ) {
+    global $_menu_item_sort_prop;
+
+    if ( empty( $_menu_item_sort_prop ) )
+        return 0;
+
+    if ( ! isset( $a->$_menu_item_sort_prop ) || ! isset( $b->$_menu_item_sort_prop ) )
+        return 0;
+
+    $_a = (int) $a->$_menu_item_sort_prop;
+    $_b = (int) $b->$_menu_item_sort_prop;
+
+    if ( $a->$_menu_item_sort_prop == $b->$_menu_item_sort_prop )
+        return 0;
+    elseif ( $_a == $a->$_menu_item_sort_prop && $_b == $b->$_menu_item_sort_prop )
+        return $_a < $_b ? -1 : 1;
+    else
+        return strcmp( $a->$_menu_item_sort_prop, $b->$_menu_item_sort_prop );
+}
+
+/**
  * Return if a menu item is valid.
  *
@@ -651 +683 @@
 
     if ( ARRAY_A == $args['output'] ) {
-        $items = wp_list_sort( $items, array(
-            $args['output_key'] => 'ASC',
-        ) );
+        $GLOBALS['_menu_item_sort_prop'] = $args['output_key'];
+        usort($items, '_sort_nav_menu_items');
         $i = 1;
         foreach ( $items as $k => $item ) {
@@ -746 +777 @@
                 $menu_item->type_label = __( 'Post Type Archive' );
                 $post_content = wp_trim_words( $menu_item->post_content, 200 );
-                $post_type_description = '' == $post_content ? $post_type_description : $post_content;
+                $post_type_description = '' == $post_content ? $post_type_description : $post_content; 
                 $menu_item->url = get_post_type_archive_link( $menu_item->object );
             } elseif ( 'taxonomy' == $menu_item->type ) {

trunk/src/wp-settings.php

@@ -92 +92 @@
 // Load early WordPress files.
 require( ABSPATH . WPINC . '/compat.php' );
-require( ABSPATH . WPINC . '/class-wp-list-util.php' );
 require( ABSPATH . WPINC . '/functions.php' );
 require( ABSPATH . WPINC . '/class-wp-matchesmapregex.php' );