From 102f170be9c163718eb2009f5a97cf224853dce2 Mon Sep 17 00:00:00 2001
From: Serhii Petrychenko <s.petrychenko@gmail.com>
Date: Sat, 8 Sep 2018 20:05:59 +0000
Subject: [PATCH] #16298 fix travis issue

---
 lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php b/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
index c1b56c3d64d28..f3f3dea919973 100644
--- 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;