Changeset 42343 for trunk/src/wp-includes/class-wp-customize-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/class-wp-customize-setting.php (modified) (18 diffs)

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

@@ -170 +170 @@
 
         $this->manager = $manager;
-        $this->id = $id;
+        $this->id      = $id;
 
         // Parse the ID for array keys.
@@ -177 +177 @@
 
         // Rebuild the ID.
-        $this->id = $this->id_data[ 'base' ];
-        if ( ! empty( $this->id_data[ 'keys' ] ) ) {
+        $this->id = $this->id_data['base'];
+        if ( ! empty( $this->id_data['keys'] ) ) {
             $this->id .= '[' . implode( '][', $this->id_data['keys'] ) . ']';
         }
@@ -312 +312 @@
         }
 
-        $id_base = $this->id_data['base'];
-        $is_multidimensional = ! empty( $this->id_data['keys'] );
+        $id_base                 = $this->id_data['base'];
+        $is_multidimensional     = ! empty( $this->id_data['keys'] );
         $multidimensional_filter = array( $this, '_multidimensional_preview_filter' );
 
@@ -322 +322 @@
          * to be previewed.
          */
-        $undefined = new stdClass();
+        $undefined     = new stdClass();
         $needs_preview = ( $undefined !== $this->post_value( $undefined ) );
-        $value = null;
+        $value         = null;
 
         // Since no post value was defined, check if we have an initial value set.
         if ( ! $needs_preview ) {
             if ( $this->is_multidimensional_aggregated ) {
-                $root = self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'];
+                $root  = self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'];
                 $value = $this->multidimensional_get( $root, $this->id_data['keys'], $undefined );
             } else {
-                $default = $this->default;
+                $default       = $this->default;
                 $this->default = $undefined; // Temporarily set default to undefined so we can detect if existing value is set.
-                $value = $this->value();
+                $value         = $this->value();
                 $this->default = $default;
             }
@@ -349 +349 @@
 
         switch ( $this->type ) {
-            case 'theme_mod' :
+            case 'theme_mod':
                 if ( ! $is_multidimensional ) {
                     add_filter( "theme_mod_{$id_base}", array( $this, '_preview_filter' ) );
@@ -360 +360 @@
                 }
                 break;
-            case 'option' :
+            case 'option':
                 if ( ! $is_multidimensional ) {
                     add_filter( "pre_option_{$id_base}", array( $this, '_preview_filter' ) );
@@ -372 +372 @@
                 }
                 break;
-            default :
-
+            default:
                 /**
                  * Fires when the WP_Customize_Setting::preview() method is called for settings
@@ -437 +436 @@
         }
 
-        $undefined = new stdClass(); // Symbol hack.
+        $undefined  = new stdClass(); // Symbol hack.
         $post_value = $this->post_value( $undefined );
         if ( $undefined !== $post_value ) {
@@ -484 +483 @@
             // Do the replacements of the posted/default sub value into the root value.
             $value = $previewed_setting->post_value( $previewed_setting->default );
-            $root = self::$aggregated_multidimensionals[ $previewed_setting->type ][ $id_base ]['root_value'];
-            $root = $previewed_setting->multidimensional_replace( $root, $previewed_setting->id_data['keys'], $value );
+            $root  = self::$aggregated_multidimensionals[ $previewed_setting->type ][ $id_base ]['root_value'];
+            $root  = $previewed_setting->multidimensional_replace( $root, $previewed_setting->id_data['keys'], $value );
             self::$aggregated_multidimensionals[ $previewed_setting->type ][ $id_base ]['root_value'] = $root;
 
@@ -721 +720 @@
      */
     public function value() {
-        $id_base = $this->id_data['base'];
+        $id_base      = $this->id_data['base'];
         $is_core_type = ( 'option' === $this->type || 'theme_mod' === $this->type );
 
@@ -754 +753 @@
         } elseif ( $this->is_multidimensional_aggregated ) {
             $root_value = self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'];
-            $value = $this->multidimensional_get( $root_value, $this->id_data['keys'], $this->default );
+            $value      = $this->multidimensional_get( $root_value, $this->id_data['keys'], $this->default );
 
             // Ensure that the post value is used if the setting is previewed, since preview filters aren't applying on cached $root_value.
@@ -787 +786 @@
         $value = apply_filters( "customize_sanitize_js_{$this->id}", $this->value(), $this );
 
-        if ( is_string( $value ) )
-            return html_entity_decode( $value, ENT_QUOTES, 'UTF-8');
+        if ( is_string( $value ) ) {
+            return html_entity_decode( $value, ENT_QUOTES, 'UTF-8' );
+        }
 
         return $value;
@@ -817 +817 @@
      */
     final public function check_capabilities() {
-        if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) )
+        if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) ) {
             return false;
-
-        if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) )
+        }
+
+        if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) ) {
             return false;
+        }
 
         return true;
@@ -837 +839 @@
      */
     final protected function multidimensional( &$root, $keys, $create = false ) {
-        if ( $create && empty( $root ) )
+        if ( $create && empty( $root ) ) {
             $root = array();
-
-        if ( ! isset( $root ) || empty( $keys ) )
+        }
+
+        if ( ! isset( $root ) || empty( $keys ) ) {
             return;
+        }
 
         $last = array_pop( $keys );
@@ -847 +851 @@
 
         foreach ( $keys as $key ) {
-            if ( $create && ! isset( $node[ $key ] ) )
+            if ( $create && ! isset( $node[ $key ] ) ) {
                 $node[ $key ] = array();
-
-            if ( ! is_array( $node ) || ! isset( $node[ $key ] ) )
+            }
+
+            if ( ! is_array( $node ) || ! isset( $node[ $key ] ) ) {
                 return;
+            }
 
             $node = &$node[ $key ];
@@ -866 +872 @@
         }
 
-        if ( ! isset( $node[ $last ] ) )
+        if ( ! isset( $node[ $last ] ) ) {
             return;
+        }
 
         return array(
@@ -887 +894 @@
      */
     final protected function multidimensional_replace( $root, $keys, $value ) {
-        if ( ! isset( $value ) )
+        if ( ! isset( $value ) ) {
             return $root;
-        elseif ( empty( $keys ) ) // If there are no keys, we're replacing the root.
+        } elseif ( empty( $keys ) ) { // If there are no keys, we're replacing the root.
             return $value;
+        }
 
         $result = $this->multidimensional( $root, $keys, true );
 
-        if ( isset( $result ) )
+        if ( isset( $result ) ) {
             $result['node'][ $result['key'] ] = $value;
+        }
 
         return $root;
@@ -911 +920 @@
      */
     final protected function multidimensional_get( $root, $keys, $default = null ) {
-        if ( empty( $keys ) ) // If there are no keys, test the root.
+        if ( empty( $keys ) ) { // If there are no keys, test the root.
             return isset( $root ) ? $root : $default;
+        }
 
         $result = $this->multidimensional( $root, $keys );