magento#16298 this sould fix the issue and fix a test fails on https:…

…//github.com/fratob85/magento2/tree/fix-switch-to-incorrect-store
molneek · Sep 8, 2018 · 0ee46f2 · 0ee46f2
1 parent 1a752a5
commit 0ee46f2
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php b/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
@@ -34,10 +34,10 @@ public function __construct(ScopeResolverPool $scopeResolverPool)
      * Resolve scope code
      *
      * @param string $scopeType
-     * @param string $scopeCode
+     * @param null|string $scopeCode
      * @return string
      */
-    public function resolve($scopeType, $scopeCode)
+    public function resolve($scopeType, $scopeCode = null)
     {
         if (isset($this->resolvedScopeCodes[$scopeType][$scopeCode])) {
             return $this->resolvedScopeCodes[$scopeType][$scopeCode];
@@ -47,6 +47,9 @@ public function resolve($scopeType, $scopeCode)
         ) {
             $scopeResolver = $this->scopeResolverPool->get($scopeType);
             $resolverScopeCode = $scopeResolver->getScope($scopeCode);
+            if ($scopeCode === null) {
+                $scopeCode = $resolverScopeCode->getCode();
+            }
         } else {
             $resolverScopeCode = $scopeCode;
         }
@@ -68,4 +71,4 @@ public function clean()
     {
         $this->resolvedScopeCodes = [];
     }
-}
+}