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

serhii-balko · serhii-balko · commit e8301afe523f · 2019-06-19T13:41:46.000+03:00
diff --git a/app/code/Magento/UrlRewrite/Controller/Router.php b/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;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`*/`
`6`	`6`	`namespace Magento\UrlRewrite\Controller;`
`7`	`7`
	`8`	`+use function GuzzleHttp\Psr7\str;`
`8`	`9`	`use Magento\Framework\App\RequestInterface;`
`9`	`10`	`use Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;`
`10`	`11`	`use Magento\UrlRewrite\Model\UrlFinderInterface;`
`@@ -177,6 +178,6 @@ private function getNormalizedPathInfo(RequestInterface $request): string`
`177`	`178`	`$path = rtrim($path, '/');`
`178`	`179`	`}`
`179`	`180`
`180`		`- return $path;`
	`181`	`+ return (string)$path;`
`181`	`182`	`}`
`182`	`183`	`}`