Changeset 42343 for trunk/src/wp-includes/class-wp-customize-control.php

Timestamp:

11/30/2017 11:09:33 PM (7 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-control.php (modified) (9 diffs)

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

@@ -214 +214 @@
 
         $this->manager = $manager;
-        $this->id = $id;
+        $this->id      = $id;
         if ( empty( $this->active_callback ) ) {
             $this->active_callback = array( $this, 'active_callback' );
@@ -231 +231 @@
                 $settings[ $key ] = $this->manager->get_setting( $setting );
             }
-        } else if ( is_string( $this->settings ) ) {
-            $this->setting = $this->manager->get_setting( $this->settings );
+        } elseif ( is_string( $this->settings ) ) {
+            $this->setting       = $this->manager->get_setting( $this->settings );
             $settings['default'] = $this->setting;
         }
@@ -254 +254 @@
     final public function active() {
         $control = $this;
-        $active = call_user_func( $this->active_callback, $this );
+        $active  = call_user_func( $this->active_callback, $this );
 
         /**
@@ -309 +309 @@
         }
 
-        $this->json['type'] = $this->type;
-        $this->json['priority'] = $this->priority;
-        $this->json['active'] = $this->active();
-        $this->json['section'] = $this->section;
-        $this->json['content'] = $this->get_content();
-        $this->json['label'] = $this->label;
-        $this->json['description'] = $this->description;
+        $this->json['type']           = $this->type;
+        $this->json['priority']       = $this->priority;
+        $this->json['active']         = $this->active();
+        $this->json['section']        = $this->section;
+        $this->json['content']        = $this->get_content();
+        $this->json['label']          = $this->label;
+        $this->json['description']    = $this->description;
         $this->json['instanceNumber'] = $this->instance_number;
 
@@ -386 +386 @@
      */
     final public function maybe_render() {
-        if ( ! $this->check_capabilities() )
+        if ( ! $this->check_capabilities() ) {
             return;
+        }
 
         /**
@@ -481 +482 @@
      */
     protected function render_content() {
-        $input_id = '_customize-input-' . $this->id;
-        $description_id = '_customize-description-' . $this->id;
+        $input_id         = '_customize-input-' . $this->id;
+        $description_id   = '_customize-description-' . $this->id;
         $describedby_attr = ( ! empty( $this->description ) ) ? ' aria-describedby="' . esc_attr( $description_id ) . '" ' : '';
         switch ( $this->type ) {
@@ -514 +515 @@
                 <?php endif; ?>
                 <?php if ( ! empty( $this->description ) ) : ?>
-                    <span id="<?php echo esc_attr( $description_id ); ?>" class="description customize-control-description"><?php echo $this->description ; ?></span>
+                    <span id="<?php echo esc_attr( $description_id ); ?>" class="description customize-control-description"><?php echo $this->description; ?></span>
                 <?php endif; ?>
 
@@ -583 +584 @@
 
                 <?php
-                $dropdown_name = '_customize-dropdown-pages-' . $this->id;
-                $show_option_none = __( '&mdash; Select &mdash;' );
+                $dropdown_name     = '_customize-dropdown-pages-' . $this->id;
+                $show_option_none  = __( '&mdash; Select &mdash;' );
                 $option_none_value = '0';
-                $dropdown = wp_dropdown_pages(
+                $dropdown          = wp_dropdown_pages(
                     array(
                         'name'              => $dropdown_name,
@@ -596 +597 @@
                 );
                 if ( empty( $dropdown ) ) {
-                    $dropdown = sprintf( '<select id="%1$s" name="%1$s">', esc_attr( $dropdown_name ) );
+                    $dropdown  = sprintf( '<select id="%1$s" name="%1$s">', esc_attr( $dropdown_name ) );
                     $dropdown .= sprintf( '<option value="%1$s">%2$s</option>', esc_attr( $option_none_value ), esc_html( $show_option_none ) );
                     $dropdown .= '</select>';