diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php index fab2640c0b..6d9cf7dae7 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -99,6 +99,45 @@ function get_the_category( $id = false ) { 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; +} + /** * Retrieve category name based on category ID. * diff --git a/wp-includes/class-wp-list-util.php b/wp-includes/class-wp-list-util.php deleted file mode 100644 index 0820bb39a6..0000000000 --- a/wp-includes/class-wp-list-util.php +++ /dev/null @@ -1,260 +0,0 @@ -output = $this->input = $input; - } - - /** - * Returns the original input array. - * - * @since 4.7.0 - * @access public - * - * @return array The input array. - */ - public function get_input() { - return $this->input; - } - - /** - * Returns the output array. - * - * @since 4.7.0 - * @access public - * - * @return array The output array. - */ - public function get_output() { - return $this->output; - } - - /** - * Filters the list, based on a set of key => value arguments. - * - * @since 4.7.0 - * - * @param array $args Optional. An array of key => value arguments to match - * against each object. Default empty array. - * @param string $operator Optional. The logical operation to perform. 'AND' means - * all elements from the array must match. 'OR' means only - * one element needs to match. 'NOT' means no elements may - * match. Default 'AND'. - * @return array Array of found values. - */ - public function filter( $args = array(), $operator = 'AND' ) { - if ( empty( $args ) ) { - return $this->output; - } - - $operator = strtoupper( $operator ); - - if ( ! in_array( $operator, array( 'AND', 'OR', 'NOT' ), true ) ) { - return array(); - } - - $count = count( $args ); - $filtered = array(); - - foreach ( $this->output 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; - } - } - - $this->output = $filtered; - - return $this->output; - } - - /** - * Plucks a certain field out of each object in the list. - * - * This has the same functionality and prototype of - * array_column() (PHP 5.5) but also supports objects. - * - * @since 4.7.0 - * - * @param int|string $field Field from the object to place instead of the entire object - * @param int|string $index_key Optional. Field from the object to use as keys for the new array. - * Default null. - * @return array Array of found values. If `$index_key` is set, an array of found values with keys - * corresponding to `$index_key`. If `$index_key` is null, array keys from the original - * `$list` will be preserved in the results. - */ - public function pluck( $field, $index_key = null ) { - if ( ! $index_key ) { - /* - * This is simple. Could at some point wrap array_column() - * if we knew we had an array of arrays. - */ - foreach ( $this->output as $key => $value ) { - if ( is_object( $value ) ) { - $this->output[ $key ] = $value->$field; - } else { - $this->output[ $key ] = $value[ $field ]; - } - } - return $this->output; - } - - /* - * 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 ( $this->output 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 ]; - } - } - } - - $this->output = $newlist; - - return $this->output; - } - - /** - * Sorts the list, based on one or more orderby arguments. - * - * @since 4.7.0 - * - * @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. - */ - public function sort( $orderby = array(), $order = 'ASC' ) { - if ( empty( $orderby ) ) { - return $this->output; - } - - if ( is_string( $orderby ) ) { - $orderby = array( $orderby => $order ); - } - - foreach ( $orderby as $field => $direction ) { - $orderby[ $field ] = 'DESC' === strtoupper( $direction ) ? 'DESC' : 'ASC'; - } - - $this->orderby = $orderby; - - usort( $this->output, array( $this, 'sort_callback' ) ); - - $this->orderby = array(); - - return $this->output; - } - - /** - * Callback to sort the list by specific fields. - * - * @since 4.7.0 - * @access private - * - * @see WP_List_Util::sort() - * - * @param object|array $a One object to compare. - * @param object|array $b The other object to compare. - * @return int 0 if both objects equal. -1 if second object should come first, 1 otherwise. - */ - private function sort_callback( $a, $b ) { - if ( empty( $this->orderby ) ) { - return 0; - } - - $a = (array) $a; - $b = (array) $b; - - foreach ( $this->orderby as $field => $direction ) { - if ( ! isset( $a[ $field ] ) || ! isset( $b[ $field ] ) ) { - continue; - } - - if ( $a[ $field ] == $b[ $field ] ) { - continue; - } - - $results = 'DESC' === $direction ? array( 1, -1 ) : array( -1, 1 ); - - if ( is_numeric( $a[ $field ] ) && is_numeric( $b[ $field ] ) ) { - return ( $a[ $field ] < $b[ $field ] ) ? $results[0] : $results[1]; - } - - return 0 > strcmp( $a[ $field ], $b[ $field ] ) ? $results[0] : $results[1]; - } - - return 0; - } -} diff --git a/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php b/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php index e1f8365100..576f3c6115 100644 --- a/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php +++ b/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php @@ -532,9 +532,8 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting { } 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 ) { diff --git a/wp-includes/customize/class-wp-customize-nav-menu-setting.php b/wp-includes/customize/class-wp-customize-nav-menu-setting.php index 4d65cc4c7b..0275c79a01 100644 --- a/wp-includes/customize/class-wp-customize-nav-menu-setting.php +++ b/wp-includes/customize/class-wp-customize-nav-menu-setting.php @@ -287,9 +287,8 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting { // 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 @@ -314,9 +313,7 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting { * This is a workaround for a lack of closures. * * @since 4.3.0 - * @deprecated 4.7.0 Use wp_list_sort() * @access protected - * * @param object $menu1 * @param object $menu2 * @return int @@ -324,8 +321,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting { * @see WP_Customize_Nav_Menu_Setting::filter_wp_get_nav_menus() */ 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 ); } diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php index a495af3619..d7598d0755 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -3798,83 +3798,3 @@ function wp_kses_js_entities( $string ) { 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 ); -} diff --git a/wp-includes/functions.php b/wp-includes/functions.php index d6306967d9..fb732e6590 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -3489,7 +3489,6 @@ function wp_is_numeric_array( $data ) { * Filters a list of objects, based on a set of key => value arguments. * * @since 3.0.0 - * @since 4.7.0 Uses WP_List_Util class. * * @param array $list An array of objects to filter * @param array $args Optional. An array of key => value arguments to match @@ -3503,26 +3502,21 @@ function wp_is_numeric_array( $data ) { * @return array A list of objects or object fields. */ 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 ); + $list = wp_list_filter( $list, $args, $operator ); - $util->filter( $args, $operator ); + if ( $field ) + $list = wp_list_pluck( $list, $field ); - if ( $field ) { - $util->pluck( $field ); - } - - return $util->get_output(); + return $list; } /** * Filters a list of objects, based on a set of key => value arguments. * * @since 3.1.0 - * @since 4.7.0 Uses WP_List_Util class. * * @param array $list An array of objects to filter. * @param array $args Optional. An array of key => value arguments to match @@ -3534,12 +3528,33 @@ function wp_filter_object_list( $list, $args = array(), $operator = 'and', $fiel * @return array Array of found values. */ function wp_list_filter( $list, $args = array(), $operator = 'AND' ) { - if ( ! is_array( $list ) ) { + if ( ! is_array( $list ) ) return array(); + + 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; + } } - $util = new WP_List_Util( $list ); - return $util->filter( $args, $operator ); + return $filtered; } /** @@ -3550,7 +3565,6 @@ function wp_list_filter( $list, $args = array(), $operator = 'AND' ) { * * @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 * @param int|string $field Field from the object to place instead of the entire object @@ -3561,29 +3575,43 @@ function wp_list_filter( $list, $args = array(), $operator = 'AND' ) { * `$list` will be preserved in the results. */ 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(); + 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; } - $util = new WP_List_Util( $list ); - return $util->sort( $orderby, $order ); + /* + * 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; } /** diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index bbe43e187a..c07349190e 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -169,9 +169,7 @@ function get_permalink( $post = 0, $leavename = false ) { if ( strpos($permalink, '%category%') !== false ) { $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 /** * Filters the category that gets used in the %category% permalink token. diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php index 30039f420e..16653cab1e 100644 --- a/wp-includes/nav-menu.php +++ b/wp-includes/nav-menu.php @@ -557,6 +557,38 @@ function wp_get_nav_menus( $args = array() ) { return apply_filters( 'wp_get_nav_menus', get_terms( 'nav_menu', $args), $args ); } +/** + * 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. * @@ -650,9 +682,8 @@ function wp_get_nav_menu_items( $menu, $args = array() ) { } 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 ) { $items[$k]->{$args['output_key']} = $i++; @@ -745,7 +776,7 @@ function wp_setup_nav_menu_item( $menu_item ) { $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 ) { $object = get_taxonomy( $menu_item->object ); diff --git a/wp-includes/version.php b/wp-includes/version.php index c7ba7e0c3c..8e4571031c 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-alpha-38862'; +$wp_version = '4.7-alpha-38863'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-settings.php b/wp-settings.php index cee70e19a7..21cb4cda36 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -91,7 +91,6 @@ wp_set_lang_dir(); // 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' ); require( ABSPATH . WPINC . '/class-wp.php' );