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

trunk/src/wp-includes/class.wp-scripts.php

@@ -146 +146 @@
          * @param WP_Scripts $this WP_Scripts instance (passed by reference).
          */
-        do_action_ref_array( 'wp_default_scripts', array(&$this) );
+        do_action_ref_array( 'wp_default_scripts', array( &$this ) );
     }
 
@@ -197 +197 @@
      */
     public function print_extra_script( $handle, $echo = true ) {
-        if ( !$output = $this->get_data( $handle, 'data' ) )
+        if ( ! $output = $this->get_data( $handle, 'data' ) ) {
             return;
-
-        if ( !$echo )
+        }
+
+        if ( ! $echo ) {
             return $output;
+        }
 
         echo "<script type='text/javascript'>\n"; // CDATA and type='text/javascript' is not needed for HTML 5
@@ -225 +227 @@
      */
     public function do_item( $handle, $group = false ) {
-        if ( !parent::do_item($handle) )
+        if ( ! parent::do_item( $handle ) ) {
             return false;
-
-        if ( 0 === $group && $this->groups[$handle] > 0 ) {
+        }
+
+        if ( 0 === $group && $this->groups[ $handle ] > 0 ) {
             $this->in_footer[] = $handle;
             return false;
         }
 
-        if ( false === $group && in_array($handle, $this->in_footer, true) )
+        if ( false === $group && in_array( $handle, $this->in_footer, true ) ) {
             $this->in_footer = array_diff( $this->in_footer, (array) $handle );
-
-        $obj = $this->registered[$handle];
+        }
+
+        $obj = $this->registered[ $handle ];
 
         if ( null === $obj->ver ) {
@@ -244 +248 @@
         }
 
-        if ( isset($this->args[$handle]) )
-            $ver = $ver ? $ver . '&amp;' . $this->args[$handle] : $this->args[$handle];
-
-        $src = $obj->src;
+        if ( isset( $this->args[ $handle ] ) ) {
+            $ver = $ver ? $ver . '&amp;' . $this->args[ $handle ] : $this->args[ $handle ];
+        }
+
+        $src         = $obj->src;
         $cond_before = $cond_after = '';
         $conditional = isset( $obj->extra['conditional'] ) ? $obj->extra['conditional'] : '';
@@ -253 +258 @@
         if ( $conditional ) {
             $cond_before = "<!--[if {$conditional}]>\n";
-            $cond_after = "<![endif]-->\n";
+            $cond_after  = "<![endif]-->\n";
         }
 
         $before_handle = $this->print_inline_script( $handle, 'before', false );
-        $after_handle = $this->print_inline_script( $handle, 'after', false );
+        $after_handle  = $this->print_inline_script( $handle, 'after', false );
 
         if ( $before_handle ) {
@@ -285 +290 @@
                 $this->reset();
             } elseif ( $this->in_default_dir( $srce ) && ! $conditional ) {
-                $this->print_code .= $this->print_extra_script( $handle, false );
-                $this->concat .= "$handle,";
+                $this->print_code     .= $this->print_extra_script( $handle, false );
+                $this->concat         .= "$handle,";
                 $this->concat_version .= "$handle$ver";
                 return true;
@@ -316 +321 @@
         }
 
-        if ( ! empty( $ver ) )
+        if ( ! empty( $ver ) ) {
             $src = add_query_arg( 'ver', $ver, $src );
+        }
 
         /** This filter is documented in wp-includes/class.wp-scripts.php */
         $src = esc_url( apply_filters( 'script_loader_src', $src, $handle ) );
 
-        if ( ! $src )
+        if ( ! $src ) {
             return true;
+        }
 
         $tag = "{$cond_before}{$before_handle}<script type='text/javascript' src='$src'></script>\n{$after_handle}{$cond_after}";
@@ -412 +419 @@
      */
     public function localize( $handle, $object_name, $l10n ) {
-        if ( $handle === 'jquery' )
+        if ( $handle === 'jquery' ) {
             $handle = 'jquery-core';
-
-        if ( is_array($l10n) && isset($l10n['l10n_print_after']) ) { // back compat, preserve the code in 'l10n_print_after' if present
+        }
+
+        if ( is_array( $l10n ) && isset( $l10n['l10n_print_after'] ) ) { // back compat, preserve the code in 'l10n_print_after' if present
             $after = $l10n['l10n_print_after'];
-            unset($l10n['l10n_print_after']);
+            unset( $l10n['l10n_print_after'] );
         }
 
         foreach ( (array) $l10n as $key => $value ) {
-            if ( !is_scalar($value) )
+            if ( ! is_scalar( $value ) ) {
                 continue;
-
-            $l10n[$key] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8');
+            }
+
+            $l10n[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
         }
 
         $script = "var $object_name = " . wp_json_encode( $l10n ) . ';';
 
-        if ( !empty($after) )
+        if ( ! empty( $after ) ) {
             $script .= "\n$after;";
+        }
 
         $data = $this->get_data( $handle, 'data' );
 
-        if ( !empty( $data ) )
+        if ( ! empty( $data ) ) {
             $script = "$data\n$script";
+        }
 
         return $this->add_data( $handle, 'data', $script );
@@ -453 +464 @@
      */
     public function set_group( $handle, $recursion, $group = false ) {
-        if ( isset( $this->registered[$handle]->args ) && $this->registered[$handle]->args === 1 )
+        if ( isset( $this->registered[ $handle ]->args ) && $this->registered[ $handle ]->args === 1 ) {
             $grp = 1;
-        else
+        } else {
             $grp = (int) $this->get_data( $handle, 'group' );
-
-        if ( false !== $group && $grp > $group )
+        }
+
+        if ( false !== $group && $grp > $group ) {
             $grp = $group;
+        }
 
         return parent::set_group( $handle, $recursion, $grp );
@@ -466 +479 @@
     /**
      * Determines script dependencies.
-     *
+     *
      * @since 2.1.0
      *
@@ -501 +514 @@
      */
     public function do_head_items() {
-        $this->do_items(false, 0);
+        $this->do_items( false, 0 );
         return $this->done;
     }
@@ -515 +528 @@
      */
     public function do_footer_items() {
-        $this->do_items(false, 1);
+        $this->do_items( false, 1 );
         return $this->done;
     }
@@ -550 +563 @@
      */
     public function reset() {
-        $this->do_concat = false;
-        $this->print_code = '';
-        $this->concat = '';
+        $this->do_concat      = false;
+        $this->print_code     = '';
+        $this->concat         = '';
         $this->concat_version = '';
-        $this->print_html = '';
-        $this->ext_version = '';
-        $this->ext_handles = '';
+        $this->print_html     = '';
+        $this->ext_version    = '';
+        $this->ext_handles    = '';
     }
 }