#16273: Fix bug in method getUrlInStore() of product model

# Method $product->getUrlInStore() returning extremely long URLs, could be a bug

Author: Vasilii Burlacu

app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php

@@ -51,6 +51,8 @@ public function __construct(
      * @param \Magento\Framework\Url\RouteParamsResolver $subject
      * @param array $data
      * @param bool $unsetOldParams
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     *
      * @return array
      */
     public function beforeSetRouteParams(
@@ -63,13 +65,19 @@ public function beforeSetRouteParams(
             unset($data['_scope']);
         }
         if (isset($data['_scope_to_url']) && (bool)$data['_scope_to_url'] === true) {
-            $storeCode = $subject->getScope() ?: $this->storeManager->getStore()->getCode();
+            /** @var Store $currentScope */
+            $currentScope = $subject->getScope();
+            $storeCode = $currentScope && $currentScope instanceof Store ?
+                $currentScope->getCode() :
+                $this->storeManager->getStore()->getCode();
+
             $useStoreInUrl = $this->scopeConfig->getValue(
                 Store::XML_PATH_STORE_IN_URL,
                 StoreScopeInterface::SCOPE_STORE,
                 $storeCode
             );
-            if (!$useStoreInUrl && !$this->storeManager->hasSingleStore()) {
+
+            if ($useStoreInUrl && !$this->storeManager->hasSingleStore()) {
                 $this->queryParamsResolver->setQueryParam('___store', $storeCode);
             }
         }