Handle custom ports defined in the hostname (#44)

* Handle custom ports defined in the hostname

* Improve detection of custom ports when connecting

Perstitent connections are defined by prepending the hostname with "p:".
This would have been detected as the start of a custom port and broken
the connection.

A better solution is to detect the port at the end of host name using
regex.

* Never detect a prefix of "p:" as a hostname

This improves edge cases when using a persistent connection with a
numeric hostname. For example: "p:253"

1 files changed, 10 insertions, 2 deletions

diff --git a/lib/mysql.php b/lib/mysql.php
index 7b0201d..732c43a 100644
--- a/lib/mysql.php
+++ b/lib/mysql.php
@@ -59,9 +59,17 @@ namespace {
                 return \Dshafik\MySQL::$connections[$hash]['conn'];
             }
 
+            /* A custom port can be specified by appending the hostname with :{port} e.g. hostname:3307 */
+            if (preg_match('/^(.+):([\d]+)$/', $hostname, $port_matches) === 1 && $port_matches[1] !== "p") {
+                $hostname = $port_matches[1];
+                $port = (int) $port_matches[2];
+            } else {
+                $port = null;
+            }
+
             /* No flags, means we can use mysqli_connect() */
             if ($flags === 0) {
-                $conn = mysqli_connect($hostname, $username, $password);
+                $conn = mysqli_connect($hostname, $username, $password, '', $port);
                 if (!$conn instanceof mysqli) {
                     return false;
                 }
@@ -82,7 +90,7 @@ namespace {
                     $username,
                     $password,
                     '',
-                    null,
+                    $port,
                     '',
                     $flags
                 );