Changeset 44916

Timestamp:

03/15/2019 10:13:30 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Minor code and performance improvements in phpunit/includes/abstract-testcase.php.

Props andizer.
Fixes #46500.

File:

• trunk/tests/phpunit/includes/abstract-testcase.php (modified) (15 diffs)

trunk/tests/phpunit/includes/abstract-testcase.php

@@ -388 +388 @@
      */
     public function _create_temporary_tables( $query ) {
-        if ( 'CREATE TABLE' === substr( trim( $query ), 0, 12 ) ) {
+        if ( 0 === strpos( trim( $query ), 'CREATE TABLE' ) ) {
             return substr_replace( trim( $query ), 'CREATE TEMPORARY TABLE', 0, 12 );
         }
@@ -401 +401 @@
      */
     public function _drop_temporary_tables( $query ) {
-        if ( 'DROP TABLE' === substr( trim( $query ), 0, 10 ) ) {
+        if ( 0 === strpos( trim( $query ), 'DROP TABLE' ) ) {
             return substr_replace( trim( $query ), 'DROP TEMPORARY TABLE', 0, 10 );
         }
@@ -512 +512 @@
      */
     public function setExpectedDeprecated( $deprecated ) {
-        array_push( $this->expected_deprecated, $deprecated );
+        $this->expected_deprecated[] = $deprecated;
     }
 
@@ -524 +524 @@
      */
     public function setExpectedIncorrectUsage( $doing_it_wrong ) {
-        array_push( $this->expected_doing_it_wrong, $doing_it_wrong );
+        $this->expected_doing_it_wrong[] = $doing_it_wrong;
     }
 
@@ -554 +554 @@
      */
     public function deprecated_function_run( $function ) {
-        if ( ! in_array( $function, $this->caught_deprecated ) ) {
+        if ( ! in_array( $function, $this->caught_deprecated, true ) ) {
             $this->caught_deprecated[] = $function;
         }
@@ -565 +565 @@
      */
     public function doing_it_wrong_run( $function ) {
-        if ( ! in_array( $function, $this->caught_doing_it_wrong ) ) {
+        if ( ! in_array( $function, $this->caught_doing_it_wrong, true ) ) {
             $this->caught_doing_it_wrong[] = $function;
         }
@@ -587 +587 @@
      */
     public function assertNotWPError( $actual, $message = '' ) {
-        if ( is_wp_error( $actual ) && '' === $message ) {
+        if ( '' === $message && is_wp_error( $actual ) ) {
             $message = $actual->get_error_message();
         }
@@ -625 +625 @@
     public function assertEqualFields( $object, $fields ) {
         foreach ( $fields as $field_name => $field_value ) {
-            if ( $object->$field_name != $field_value ) {
+            if ( $object->$field_name !== $field_value ) {
                 $this->fail();
             }
@@ -789 +789 @@
             if ( is_numeric( $ticket ) ) {
                 $this->knownWPBug( $ticket );
-            } elseif ( 'Plugin' == substr( $ticket, 0, 6 ) ) {
+            } elseif ( 0 === strpos( $ticket, 'Plugin' ) ) {
                 $ticket = substr( $ticket, 6 );
                 if ( $ticket && is_numeric( $ticket ) ) {
@@ -806 +806 @@
      */
     public function knownWPBug( $ticket_id ) {
-        if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( $ticket_id, self::$forced_tickets ) ) {
+        if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( $ticket_id, self::$forced_tickets, true ) ) {
             return;
         }
@@ -835 +835 @@
      */
     public function knownPluginBug( $ticket_id ) {
-        if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( 'Plugin' . $ticket_id, self::$forced_tickets ) ) {
+        if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( 'Plugin' . $ticket_id, self::$forced_tickets, true ) ) {
             return;
         }
@@ -951 +951 @@
             $result = is_callable( $query_thing ) ? call_user_func( $query_thing ) : $wp_query->$query_thing;
 
-            if ( in_array( $query_thing, $true ) ) {
+            if ( in_array( $query_thing, $true, true ) ) {
                 if ( ! $result ) {
                     $message .= $query_thing . ' is false but is expected to be true. ' . PHP_EOL;
@@ -976 +976 @@
     public function unlink( $file ) {
         $exists = is_file( $file );
-        if ( $exists && ! in_array( $file, self::$ignore_files ) ) {
+        if ( $exists && ! in_array( $file, self::$ignore_files, true ) ) {
             //error_log( $file );
             unlink( $file );
@@ -994 +994 @@
         $files = $this->files_in_dir( $path );
         foreach ( $files as $file ) {
-            if ( ! in_array( $file, self::$ignore_files ) ) {
+            if ( ! in_array( $file, self::$ignore_files, true ) ) {
                 $this->unlink( $file );
             }
@@ -1117 +1117 @@
         if ( is_multisite() ) {
             return wpmu_delete_user( $user_id );
-        } else {
-            return wp_delete_user( $user_id );
-        }
+        }
+
+        return wp_delete_user( $user_id );
     }