Merge branch 'hotfix/197'

Close #197
Close #194
Fixes #192

CHANGELOG.md

@@ -36,6 +36,9 @@ All notable changes to this project will be documented in this file, in reverse
 - [#175](https://github.com/zendframework/zend-diactoros/pull/175) updates the
   `Request` class to set the `Host` header from the URI host if no header is
   already present. (Ensures conformity with PSR-7 specification.)
+- [#197](https://github.com/zendframework/zend-diactoros/pull/197) updates the
+  `Uri` class to ensure that string serialization does not include a colon after
+  the host name if no port is present in the instance.
 
 ## 1.3.5 - 2016-03-17
 

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);
+    }
 }