Fixed Travis CI build failed

magento · Feb 12, 2019 · 7ebc03f · 7ebc03f
1 parent 78df524
commit 7ebc03f
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php b/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
@@ -65,21 +65,16 @@ public function switch(StoreInterface $fromStore, StoreInterface $targetStore, s
             UrlRewrite::STORE_ID => $oldStoreId,
         ]);
         if ($oldRewrite) {
+            $targetUrl = $targetStore->getBaseUrl();
             // look for url rewrite match on the target store
-            $currentRewrites = $this->urlFinder->findAllByData([
+            $currentRewrite = $this->urlFinder->findOneByData([
                 UrlRewrite::TARGET_PATH => $oldRewrite->getTargetPath(),
                 UrlRewrite::STORE_ID => $targetStore->getId(),
             ]);
-            if (null === $currentRewrites || empty($currentRewrites)) {
-                /** @var \Magento\Framework\App\Response\Http $response */
-                $targetUrl = $targetStore->getBaseUrl();
-                return $targetUrl;
-            }
-            foreach ($currentRewrites as $rewrite) {
-                $targetUrl = $targetStore->getBaseUrl() . $rewrite->getRequestPath();
+            if ($currentRewrite) {
+                $targetUrl .= $currentRewrite->getRequestPath();
             }
         }
-
         return $targetUrl;
     }
 }