port is always integer

Author: snapshotpl

src/Uri.php

@@ -335,11 +335,15 @@ public function withHost($host)
      */
     public function withPort($port)
     {
-        if (! is_int($port) && $port !== null) {
-            throw new InvalidArgumentException(sprintf(
-                'Invalid port "%s" specified; must be an integer, or null',
-                (is_object($port) ? get_class($port) : gettype($port))
-            ));
+        if ($port !== null) {
+            if (! is_numeric($port) || is_float($port)) {
+                throw new InvalidArgumentException(sprintf(
+                    '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 === $this->port) {

test/UriTest.php

@@ -137,6 +137,7 @@ public function validPorts()
         return [
             'null'         => [ null ],
             'int'          => [ 3000 ],
+            'string-int'   => [ '3000' ],
         ];
     }
 
@@ -158,7 +159,7 @@ public function testWithPortReturnsNewInstanceWithProvidedPort($port)
     public function testWithPortReturnsSameInstanceWithProvidedPortIsSameAsBefore()
     {
         $uri = new Uri('https://user:[email protected]:3001/foo?bar=baz#quz');
-        $new = $uri->withPort(3001);
+        $new = $uri->withPort('3001');
         $this->assertSame($uri, $new);
         $this->assertEquals(3001, $new->getPort());
     }
@@ -169,9 +170,9 @@ public function invalidPorts()
             'true'       => [ true ],
             'false'      => [ false ],
             'string'     => [ 'string' ],
-            'string-int' => [ '3000' ],
+            'float'      => [ 55.5 ],
             'array'      => [ [ 3000 ] ],
-            'object'     => [ (object) [ 3000 ] ],
+            'object'     => [ (object) ['port' => 3000 ] ],
             'zero'       => [ 0 ],
             'too-small'  => [ -1 ],
             'too-big'    => [ 65536 ],