Merge pull request #295 from cosmastech/fix/port-as-string

Cast `Uri@filterPort()` `$port` parameter to string if non-null
slimphp · Jun 8, 2024 · 753e964 · 753e964
2 parents f7b2d1a + 132ae65
commit 753e964
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/Uri.php b/src/Uri.php
@@ -292,15 +292,21 @@ protected function hasStandardPort(): bool
     /**
      * Filter Uri port.
      *
-     * @param  int|null $port The Uri port number.
+     * @param  int|string|null $port The Uri port number.
      *
      * @return int|null
      *
      * @throws InvalidArgumentException If the port is invalid.
      */
     protected function filterPort($port): ?int
     {
-        if (is_null($port) || (is_integer($port) && ($port >= 1 && $port <= 65535))) {
+        if (is_null($port)) {
+            return null;
+        }
+
+        $port = (int) $port;
+
+        if ($port >= 1 && $port <= 65535) {
             return $port;
         }
 

diff --git a/tests/UriTest.php b/tests/UriTest.php
@@ -215,6 +215,13 @@ public function testWithPortInvalidString()
         $this->uriFactory()->withPort('Foo');
     }
 
+    public function testWithPortIntegerAsString()
+    {
+        $uri = $this->uriFactory()->withPort("199");
+
+        $this->assertEquals(199, $uri->getPort());
+    }
+
     public function testGetPath()
     {
         $this->assertEquals('/foo/bar', $this->uriFactory()->getPath());