BUGFIX: Only pass strings to pathinfo

yeebase · Jan 28, 2019 · 365f8e6 · 365f8e6
1 parent d984edc
commit 365f8e6
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/Classes/Router.php b/Classes/Router.php
@@ -27,14 +27,12 @@ class Router extends \Neos\Flow\Mvc\Routing\Router
      */
     public function resolve(ResolveContext $resolveContext): UriInterface
     {
-        /** @var Uri $uri */
         $uri = parent::resolve($resolveContext);
 
-        if ($this->matchesBlacklist($uri) === false && isset(pathinfo($uri)['extension']) === false) {
-            // $uri needs to be reparsed, because the path often contains the query
+        if ($this->matchesBlacklist($uri) === false && isset(pathinfo((string) $uri)['extension']) === false) {
+            // $uri needs to be re-parsed, because the path often contains the query
             $parsedUri = new Uri((string) $uri);
-            $parsedUri->setPath(rtrim($parsedUri->getPath(), '/') . '/');
-            return $parsedUri;
+            return $parsedUri->withPath(rtrim($parsedUri->getPath(), '/') . '/');
         }
 
         return $uri;