Changeset 47808 for trunk/src/wp-admin/includes/file.php

Timestamp:

05/16/2020 06:40:52 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict comparison where static strings are involved.

This reduces the number of WordPress.PHP.StrictComparisons.LooseComparison issues in half, from 1897 to 890.

Includes minor code layout fixes for better readability.

See #49542.

File:

• trunk/src/wp-admin/includes/file.php (modified) (14 diffs)

trunk/src/wp-admin/includes/file.php

@@ -649 +649 @@
     }
 
-    if ( empty( $filename ) || '.' == $filename || '/' == $filename || '\\' == $filename ) {
+    if ( empty( $filename ) || in_array( $filename, array( '.', '/', '\\' ), true ) ) {
         $filename = uniqid();
     }
@@ -1104 +1104 @@
             $signature_url = false;
             $url_path      = parse_url( $url, PHP_URL_PATH );
-            if ( substr( $url_path, -4 ) == '.zip' || substr( $url_path, -7 ) == '.tar.gz' ) {
+
+            if ( '.zip' === substr( $url_path, -4 ) || '.tar.gz' === substr( $url_path, -7 ) ) {
                 $signature_url = str_replace( $url_path, $url_path . '.sig', $url );
             }
@@ -1451 +1452 @@
             return $result;
         } elseif ( is_wp_error( $result ) ) {
-            if ( 'incompatible_archive' != $result->get_error_code() ) {
+            if ( 'incompatible_archive' !== $result->get_error_code() ) {
                 return $result;
             }
@@ -1563 +1564 @@
         }
 
-        if ( '/' == substr( $info['name'], -1 ) ) { // Directory.
+        if ( '/' === substr( $info['name'], -1 ) ) { // Directory.
             continue;
         }
@@ -1733 +1734 @@
         }
 
-        if ( 'f' == $fileinfo['type'] ) {
+        if ( 'f' === $fileinfo['type'] ) {
             if ( ! $wp_filesystem->copy( $from . $filename, $to . $filename, true, FS_CHMOD_FILE ) ) {
                 // If copy failed, chmod file to 0644 and try again.
@@ -1741 +1742 @@
                 }
             }
-        } elseif ( 'd' == $fileinfo['type'] ) {
+        } elseif ( 'd' === $fileinfo['type'] ) {
             if ( ! $wp_filesystem->is_dir( $to . $filename ) ) {
                 if ( ! $wp_filesystem->mkdir( $to . $filename, FS_CHMOD_DIR ) ) {
@@ -1762 +1763 @@
         }
     }
+
     return true;
 }
@@ -1925 +1927 @@
     }
 
-    if ( ! $method && isset( $args['connection_type'] ) && 'ssh' == $args['connection_type'] && extension_loaded( 'ssh2' ) ) {
+    if ( ! $method && isset( $args['connection_type'] ) && 'ssh' === $args['connection_type'] && extension_loaded( 'ssh2' ) ) {
         $method = 'ssh2';
     }
@@ -2011 +2013 @@
     }
 
-    if ( 'direct' == $type ) {
+    if ( 'direct' === $type ) {
         return true;
     }
@@ -2062 +2064 @@
     }
 
-    if ( ( defined( 'FTP_SSH' ) && FTP_SSH ) || ( defined( 'FS_METHOD' ) && 'ssh2' == FS_METHOD ) ) {
+    if ( ( defined( 'FTP_SSH' ) && FTP_SSH ) || ( defined( 'FS_METHOD' ) && 'ssh2' === FS_METHOD ) ) {
         $credentials['connection_type'] = 'ssh';
-    } elseif ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' == $type ) { // Only the FTP Extension understands SSL.
+    } elseif ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' === $type ) { // Only the FTP Extension understands SSL.
         $credentials['connection_type'] = 'ftps';
     } elseif ( ! empty( $submitted_form['connection_type'] ) ) {
@@ -2071 +2073 @@
         $credentials['connection_type'] = 'ftp';
     }
-    if ( ! $error &&
-            (
-                ( ! empty( $credentials['password'] ) && ! empty( $credentials['username'] ) && ! empty( $credentials['hostname'] ) ) ||
-                ( 'ssh' == $credentials['connection_type'] && ! empty( $credentials['public_key'] ) && ! empty( $credentials['private_key'] ) )
-            ) ) {
+    if ( ! $error
+        && ( ( ! empty( $credentials['password'] ) && ! empty( $credentials['username'] ) && ! empty( $credentials['hostname'] ) )
+            || ( 'ssh' === $credentials['connection_type'] && ! empty( $credentials['public_key'] ) && ! empty( $credentials['private_key'] ) )
+        )
+    ) {
         $stored_credentials = $credentials;
+
         if ( ! empty( $stored_credentials['port'] ) ) { // Save port as part of hostname to simplify above code.
             $stored_credentials['hostname'] .= ':' . $stored_credentials['port'];
@@ -2082 +2085 @@
 
         unset( $stored_credentials['password'], $stored_credentials['port'], $stored_credentials['private_key'], $stored_credentials['public_key'] );
+
         if ( ! wp_installing() ) {
             update_option( 'ftp_credentials', $stored_credentials );
         }
+
         return $credentials;
     }
@@ -2209 +2214 @@
     if ( isset( $types['ssh'] ) ) {
         $hidden_class = '';
-        if ( 'ssh' != $connection_type || empty( $connection_type ) ) {
+        if ( 'ssh' !== $connection_type || empty( $connection_type ) ) {
             $hidden_class = ' class="hidden"';
         }
@@ -2252 +2257 @@
 function wp_print_request_filesystem_credentials_modal() {
     $filesystem_method = get_filesystem_method();
+
     ob_start();
     $filesystem_credentials_are_stored = request_filesystem_credentials( self_admin_url() );
     ob_end_clean();
+
     $request_filesystem_credentials = ( 'direct' !== $filesystem_method && ! $filesystem_credentials_are_stored );
     if ( ! $request_filesystem_credentials ) {