Merge remote-tracking branch 'origin/MAGETWO-33873-Store-Constant' into develop

Author: Joan He

app/code/Magento/Store/App/Action/Plugin/Context.php

@@ -7,6 +7,7 @@
 namespace Magento\Store\App\Action\Plugin;
 
 use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class ContextPlugin
@@ -71,7 +72,7 @@ public function aroundDispatch(
         );
 
         $this->httpContext->setValue(
-            HttpContext::CONTEXT_STORE,
+            StoreManagerInterface::CONTEXT_STORE,
             $this->httpRequest->getParam(
                 '___store',
                 $defaultStore->getStoreCodeFromCookie()

app/code/Magento/Store/Model/StoreManagerInterface.php

@@ -8,6 +8,11 @@
 
 interface StoreManagerInterface
 {
+    /**
+     * Store cache context
+     */
+    const CONTEXT_STORE = 'store';
+
     /**
      * Allow or disallow single store mode
      *

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php

@@ -682,7 +682,7 @@
     ['CONTEXT_AUTH', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Context::CONTEXT_AUTH'],
     ['CONTEXT_CURRENCY', 'Magento\Customer\Helper\Data', 'Magento\Framework\App\Http\Context::CONTEXT_CURRENCY'],
     ['CONTEXT_GROUP', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Context::CONTEXT_GROUP'],
-    ['CONTEXT_STORE', 'Magento\Customer\Helper\Data', 'Magento\Framework\App\Http\Context::CONTEXT_STORE'],
+    ['CONTEXT_STORE', 'Magento\Customer\Helper\Data', 'Magento\Store\Model\StoreManagerInterface::CONTEXT_STORE'],
     ['DEBUG_CONNECT', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\LoggerInterface::TYPE_CONNECT'],
     ['DEBUG_TRANSACTION', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\LoggerInterface::TYPE_TRANSACTION'],
     ['DEBUG_QUERY', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\LoggerInterface::TYPE_QUERY'],

dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/ContextTest.php

@@ -8,6 +8,7 @@
 
 namespace Magento\Store\App\Action\Plugin;
 use Magento\Framework\App\Http\Context;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class ContextPluginTest
@@ -133,7 +134,7 @@ public function testAroundDispatch()
             ->method('setValue')
             ->will($this->returnValueMap([
                 [Context::CONTEXT_CURRENCY, 'UAH', 'UAH', $this->httpContextMock],
-                [Context::CONTEXT_STORE, 'default', 'default', $this->httpContextMock],
+                [StoreManagerInterface::CONTEXT_STORE, 'default', 'default', $this->httpContextMock],
             ]));
         $this->assertEquals(
             'ExpectedValue',

lib/internal/Magento/Framework/App/Http/Context.php

@@ -14,10 +14,6 @@ class Context
      * Currency cache context
      */
     const CONTEXT_CURRENCY = 'current_currency';
-    /**
-     * Store cache context
-     */
-    const CONTEXT_STORE = 'store';
 
     /**
      * Data storage