MAGETWO-96663: UrlRewrite removes query string from url, if url has trailing slash

Author: serhii-balko

app/code/Magento/UrlRewrite/Controller/Router.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\UrlRewrite\Controller;
 
+use function GuzzleHttp\Psr7\str;
 use Magento\Framework\App\RequestInterface;
 use Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
@@ -177,6 +178,6 @@ private function getNormalizedPathInfo(RequestInterface $request): string
             $path = rtrim($path, '/');
         }
 
-        return $path;
+        return (string)$path;
     }
 }