Merge pull request #197 from samsonasik/fix/192

Alternate fixes #192

Conflicts:
	test/UriTest.php

Author: weierophinney

src/Uri.php

@@ -507,6 +507,9 @@ private static function createUriString($scheme, $authority, $path, $query, $fra
     private function isNonStandardPort($scheme, $host, $port)
     {
         if (! $scheme) {
+            if ($host && ! $port) {
+                return false;
+            }
             return true;
         }
 

test/UriTest.php

@@ -569,7 +569,6 @@ public function testUtf8Uri()
         $this->assertEquals('ουτοπία.δπθ.gr', $uri->getHost());
     }
 
-
     /**
      * @dataProvider utf8PathsDataProvider
      */
@@ -588,4 +587,10 @@ public function utf8PathsDataProvider()
             ['http://example.com/ουτοπία/', '/ουτοπία/']
         ];
     }
+
+    public function testUriDoesNotAppendColonToHostIfPortIsEmpty()
+    {
+        $uri = (new Uri())->withHost('google.com');
+        $this->assertEquals('google.com', (string) $uri);
+    }
 }