magento#16298 fix travis issue

molneek · Sep 8, 2018 · 102f170 · 102f170
1 parent 3fdc6f8
commit 102f170
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php b/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
@@ -47,13 +47,13 @@ public function resolve($scopeType, $scopeCode = null)
         ) {
             $scopeResolver = $this->scopeResolverPool->get($scopeType);
             $resolverScopeCode = $scopeResolver->getScope($scopeCode);
-            $scopeCode = $resolverScopeCode->getCode();
         } else {
             $resolverScopeCode = $scopeCode;
         }
 
         if ($resolverScopeCode instanceof \Magento\Framework\App\ScopeInterface) {
             $resolverScopeCode = $resolverScopeCode->getCode();
+            $scopeCode = $resolverScopeCode;
         }
 
         $this->resolvedScopeCodes[$scopeType][$scopeCode] = $resolverScopeCode;