Merge branch 'hotfix/96'

Close #96

Author: weierophinney

CHANGELOG.md

@@ -18,7 +18,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#96](https://github.com/zendframework/zend-diactoros/pull/96) updates
+  `withPort()` to allow `null` port values (indicating usage of default for
+  the given scheme).
 
 ## 1.1.3 - 2015-08-10
 

src/Uri.php

@@ -306,21 +306,23 @@ public function withHost($host)
      */
     public function withPort($port)
     {
-        if (! is_numeric($port)) {
+        if (! is_numeric($port) && $port !== null) {
             throw new InvalidArgumentException(sprintf(
-                'Invalid port "%s" specified; must be an integer or integer string',
+                'Invalid port "%s" specified; must be an integer, an integer string, or null',
                 (is_object($port) ? get_class($port) : gettype($port))
             ));
         }
 
-        $port = (int) $port;
+        if ($port !== null) {
+            $port = (int) $port;
+        }
 
         if ($port === $this->port) {
             // Do nothing if no change was made.
             return clone $this;
         }
 
-        if ($port < 1 || $port > 65535) {
+        if ($port !== null && $port < 1 || $port > 65535) {
             throw new InvalidArgumentException(sprintf(
                 'Invalid port "%d" specified; must be a valid TCP/UDP port',
                 $port

test/UriTest.php

@@ -73,6 +73,7 @@ public function testWithHostReturnsNewInstanceWithProvidedHost()
     public function validPorts()
     {
         return [
+            'null'      => [ null ],
             'int'       => [ 3000 ],
             'string'    => [ "3000" ]
         ];
@@ -88,15 +89,14 @@ public function testWithPortReturnsNewInstanceWithProvidedPort($port)
         $this->assertNotSame($uri, $new);
         $this->assertEquals($port, $new->getPort());
         $this->assertEquals(
-            sprintf('https://user:[email protected]:%d/foo?bar=baz#quz', $port),
+            sprintf('https://user:[email protected]%s/foo?bar=baz#quz', $port === null ? '' : ':' . $port),
             (string) $new
         );
     }
 
     public function invalidPorts()
     {
         return [
-            'null'      => [ null ],
             'true'      => [ true ],
             'false'     => [ false ],
             'string'    => [ 'string' ],