Merge pull request #47 from Bontah/avoid_null_from_uri_getPath

Avoid `null` return value from `Uri#getPath()` leading to a crash in `UriNormalize`
laminas · Feb 7, 2022 · 3da1df5 · 3da1df5
2 parents 79e8baa + 9c0b3dd
commit 3da1df5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/UriNormalize.php b/src/UriNormalize.php
@@ -123,7 +123,8 @@ public function filter($value)
      */
     protected function enforceScheme(Uri $uri)
     {
-        $path = $uri->getPath();
+        $path = $uri->getPath() ?? '';
+
         if (strpos($path, '/') !== false) {
             [$host, $path] = explode('/', $path, 2);
             $path          = '/' . $path;

diff --git a/test/UriNormalizeTest.php b/test/UriNormalizeTest.php
@@ -55,6 +55,7 @@ public static function enforcedSchemeTestcaseProvider()
             ['http', 'www.example.com/foo/bar?q=q', 'http://www.example.com/foo/bar?q=q'],
             ['ftp', 'www.example.com/path/to/file.ext', 'ftp://www.example.com/path/to/file.ext'],
             ['http', '/just/a/path', '/just/a/path'], // cannot be enforced, no host
+            ['http', '', ''],
         ];
     }