Merge branch 'MAGETWO-70332' into 2.3-develop-pr9

Author: OlgaVasyltsun

app/code/Magento/Store/App/Action/Plugin/Context.php

@@ -7,7 +7,10 @@
 namespace Magento\Store\App\Action\Plugin;
 
 use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Phrase;
+use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Api\StoreCookieManagerInterface;
 use Magento\Store\Api\StoreResolverInterface;
 use Magento\Store\Model\StoreManagerInterface;
@@ -58,42 +61,102 @@ public function __construct(
     }
 
     /**
-     * Set store and currency to http context
+     * Set store and currency to http context.
      *
      * @param AbstractAction $subject
      * @param RequestInterface $request
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function beforeDispatch(AbstractAction $subject, RequestInterface $request)
-    {
-        /** @var \Magento\Store\Model\Store $defaultStore */
-        $defaultStore = $this->storeManager->getWebsite()->getDefaultStore();
+    public function beforeDispatch(
+        AbstractAction $subject,
+        RequestInterface $request
+    ) {
+        if ($this->isAlreadySet()) {
+            //If required store related value were already set for
+            //HTTP processors then just continuing as we were.
+            return;
+        }
 
+        /** @var string|array|null $storeCode */
         $storeCode = $request->getParam(
             StoreResolverInterface::PARAM_NAME,
             $this->storeCookieManager->getStoreCodeFromCookie()
         );
-
         if (is_array($storeCode)) {
             if (!isset($storeCode['_data']['code'])) {
-                throw new \InvalidArgumentException(new Phrase('Invalid store parameter.'));
+                $this->processInvalidStoreRequested();
             }
             $storeCode = $storeCode['_data']['code'];
         }
-        /** @var \Magento\Store\Model\Store $currentStore */
-        $currentStore = $storeCode ? $this->storeManager->getStore($storeCode) : $defaultStore;
+        if ($storeCode === '') {
+            //Empty code - is an invalid code and it was given explicitly
+            //(the value would be null if the code wasn't found).
+            $this->processInvalidStoreRequested();
+        }
+        try {
+            $currentStore = $this->storeManager->getStore($storeCode);
+        } catch (NoSuchEntityException $exception) {
+            $this->processInvalidStoreRequested($exception);
+        }
+
+        $this->updateContext($currentStore);
+    }
+
+    /**
+     * Take action in case of invalid store requested.
+     *
+     * @param \Throwable|null  $previousException
+     * @return void
+     * @throws NotFoundException
+     */
+    private function processInvalidStoreRequested(
+        \Throwable $previousException = null
+    ) {
+        $store = $this->storeManager->getStore();
+        $this->updateContext($store);
 
+        throw new NotFoundException(
+            $previousException
+                ? __($previousException->getMessage())
+                : __('Invalid store requested.'),
+            $previousException
+        );
+    }
+
+    /**
+     * Update context accordingly to the store found.
+     *
+     * @param StoreInterface $store
+     * @return void
+     */
+    private function updateContext(StoreInterface $store)
+    {
         $this->httpContext->setValue(
             StoreManagerInterface::CONTEXT_STORE,
-            $currentStore->getCode(),
+            $store->getCode(),
             $this->storeManager->getDefaultStoreView()->getCode()
         );
 
+        /** @var StoreInterface $defaultStore */
+        $defaultStore = $this->storeManager->getWebsite()->getDefaultStore();
         $this->httpContext->setValue(
             HttpContext::CONTEXT_CURRENCY,
-            $this->session->getCurrencyCode() ?: $currentStore->getDefaultCurrencyCode(),
+            $this->session->getCurrencyCode()
+                ?: $store->getDefaultCurrencyCode(),
             $defaultStore->getDefaultCurrencyCode()
         );
     }
+
+    /**
+     * Check if there is a need to find the current store.
+     *
+     * @return bool
+     */
+    private function isAlreadySet(): bool
+    {
+        $storeKey = StoreManagerInterface::CONTEXT_STORE;
+
+        return $this->httpContext->getValue($storeKey) !== null;
+    }
 }

app/code/Magento/Store/Model/StoreManagerInterface.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Store\Model;
 
+use Magento\Framework\Exception\NoSuchEntityException;
+
 /**
  * Store manager interface
  *
@@ -46,6 +48,7 @@ public function isSingleStoreMode();
      *
      * @param null|string|bool|int|\Magento\Store\Api\Data\StoreInterface $storeId
      * @return \Magento\Store\Api\Data\StoreInterface
+     * @throws NoSuchEntityException If given store doesn't exist.
      */
     public function getStore($storeId = null);