MAGETWO-67055: Empty resolvedScopeCodes when config cache is cleaned #…

…9061
magento · Apr 10, 2017 · bf63ca2 · bf63ca2
2 parents add0b1d + 64c6ff7
commit bf63ca2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/lib/internal/Magento/Framework/App/Config.php b/lib/internal/Magento/Framework/App/Config.php
@@ -95,6 +95,7 @@ public function isSetFlag($path, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAU
 
     /**
      * Invalidate cache by type
+     * Clean scopeCodeResolver
      *
      * @return void
      */
@@ -103,6 +104,7 @@ public function clean()
         foreach ($this->types as $type) {
             $type->clean();
         }
+        $this->scopeCodeResolver->clean();
     }
 
     /**

diff --git a/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php b/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
@@ -58,4 +58,14 @@ public function resolve($scopeType, $scopeCode)
         $this->resolvedScopeCodes[$scopeType][$scopeCode] = $resolverScopeCode;
         return $resolverScopeCode;
     }
+
+    /**
+     * Clean resolvedScopeCodes, store codes may have been renamed
+     *
+     * @return void
+     */
+    public function clean()
+    {
+        $this->resolvedScopeCodes = [];
+    }
 }