Changeset 53671

Timestamp:

07/06/2022 10:30:11 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Simplify the logic for setting DB host and port in wpdb::parse_db_host().

This removes an extra foreach loop and the only variable variable ($$component) in core.

Follow-up to [20088,28342,28736-28747], [41629], [41820], [42226], [53670].

Props johnjamesjacoby.
See #54877, #55647.

File:

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

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

@@ -2042 +2042 @@
          */
         public function parse_db_host( $host ) {
-                $port    = null;
                 $socket  = null;
                 $is_ipv6 = false;
@@ -2071 +2070 @@
                 }
 
-                $host = '';
-                foreach ( array( 'host', 'port' ) as $component ) {
-                        if ( ! empty( $matches[ $component ] ) ) {
-                                $$component = $matches[ $component ];
-                        }
-                }
-
+                $host = ! empty( $matches['host'] ) ? $matches['host'] : '';
                 // MySQLi port cannot be a string; must be null or an integer.
-                $port = $port ? absint( $port ) : null;
+                $port = ! empty( $matches['port'] ) ? absint( $matches['port'] ) : null;
 
                 return array( $host, $port, $socket, $is_ipv6 );