From bc8f90993c35b5c232a923ef126ba97d046a35c0 Mon Sep 17 00:00:00 2001
From: Matthew Muscat <matthew@mamis.com.au>
Date: Thu, 19 Jul 2018 22:46:18 +1000
Subject: [PATCH 1/3] Resolve incorrect scope code selection when the requested
 scopeCode is null

- resolves an issue whereby the incorrect scope could be returned when attempting to resolve a scope with a requested scopeCode of null
- simplify the scope resolver logic to a avoid multiple if conditional checks
- move scope interface class to an alias of the class
- update docblock on the expected values available for scopeCode

Signed-off-by: Matthew Muscat <matthew@mamis.com.au>
---
 .../Framework/App/Config/ScopeCodeResolver.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php b/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
index 321997afdba95..8876f751f7c3d 100644
--- a/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
+++ b/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\App\Config;
 
+use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\App\ScopeResolverPool;
 
 /**
@@ -34,7 +35,7 @@ public function __construct(ScopeResolverPool $scopeResolverPool)
      * Resolve scope code
      *
      * @param string $scopeType
-     * @param string $scopeCode
+     * @param string|null $scopeCode
      * @return string
      */
     public function resolve($scopeType, $scopeCode)
@@ -42,20 +43,25 @@ public function resolve($scopeType, $scopeCode)
         if (isset($this->resolvedScopeCodes[$scopeType][$scopeCode])) {
             return $this->resolvedScopeCodes[$scopeType][$scopeCode];
         }
-        if (($scopeCode === null || is_numeric($scopeCode))
-            && $scopeType !== ScopeConfigInterface::SCOPE_TYPE_DEFAULT
-        ) {
+
+        if ($scopeType !== ScopeConfigInterface::SCOPE_TYPE_DEFAULT) {
             $scopeResolver = $this->scopeResolverPool->get($scopeType);
             $resolverScopeCode = $scopeResolver->getScope($scopeCode);
-        } else {
+        }
+        else {
             $resolverScopeCode = $scopeCode;
         }
 
-        if ($resolverScopeCode instanceof \Magento\Framework\App\ScopeInterface) {
+        if ($resolverScopeCode instanceof ScopeInterface) {
             $resolverScopeCode = $resolverScopeCode->getCode();
         }
 
+        if ($scopeCode == null) {
+            $scopeCode = $resolverScopeCode;
+        }
+
         $this->resolvedScopeCodes[$scopeType][$scopeCode] = $resolverScopeCode;
+
         return $resolverScopeCode;
     }
 

From ca168091922bc4d34e2347304abb12e9f08a81f9 Mon Sep 17 00:00:00 2001
From: Matthew Muscat <matthew@mamis.com.au>
Date: Fri, 20 Jul 2018 11:56:16 +1000
Subject: [PATCH 2/3] update travis-ci for phpcs static test

---
 .../Magento/Framework/App/Config/ScopeCodeResolver.php         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php b/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
index 8876f751f7c3d..ea26b736eca98 100644
--- a/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
+++ b/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
@@ -47,8 +47,7 @@ public function resolve($scopeType, $scopeCode)
         if ($scopeType !== ScopeConfigInterface::SCOPE_TYPE_DEFAULT) {
             $scopeResolver = $this->scopeResolverPool->get($scopeType);
             $resolverScopeCode = $scopeResolver->getScope($scopeCode);
-        }
-        else {
+        } else {
             $resolverScopeCode = $scopeCode;
         }
 

From 9e5fdbbb0edbaceea6d5a17607dea1a21205286c Mon Sep 17 00:00:00 2001
From: Matthew Muscat <matthew@mamis.com.au>
Date: Fri, 20 Jul 2018 18:49:11 +1000
Subject: [PATCH 3/3] Update null conditional check

---
 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 ea26b736eca98..681af35944695 100644
--- a/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
+++ b/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
@@ -55,7 +55,7 @@ public function resolve($scopeType, $scopeCode)
             $resolverScopeCode = $resolverScopeCode->getCode();
         }
 
-        if ($scopeCode == null) {
+        if ($scopeCode === null) {
             $scopeCode = $resolverScopeCode;
         }