Prepend tcp:// scheme for URIs in error messages when missing

Author: clue

src/DnsConnector.php

@@ -19,23 +19,25 @@ public function __construct(ConnectorInterface $connector, ResolverInterface $re
 
     public function connect($uri)
     {
+        $original = $uri;
         if (\strpos($uri, '://') === false) {
-            $parts = \parse_url('tcp://' . $uri);
+            $uri = 'tcp://' . $uri;
+            $parts = \parse_url($uri);
             unset($parts['scheme']);
         } else {
             $parts = \parse_url($uri);
         }
 
         if (!$parts || !isset($parts['host'])) {
-            return Promise\reject(new \InvalidArgumentException('Given URI "' . $uri . '" is invalid'));
+            return Promise\reject(new \InvalidArgumentException('Given URI "' . $original . '" is invalid'));
         }
 
         $host = \trim($parts['host'], '[]');
         $connector = $this->connector;
 
         // skip DNS lookup / URI manipulation if this URI already contains an IP
         if (false !== \filter_var($host, \FILTER_VALIDATE_IP)) {
-            return $connector->connect($uri);
+            return $connector->connect($original);
         }
 
         $promise = $this->resolver->resolve($host);

src/HappyEyeBallsConnector.php

@@ -31,23 +31,24 @@ public function __construct(LoopInterface $loop = null, ConnectorInterface $conn
 
     public function connect($uri)
     {
-
+        $original = $uri;
         if (\strpos($uri, '://') === false) {
-            $parts = \parse_url('tcp://' . $uri);
+            $uri = 'tcp://' . $uri;
+            $parts = \parse_url($uri);
             unset($parts['scheme']);
         } else {
             $parts = \parse_url($uri);
         }
 
         if (!$parts || !isset($parts['host'])) {
-            return Promise\reject(new \InvalidArgumentException('Given URI "' . $uri . '" is invalid'));
+            return Promise\reject(new \InvalidArgumentException('Given URI "' . $original . '" is invalid'));
         }
 
         $host = \trim($parts['host'], '[]');
 
         // skip DNS lookup / URI manipulation if this URI already contains an IP
         if (false !== \filter_var($host, \FILTER_VALIDATE_IP)) {
-            return $this->connector->connect($uri);
+            return $this->connector->connect($original);
         }
 
         $builder = new HappyEyeBallsConnectionBuilder(

tests/DnsConnectorTest.php

@@ -116,7 +116,7 @@ public function testConnectRejectsWithOriginalHostnameInMessageAfterResolvingIfT
         $promise = $this->connector->connect('example.com:80');
         $promise->cancel();
 
-        $this->setExpectedException('RuntimeException', 'Connection to example.com:80 failed: Connection to tcp://1.2.3.4:80 failed: Connection failed', 42);
+        $this->setExpectedException('RuntimeException', 'Connection to tcp://example.com:80 failed: Connection to tcp://1.2.3.4:80 failed: Connection failed', 42);
         $this->throwRejection($promise);
     }
 
@@ -141,7 +141,7 @@ public function testSkipConnectionIfDnsFails()
 
         $promise = $this->connector->connect('example.invalid:80');
 
-        $this->setExpectedException('RuntimeException', 'Connection to example.invalid:80 failed during DNS lookup: DNS error');
+        $this->setExpectedException('RuntimeException', 'Connection to tcp://example.invalid:80 failed during DNS lookup: DNS error');
         $this->throwRejection($promise);
     }
 
@@ -167,7 +167,7 @@ public function testCancelDuringDnsCancelsDnsAndDoesNotStartTcpConnection()
         $promise = $this->connector->connect('example.com:80');
         $promise->cancel();
 
-        $this->setExpectedException('RuntimeException', 'Connection to example.com:80 cancelled during DNS lookup');
+        $this->setExpectedException('RuntimeException', 'Connection to tcp://example.com:80 cancelled during DNS lookup');
         $this->throwRejection($promise);
     }
 

tests/HappyEyeBallsConnectorTest.php

@@ -256,7 +256,7 @@ public function testSkipConnectionIfDnsFails()
             $that->throwRejection($promise);
         });
 
-        $this->setExpectedException('RuntimeException', 'Connection to example.invalid:80 failed during DNS lookup: DNS error');
+        $this->setExpectedException('RuntimeException', 'Connection to tcp://example.invalid:80 failed during DNS lookup: DNS error');
         $this->loop->run();
     }
 
@@ -275,7 +275,7 @@ public function testCancelDuringDnsCancelsDnsAndDoesNotStartTcpConnection()
             $that->throwRejection($promise);
         });
 
-        $this->setExpectedException('RuntimeException', 'Connection to example.com:80 cancelled during DNS lookup');
+        $this->setExpectedException('RuntimeException', 'Connection to tcp://example.com:80 cancelled during DNS lookup');
         $this->loop->run();
     }