Refactor to reuse URI construction

Author: clue

src/Connector.php

@@ -175,4 +175,61 @@ public function connect($uri)
 
         return $this->connectors[$scheme]->connect($uri);
     }
+
+
+    /**
+     * [internal] Builds on URI from the given URI parts and ip address with original hostname as query
+     *
+     * @param array  $parts
+     * @param string $host
+     * @param string $ip
+     * @return string
+     * @internal
+     */
+    public static function uri(array $parts, $host, $ip)
+    {
+        $uri = '';
+
+        // prepend original scheme if known
+        if (isset($parts['scheme'])) {
+            $uri .= $parts['scheme'] . '://';
+        }
+
+        if (\strpos($ip, ':') !== false) {
+            // enclose IPv6 addresses in square brackets before appending port
+            $uri .= '[' . $ip . ']';
+        } else {
+            $uri .= $ip;
+        }
+
+        // append original port if known
+        if (isset($parts['port'])) {
+            $uri .= ':' . $parts['port'];
+        }
+
+        // append orignal path if known
+        if (isset($parts['path'])) {
+            $uri .= $parts['path'];
+        }
+
+        // append original query if known
+        if (isset($parts['query'])) {
+            $uri .= '?' . $parts['query'];
+        }
+
+        // append original hostname as query if resolved via DNS and if
+        // destination URI does not contain "hostname" query param already
+        $args = array();
+        \parse_str(isset($parts['query']) ? $parts['query'] : '', $args);
+        if ($host !== $ip && !isset($args['hostname'])) {
+            $uri .= (isset($parts['query']) ? '&' : '?') . 'hostname=' . \rawurlencode($host);
+        }
+
+        // append original fragment if known
+        if (isset($parts['fragment'])) {
+            $uri .= '#' . $parts['fragment'];
+        }
+
+        return $uri;
+    }
 }

src/DnsConnector.php

@@ -46,47 +46,7 @@ function ($resolve, $reject) use (&$promise, &$resolved, $uri, $connector, $host
                 // resolve/reject with result of DNS lookup
                 $promise->then(function ($ip) use (&$promise, &$resolved, $connector, $host, $parts) {
                     $resolved = $ip;
-                    $uri = '';
-
-                    // prepend original scheme if known
-                    if (isset($parts['scheme'])) {
-                        $uri .= $parts['scheme'] . '://';
-                    }
-
-                    if (\strpos($ip, ':') !== false) {
-                        // enclose IPv6 addresses in square brackets before appending port
-                        $uri .= '[' . $ip . ']';
-                    } else {
-                        $uri .= $ip;
-                    }
-
-                    // append original port if known
-                    if (isset($parts['port'])) {
-                        $uri .= ':' . $parts['port'];
-                    }
-
-                    // append orignal path if known
-                    if (isset($parts['path'])) {
-                        $uri .= $parts['path'];
-                    }
-
-                    // append original query if known
-                    if (isset($parts['query'])) {
-                        $uri .= '?' . $parts['query'];
-                    }
-
-                    // append original hostname as query if resolved via DNS and if
-                    // destination URI does not contain "hostname" query param already
-                    $args = array();
-                    \parse_str(isset($parts['query']) ? $parts['query'] : '', $args);
-                    if ($host !== $ip && !isset($args['hostname'])) {
-                        $uri .= (isset($parts['query']) ? '&' : '?') . 'hostname=' . \rawurlencode($host);
-                    }
-
-                    // append original fragment if known
-                    if (isset($parts['fragment'])) {
-                        $uri .= '#' . $parts['fragment'];
-                    }
+                    $uri = Connector::uri($parts, $host, $ip);
 
                     return $promise = $connector->connect($uri);
                 }, function ($e) use ($uri, $reject) {

src/HappyEyeBallsConnectionBuilder.php

@@ -222,47 +222,7 @@ public function check($resolve, $reject)
      */
     public function attemptConnection($ip)
     {
-        $uri = '';
-
-        // prepend original scheme if known
-        if (isset($this->parts['scheme'])) {
-            $uri .= $this->parts['scheme'] . '://';
-        }
-
-        if (\strpos($ip, ':') !== false) {
-            // enclose IPv6 addresses in square brackets before appending port
-            $uri .= '[' . $ip . ']';
-        } else {
-            $uri .= $ip;
-        }
-
-        // append original port if known
-        if (isset($this->parts['port'])) {
-            $uri .= ':' . $this->parts['port'];
-        }
-
-        // append orignal path if known
-        if (isset($this->parts['path'])) {
-            $uri .= $this->parts['path'];
-        }
-
-        // append original query if known
-        if (isset($this->parts['query'])) {
-            $uri .= '?' . $this->parts['query'];
-        }
-
-        // append original hostname as query if resolved via DNS and if
-        // destination URI does not contain "hostname" query param already
-        $args = array();
-        \parse_str(isset($this->parts['query']) ? $this->parts['query'] : '', $args);
-        if ($this->host !== $ip && !isset($args['hostname'])) {
-            $uri .= (isset($this->parts['query']) ? '&' : '?') . 'hostname=' . \rawurlencode($this->host);
-        }
-
-        // append original fragment if known
-        if (isset($this->parts['fragment'])) {
-            $uri .= '#' . $this->parts['fragment'];
-        }
+        $uri = Connector::uri($this->parts, $this->host, $ip);
 
         return $this->connector->connect($uri);
     }