MC-22635: Roll back the changes introduced with MAGETWO-96663

Author: Roman Lytvynenko

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

@@ -5,15 +5,16 @@
  */
 namespace Magento\UrlRewrite\Controller;
 
+use Magento\Framework\App\Action\Redirect;
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\Response\Http as HttpResponse;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\UrlInterface;
 use Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-use Magento\Framework\App\Request\Http as HttpRequest;
-use Magento\Framework\App\Response\Http as HttpResponse;
-use Magento\Framework\UrlInterface;
-use Magento\Framework\App\Action\Redirect;
-use Magento\Framework\App\ActionInterface;
 
 /**
  * UrlRewrite Controller Router
@@ -73,11 +74,12 @@ public function __construct(
      *
      * @param RequestInterface|HttpRequest $request
      * @return ActionInterface|null
+     * @throws NoSuchEntityException
      */
     public function match(RequestInterface $request)
     {
         $rewrite = $this->getRewrite(
-            $this->getNormalizedPathInfo($request),
+            $request->getPathInfo(),
             $this->storeManager->getStore()->getId()
         );
 
@@ -153,30 +155,4 @@ protected function getRewrite($requestPath, $storeId)
             ]
         );
     }
-
-    /**
-     * Get normalized request path
-     *
-     * @param RequestInterface|HttpRequest $request
-     * @return string
-     */
-    private function getNormalizedPathInfo(RequestInterface $request): string
-    {
-        $path = $request->getPathInfo();
-        /**
-         * If request contains query params then we need to trim a slash in end of the path.
-         * For example:
-         * the original request is: http://my-host.com/category-url-key.html/?color=black
-         * where the original path is: category-url-key.html/
-         * and the result path will be: category-url-key.html
-         *
-         * It need to except a redirect like this:
-         * http://my-host.com/category-url-key.html/?color=black => http://my-host.com/category-url-key.html
-         */
-        if (!empty($path) && $request->getQuery()->count()) {
-            $path = rtrim($path, '/');
-        }
-
-        return (string)$path;
-    }
 }

app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php

@@ -351,54 +351,4 @@ public function testMatch()
 
         $this->router->match($this->request);
     }
-
-    /**
-     * Test to match corresponding URL Rewrite on request with query params
-     *
-     * @param string $originalRequestPath
-     * @param string $requestPath
-     * @param int $countOfQueryParams
-     * @dataProvider matchWithQueryParamsDataProvider
-     */
-    public function testMatchWithQueryParams(string $originalRequestPath, string $requestPath, int $countOfQueryParams)
-    {
-        $targetPath = 'target-path';
-
-        $this->storeManager->method('getStore')->willReturn($this->store);
-        $urlRewrite = $this->createMock(UrlRewrite::class);
-        $urlRewrite->method('getRedirectType')->willReturn(0);
-        $urlRewrite->method('getTargetPath')->willReturn($targetPath);
-        $urlRewrite->method('getRequestPath')->willReturn($requestPath);
-        $this->urlFinder->method('findOneByData')
-            ->with([UrlRewrite::REQUEST_PATH => $requestPath, UrlRewrite::STORE_ID => $this->store->getId()])
-            ->willReturn($urlRewrite);
-
-        $this->requestQuery->method('count')->willReturn($countOfQueryParams);
-        $this->request->method('getPathInfo')
-            ->willReturn($originalRequestPath);
-        $this->request->expects($this->once())
-            ->method('setPathInfo')
-            ->with('/' . $targetPath);
-        $this->request->expects($this->once())
-            ->method('setAlias')
-            ->with(UrlInterface::REWRITE_REQUEST_PATH_ALIAS, $requestPath);
-        $this->actionFactory->expects($this->once())
-            ->method('create')
-            ->with(Forward::class);
-
-        $this->router->match($this->request);
-    }
-
-    /**
-     * Data provider for Test to match corresponding URL Rewrite on request with query params
-     *
-     * @return array
-     */
-    public function matchWithQueryParamsDataProvider(): array
-    {
-        return [
-            ['/category.html/', 'category.html/', 0],
-            ['/category.html/', 'category.html', 1],
-        ];
-    }
 }

dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php

@@ -80,11 +80,6 @@ public function requestDataProvider(): array
                 'request' => '/page-similar/',
                 'redirect' => '/page-b',
             ],
-            'Use Case #7: Request with query params' => [
-                'request' => '/enable-cookies/?test-param',
-                'redirect' => '',
-                HttpResponse::STATUS_CODE_200,
-            ],
         ];
     }