Fixed code as per given instrunction in codacy

magento · Feb 12, 2019 · a886103 · a886103
1 parent bd1e538
commit a886103
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php b/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
@@ -70,15 +70,14 @@ public function switch(StoreInterface $fromStore, StoreInterface $targetStore, s
                 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();
-            } else {
-                foreach($currentRewrites as $rewrite) {
-                    $targetUrl = $targetStore->getBaseUrl() . $rewrite->getRequestPath();
-                    break;
-                }
+                return $targetUrl;
+            }
+            foreach ($currentRewrites as $rewrite) {
+                $targetUrl = $targetStore->getBaseUrl() . $rewrite->getRequestPath();
+                break;
             }
         }