Changeset 45457

Timestamp:

05/28/2019 03:31:55 AM (6 years ago)

Author:

azaozz

Message:

Fix previous WPCS errors in script-loader.php triggered by [45456].

See #45346.

File:

• trunk/src/wp-includes/script-loader.php (modified) (13 diffs)

trunk/src/wp-includes/script-loader.php

@@ -50 +50 @@
 
     $compressed = $compress_scripts && $concatenate_scripts && isset( $_SERVER['HTTP_ACCEPT_ENCODING'] )
-                  && false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && ! $force_uncompressed;
+        && false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && ! $force_uncompressed;
 
     // Load tinymce.js when running from /src, otherwise load wp-tinymce.js.gz (in production) or
@@ -755 +755 @@
             continue;
         } elseif ( ! empty( $value ) && is_string( $value ) && (
-            ( '{' == $value{0} && '}' == $value{strlen( $value ) - 1} ) ||
-            ( '[' == $value{0} && ']' == $value{strlen( $value ) - 1} ) ||
+            ( '{' === $value{0} && '}' === $value{strlen( $value ) - 1} ) ||
+            ( '[' === $value{0} && ']' === $value{strlen( $value ) - 1} ) ||
             preg_match( '/^\(?function ?\(/', $value ) ) ) {
             $init_obj .= $key . ':' . $value . ',';
@@ -845 +845 @@
     $suffix     = wp_scripts_get_suffix();
     $dev_suffix = wp_scripts_get_suffix( 'dev' );
-
-    if ( ! $guessurl = site_url() ) {
+    $guessurl   = site_url();
+
+    if ( ! $guessurl ) {
         $guessed_url = true;
         $guessurl    = wp_guess_url();
@@ -1470 +1471 @@
             'themeInstallUnavailable' => sprintf(
                 /* translators: %s: URL to Add Themes admin screen */
-                   __( 'You won&#8217;t be able to install new themes from here yet since your install requires SFTP credentials. For now, please <a href="%s">add themes in the admin</a>.' ),
+                __( 'You won&#8217;t be able to install new themes from here yet since your install requires SFTP credentials. For now, please <a href="%s">add themes in the admin</a>.' ),
                 esc_url( admin_url( 'theme-install.php' ) )
             ),
@@ -1884 +1885 @@
     }
 
-    if ( ! $guessurl = site_url() ) {
+    $guessurl = site_url();
+
+    if ( ! $guessurl ) {
         $guessurl = wp_guess_url();
     }
@@ -1908 +1911 @@
         $subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)' );
 
-        if ( 'cyrillic' == $subset ) {
+        if ( 'cyrillic' === $subset ) {
             $subsets .= ',cyrillic,cyrillic-ext';
-        } elseif ( 'greek' == $subset ) {
+        } elseif ( 'greek' === $subset ) {
             $subsets .= ',greek,greek-ext';
-        } elseif ( 'vietnamese' == $subset ) {
+        } elseif ( 'vietnamese' === $subset ) {
             $subsets .= ',vietnamese';
         }
@@ -2111 +2114 @@
  */
 function wp_prototype_before_jquery( $js_array ) {
-    if ( false === $prototype = array_search( 'prototype', $js_array, true ) ) {
+    $prototype = array_search( 'prototype', $js_array, true );
+
+    if ( false === $prototype ) {
         return $js_array;
     }
 
-    if ( false === $jquery = array_search( 'jquery', $js_array, true ) ) {
+    $jquery = array_search( 'jquery', $js_array, true );
+
+    if ( false === $jquery ) {
         return $js_array;
     }
@@ -2331 +2338 @@
     }
 
-    if ( 'colors' == $handle ) {
+    if ( 'colors' === $handle ) {
         $color = get_user_option( 'admin_color' );
 
@@ -2451 +2458 @@
     }
 
-    if ( $concat = trim( $wp_scripts->concat, ', ' ) ) {
-
+    $concat = trim( $wp_scripts->concat, ', ' );
+
+    if ( $concat ) {
         if ( ! empty( $wp_scripts->print_code ) ) {
             echo "\n<script type='text/javascript'>\n";
@@ -2461 +2469 @@
         }
 
-        $concat = str_split( $concat, 128 );
+        $concat       = str_split( $concat, 128 );
         $concatenated = '';
 
@@ -2631 +2639 @@
     }
 
-    if ( $concat = trim( $wp_styles->concat, ', ' ) ) {
+    $concat = trim( $wp_styles->concat, ', ' );
+
+    if ( $concat ) {
         $dir = $wp_styles->text_direction;
         $ver = $wp_styles->default_version;
 
-        $concat = str_split( $concat, 128 );
+        $concat       = str_split( $concat, 128 );
         $concatenated = '';
 
@@ -2669 +2679 @@
     global $concatenate_scripts, $compress_scripts, $compress_css;
 
-    $compressed_output = ( ini_get( 'zlib.output_compression' ) || 'ob_gzhandler' == ini_get( 'output_handler' ) );
+    $compressed_output = ( ini_get( 'zlib.output_compression' ) || 'ob_gzhandler' === ini_get( 'output_handler' ) );
 
     if ( ! isset( $concatenate_scripts ) ) {
@@ -2724 +2734 @@
      * @since 5.0.0
      */
-      do_action( 'enqueue_block_assets' );
+    do_action( 'enqueue_block_assets' );
 }