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

Timestamp:

11/30/2017 11:09:33 PM (8 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

• trunk/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php (modified) (12 diffs)

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

@@ -207 +207 @@
         }
 
-        $undefined = new stdClass();
+        $undefined      = new stdClass();
         $is_placeholder = ( $this->term_id < 0 );
-        $is_dirty = ( $undefined !== $this->post_value( $undefined ) );
+        $is_dirty       = ( $undefined !== $this->post_value( $undefined ) );
         if ( ! $is_placeholder && ! $is_dirty ) {
             return false;
@@ -243 +243 @@
 
         $setting_value = $this->value();
-        $is_delete = ( false === $setting_value );
-        $index = -1;
+        $is_delete     = ( false === $setting_value );
+        $index         = -1;
 
         // Find the existing menu item's position in the list.
@@ -261 +261 @@
         } else {
             // Handle menus being updated or inserted.
-            $menu_obj = (object) array_merge( array(
-                'term_id'          => $this->term_id,
-                'term_taxonomy_id' => $this->term_id,
-                'slug'             => sanitize_title( $setting_value['name'] ),
-                'count'            => 0,
-                'term_group'       => 0,
-                'taxonomy'         => self::TAXONOMY,
-                'filter'           => 'raw',
-            ), $setting_value );
+            $menu_obj = (object) array_merge(
+                array(
+                    'term_id'          => $this->term_id,
+                    'term_taxonomy_id' => $this->term_id,
+                    'slug'             => sanitize_title( $setting_value['name'] ),
+                    'count'            => 0,
+                    'term_group'       => 0,
+                    'taxonomy'         => self::TAXONOMY,
+                    'filter'           => 'raw',
+                ), $setting_value
+            );
 
             array_splice( $menus, $index, ( -1 === $index ? 0 : 1 ), array( $menu_obj ) );
@@ -276 +278 @@
         // 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',
-            ) );
+            $menus = wp_list_sort(
+                $menus, array(
+                    $args['orderby'] => 'ASC',
+                )
+            );
         }
         // @todo add support for $args['hide_empty'] === true
@@ -354 +358 @@
         }
 
-        $menu_obj = (object) array_merge( array(
+        $menu_obj = (object) array_merge(
+            array(
                 'term_id'          => $this->term_id,
                 'term_taxonomy_id' => $this->term_id,
@@ -362 +367 @@
                 'taxonomy'         => self::TAXONOMY,
                 'filter'           => 'raw',
-            ), $setting_value );
+            ), $setting_value
+        );
 
         return $menu_obj;
@@ -380 +386 @@
         }
 
-        $menu = $this->value();
+        $menu             = $this->value();
         $nav_menu_options = $this->filter_nav_menu_options_value(
             $nav_menu_options,
@@ -419 +425 @@
             'auto_add'    => false,
         );
-        $value = array_merge( $default, $value );
-        $value = wp_array_slice_assoc( $value, array_keys( $default ) );
+        $value   = array_merge( $default, $value );
+        $value   = wp_array_slice_assoc( $value, array_keys( $default ) );
 
         $value['name']        = trim( esc_html( $value['name'] ) ); // This sanitization code is used in wp-admin/nav-menus.php.
@@ -495 +501 @@
                 } else {
                     $this->update_status = 'deleted';
-                    $auto_add = false;
+                    $auto_add            = false;
                 }
             }
         } else {
             // Insert or update menu.
-            $menu_data = wp_array_slice_assoc( $value, array( 'description', 'parent' ) );
+            $menu_data              = wp_array_slice_assoc( $value, array( 'description', 'parent' ) );
             $menu_data['menu-name'] = $value['name'];
 
-            $menu_id = $is_placeholder ? 0 : $this->term_id;
-            $r = wp_update_nav_menu_object( $menu_id, wp_slash( $menu_data ) );
-            $original_name = $menu_data['menu-name'];
+            $menu_id              = $is_placeholder ? 0 : $this->term_id;
+            $r                    = wp_update_nav_menu_object( $menu_id, wp_slash( $menu_data ) );
+            $original_name        = $menu_data['menu-name'];
             $name_conflict_suffix = 1;
             while ( is_wp_error( $r ) && 'menu_exists' === $r->get_error_code() ) {
@@ -511 +517 @@
                 /* translators: 1: original menu name, 2: duplicate count */
                 $menu_data['menu-name'] = sprintf( __( '%1$s (%2$d)' ), $original_name, $name_conflict_suffix );
-                $r = wp_update_nav_menu_object( $menu_id, wp_slash( $menu_data ) );
+                $r                      = wp_update_nav_menu_object( $menu_id, wp_slash( $menu_data ) );
             }
 
@@ -566 +572 @@
 
                 $widget_instance['nav_menu'] = $this->term_id;
-                $updated_widget_instance = $this->manager->widgets->sanitize_widget_js_instance( $widget_instance );
+                $updated_widget_instance     = $this->manager->widgets->sanitize_widget_js_instance( $widget_instance );
                 $this->manager->set_post_value( $nav_menu_widget_setting->id, $updated_widget_instance );
                 $nav_menu_widget_setting->save();
@@ -634 +640 @@
             $this->_widget_nav_menu_updates
         );
-        $this->_widget_nav_menu_updates = array();
+        $this->_widget_nav_menu_updates  = array();
 
         return $data;