Changeset 47219 for trunk/src/wp-includes/wp-db.php

Timestamp:

02/09/2020 04:52:28 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use Yoda conditions where appropriate.

See #49222.

File:

• trunk/src/wp-includes/wp-db.php (modified) (6 diffs)

trunk/src/wp-includes/wp-db.php

@@ -1736 +1736 @@
                 // First peel off the socket parameter from the right, if it exists.
                 $socket_pos = strpos( $host, ':/' );
-                if ( $socket_pos !== false ) {
+                if ( false !== $socket_pos ) {
                         $socket = substr( $host, $socket_pos + 1 );
                         $host   = substr( $host, 0, $socket_pos );
@@ -2537 +2537 @@
 
                 // If there is a value return it else return null.
-                return ( isset( $values[ $x ] ) && $values[ $x ] !== '' ) ? $values[ $x ] : null;
+                return ( isset( $values[ $x ] ) && '' !== $values[ $x ] ) ? $values[ $x ] : null;
         }
 
@@ -2570 +2570 @@
                 }
 
-                if ( $output == OBJECT ) {
+                if ( OBJECT == $output ) {
                         return $this->last_result[ $y ] ? $this->last_result[ $y ] : null;
-                } elseif ( $output == ARRAY_A ) {
+                } elseif ( ARRAY_A == $output ) {
                         return $this->last_result[ $y ] ? get_object_vars( $this->last_result[ $y ] ) : null;
-                } elseif ( $output == ARRAY_N ) {
+                } elseif ( ARRAY_N == $output ) {
                         return $this->last_result[ $y ] ? array_values( get_object_vars( $this->last_result[ $y ] ) ) : null;
-                } elseif ( strtoupper( $output ) === OBJECT ) {
+                } elseif ( OBJECT === strtoupper( $output ) ) {
                         // Back compat for OBJECT being previously case-insensitive.
                         return $this->last_result[ $y ] ? $this->last_result[ $y ] : null;
@@ -2645 +2645 @@
 
                 $new_array = array();
-                if ( $output == OBJECT ) {
+                if ( OBJECT == $output ) {
                         // Return an integer-keyed array of row objects.
                         return $this->last_result;
-                } elseif ( $output == OBJECT_K ) {
+                } elseif ( OBJECT_K == $output ) {
                         // Return an array of row objects with keys from column 1.
                         // (Duplicates are discarded.)
@@ -2661 +2661 @@
                         }
                         return $new_array;
-                } elseif ( $output == ARRAY_A || $output == ARRAY_N ) {
+                } elseif ( ARRAY_A == $output || ARRAY_N == $output ) {
                         // Return an integer-keyed array of...
                         if ( $this->last_result ) {
                                 foreach ( (array) $this->last_result as $row ) {
-                                        if ( $output == ARRAY_N ) {
+                                        if ( ARRAY_N == $output ) {
                                                 // ...integer-keyed row arrays.
                                                 $new_array[] = array_values( get_object_vars( $row ) );
@@ -3374 +3374 @@
 
                 if ( $this->col_info ) {
-                        if ( $col_offset == -1 ) {
+                        if ( -1 == $col_offset ) {
                                 $i         = 0;
                                 $new_array = array();