MAGETWO-32354: Move Magento\Core\Model\Url\RouteParamsResolver.php to Framework

Alexander Paliarush · Alexander Paliarush · commit 460df9ebf7d1 · 2015-01-21T19:57:15.000+02:00
- Fixed builds
diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
@@ -3,7 +3,6 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0|~5.6.0",
-        "magento/module-store": "0.42.0-beta4",
         "magento/module-core": "0.42.0-beta4",
         "magento/module-backend": "0.42.0-beta4",
         "magento/module-cron": "0.42.0-beta4",
diff --git a/app/code/Magento/Backup/etc/module.xml b/app/code/Magento/Backup/etc/module.xml
@@ -9,7 +9,6 @@
     <module name="Magento_Backup" schema_version="1.6.0.0">
         <sequence>
             <module name="Magento_Core"/>
-            <module name="Magento_Store"/>
         </sequence>
     </module>
 </config>
diff --git a/app/code/Magento/Centinel/composer.json b/app/code/Magento/Centinel/composer.json
@@ -3,7 +3,6 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0|~5.6.0",
-        "magento/module-store": "0.42.0-beta4",
         "magento/module-checkout": "0.42.0-beta4",
         "magento/module-core": "0.42.0-beta4",
         "magento/module-backend": "0.42.0-beta4",
diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json
@@ -4,7 +4,6 @@
     "require": {
         "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-cms": "0.42.0-beta4",
-        "magento/module-store": "0.42.0-beta4",
         "magento/module-url-rewrite": "0.42.0-beta4",
         "magento/framework": "0.42.0-beta4",
         "magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json
@@ -3,7 +3,6 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0|~5.6.0",
-        "magento/module-store": "0.42.0-beta4",
         "magento/module-backend": "0.42.0-beta4",
         "magento/framework": "0.42.0-beta4",
         "magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/Cron/etc/module.xml b/app/code/Magento/Cron/etc/module.xml
@@ -7,8 +7,5 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
     <module name="Magento_Cron" schema_version="2.0.0">
-        <sequence>
-            <module name="Magento_Store"/>
-        </sequence>
     </module>
 </config>
diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json
@@ -8,7 +8,6 @@
         "magento/module-customer": "0.42.0-beta4",
         "magento/module-eav": "0.42.0-beta4",
         "magento/module-import-export": "0.42.0-beta4",
-        "magento/module-store": "0.42.0-beta4",
         "magento/module-directory": "0.42.0-beta4",
         "magento/framework": "0.42.0-beta4",
         "magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/Directory/Helper/Data.php b/app/code/Magento/Directory/Helper/Data.php
@@ -260,7 +260,10 @@ public function isZipCodeOptional($countryCode)
     public function getCountriesWithStatesRequired($asJson = false)
     {
         $value = trim(
-            $this->_config->getValue(self::XML_PATH_STATES_REQUIRED, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            $this->_config->getValue(
+                self::XML_PATH_STATES_REQUIRED,
+                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            )
         );
         $countryList = preg_split('/\,/', $value, 0, PREG_SPLIT_NO_EMPTY);
         if ($asJson) {
diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json
@@ -3,7 +3,6 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0|~5.6.0",
-        "magento/module-store": "0.42.0-beta4",
         "magento/module-shipping": "0.42.0-beta4",
         "magento/module-directory": "0.42.0-beta4",
         "magento/module-core": "0.42.0-beta4",
diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json
@@ -3,7 +3,6 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0|~5.6.0",
-        "magento/module-store": "0.42.0-beta4",
         "magento/module-catalog": "0.42.0-beta4",
         "magento/module-checkout": "0.42.0-beta4",
         "magento/module-multishipping": "0.42.0-beta4",
diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json
@@ -3,7 +3,6 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0|~5.6.0",
-        "magento/module-store": "0.42.0-beta4",
         "magento/module-sales": "0.42.0-beta4",
         "magento/framework": "0.42.0-beta4",
         "magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json
@@ -3,7 +3,6 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0|~5.6.0",
-        "magento/module-store": "0.42.0-beta4",
         "magento/module-core": "0.42.0-beta4",
         "magento/module-backend": "0.42.0-beta4",
         "magento/module-customer": "0.42.0-beta4",
diff --git a/app/code/Magento/Integration/etc/module.xml b/app/code/Magento/Integration/etc/module.xml
@@ -9,7 +9,6 @@
     <module name="Magento_Integration" schema_version="2.0.0">
         <sequence>
             <module name="Magento_Core"/>
-            <module name="Magento_Store"/>
             <module name="Magento_User"/>
         </sequence>
     </module>
diff --git a/app/code/Magento/Log/composer.json b/app/code/Magento/Log/composer.json
@@ -3,7 +3,6 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0|~5.6.0",
-        "magento/module-store": "0.42.0-beta4",
         "magento/module-core": "0.42.0-beta4",
         "magento/module-customer": "0.42.0-beta4",
         "magento/module-eav": "0.42.0-beta4",
diff --git a/app/code/Magento/Log/etc/module.xml b/app/code/Magento/Log/etc/module.xml
@@ -9,7 +9,6 @@
     <module name="Magento_Log" schema_version="2.0.0">
         <sequence>
             <module name="Magento_Core"/>
-            <module name="Magento_Store"/>
             <module name="Magento_Customer"/>
         </sequence>
     </module>
diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
@@ -9,7 +9,6 @@
         "magento/module-downloadable": "0.42.0-beta4",
         "magento/module-eav": "0.42.0-beta4",
         "magento/module-grouped-product": "0.42.0-beta4",
-        "magento/module-store": "0.42.0-beta4",
         "magento/module-tax": "0.42.0-beta4",
         "magento/module-quote": "0.42.0-beta4",
         "magento/framework": "0.42.0-beta4",
diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json
@@ -3,7 +3,6 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0|~5.6.0",
-        "magento/module-store": "0.42.0-beta4",
         "magento/module-core": "0.42.0-beta4",
         "magento/module-checkout": "0.42.0-beta4",
         "magento/module-sales": "0.42.0-beta4",
diff --git a/app/code/Magento/Multishipping/etc/module.xml b/app/code/Magento/Multishipping/etc/module.xml
@@ -9,7 +9,6 @@
     <module name="Magento_Multishipping" schema_version="2.0.0.0">
         <sequence>
             <module name="Magento_Core"/>
-            <module name="Magento_Store"/>
             <module name="Magento_Catalog"/>
         </sequence>
     </module>
diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json
@@ -3,7 +3,6 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0|~5.6.0",
-        "magento/module-store": "0.42.0-beta4",
         "magento/module-backend": "0.42.0-beta4",
         "magento/module-shipping": "0.42.0-beta4",
         "magento/module-catalog": "0.42.0-beta4",
diff --git a/app/code/Magento/OfflineShipping/etc/module.xml b/app/code/Magento/OfflineShipping/etc/module.xml
@@ -8,7 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
     <module name="Magento_OfflineShipping" schema_version="2.0.0">
         <sequence>
-            <module name="Magento_Store"/>
             <module name="Magento_Sales"/>
             <module name="Magento_Quote"/>
             <module name="Magento_SalesRule"/>
diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json
@@ -3,7 +3,6 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0|~5.6.0",
-        "magento/module-store": "0.42.0-beta4",
         "magento/module-backend": "0.42.0-beta4",
         "magento/framework": "0.42.0-beta4",
         "magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/PageCache/etc/module.xml b/app/code/Magento/PageCache/etc/module.xml
@@ -9,7 +9,6 @@
     <module name="Magento_PageCache" schema_version="1.6.0.0">
         <sequence>
             <module name="Magento_Core"/>
-            <module name="Magento_Store"/>
         </sequence>
     </module>
 </config>
diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json
@@ -3,7 +3,6 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0|~5.6.0",
-        "magento/module-store": "0.42.0-beta4",
         "magento/module-backend": "0.42.0-beta4",
         "magento/framework": "0.42.0-beta4",
         "magento/module-customer": "0.42.0-beta4",
diff --git a/app/code/Magento/Sendfriend/composer.json b/app/code/Magento/Sendfriend/composer.json
@@ -3,7 +3,6 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0|~5.6.0",
-        "magento/module-store": "0.42.0-beta4",
         "magento/module-catalog": "0.42.0-beta4",
         "magento/module-core": "0.42.0-beta4",
         "magento/module-customer": "0.42.0-beta4",
diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json
@@ -3,7 +3,6 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0|~5.6.0",
-        "magento/module-store": "0.42.0-beta4",
         "magento/module-core": "0.42.0-beta4",
         "magento/module-catalog": "0.42.0-beta4",
         "magento/module-sales": "0.42.0-beta4",
diff --git a/app/code/Magento/Shipping/etc/module.xml b/app/code/Magento/Shipping/etc/module.xml
@@ -9,7 +9,6 @@
     <module name="Magento_Shipping" schema_version="2.0.0">
         <sequence>
             <module name="Magento_Core"/>
-            <module name="Magento_Store"/>
             <module name="Magento_Catalog"/>
         </sequence>
     </module>
diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json
@@ -4,7 +4,6 @@
     "require": {
         "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-backend": "0.42.0-beta4",
-        "magento/module-store": "0.42.0-beta4",
         "magento/framework": "0.42.0-beta4",
         "magento/module-eav": "0.42.0-beta4",
         "magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json
@@ -7,7 +7,6 @@
         "magento/module-backend": "0.42.0-beta4",
         "magento/module-core": "0.42.0-beta4",
         "magento/module-integration": "0.42.0-beta4",
-        "magento/module-store": "0.42.0-beta4",
         "magento/module-theme": "0.42.0-beta4",
         "magento/framework": "0.42.0-beta4",
         "magento/module-require-js": "0.42.0-beta4",
diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json
@@ -3,7 +3,6 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0|~5.6.0",
-        "magento/module-store": "0.42.0-beta4",
         "magento/module-shipping": "0.42.0-beta4",
         "magento/module-directory": "0.42.0-beta4",
         "magento/module-core": "0.42.0-beta4",
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
@@ -42,8 +42,16 @@ public function setUp()
 
         $this->scopeConfig = $this->objectManager->create('Magento\Framework\App\MutableScopeConfig');
         $this->scopeConfig->setValue(Observer::IMPORT_ENABLE, 1, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
-        $this->scopeConfig->setValue(Observer::CRON_STRING_PATH, 'cron-string-path', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
-        $this->scopeConfig->setValue(Observer::IMPORT_SERVICE, 'webservicex', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        $this->scopeConfig->setValue(
+            Observer::CRON_STRING_PATH,
+            'cron-string-path',
+            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+        );
+        $this->scopeConfig->setValue(
+            Observer::IMPORT_SERVICE,
+            'webservicex',
+            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+        );
 
         $this->configResource = $this->objectManager->get('Magento\Core\Model\Resource\Config');
         $this->configResource->saveConfig(
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/customer_review.php b/dev/tests/integration/testsuite/Magento/Review/_files/customer_review.php
@@ -26,13 +26,19 @@
     ->setEntityPkValue($product->getId())
     ->setStatusId(\Magento\Review\Model\Review::STATUS_PENDING)
     ->setStoreId(
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface')
-            ->getStore()->getId()
+        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get('Magento\Framework\Store\StoreManagerInterface')
+            ->getStore()
+            ->getId()
+    )
+    ->setStores(
+        [
+            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+                ->get('Magento\Framework\Store\StoreManagerInterface')
+                ->getStore()
+                ->getId()
+        ]
     )
-    ->setStores([
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface')
-            ->getStore()->getId()
-    ])
     ->save();
 
 \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry')->register(
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php
@@ -91,7 +91,10 @@ public function testSaveOrder()
             ->setCustomerEmail('customer@null.com')
             ->setBillingAddress($billingAddress)
             ->setShippingAddress($shippingAddress)
-            ->setStoreId($this->objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getId())
+            ->setStoreId($this->objectManager
+                ->get('Magento\Framework\Store\StoreManagerInterface')
+                ->getStore()
+                ->getId())
             ->addItem($orderItem)
             ->setPayment($payment);
 
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/_files/blacklist/ce.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/_files/blacklist/ce.txt
@@ -32,6 +32,7 @@ lib/internal/Magento/Framework/RequireJs
 lib/internal/Magento/Framework/Search
 lib/internal/Magento/Framework/Serialization
 lib/internal/Magento/Framework/Simplexml
+lib/internal/Magento/Framework/Store
 lib/internal/Magento/Framework/System
 lib/internal/Magento/Framework/Test
 lib/internal/Magento/Framework/Url
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_config_nodes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_config_nodes.php
@@ -45,7 +45,7 @@
     '/config/global/session' => 'This configuration moved to Di configuration of \Magento\Framework\Session\Validator',
     '/config/global/ignore_user_agents' => 'This configuration moved to Di configuration of \Magento\Log\Model\Visitor',
     '/config/global/request' => 'This configuration moved to Di configuration of \Magento\Framework\App\RequestInterface',
-    '/config/global/secure_url' => 'This configuration moved to Di configuration of \Magento\Core\Model\Url\SecurityInfo',
+    '/config/global/secure_url' => 'This configuration moved to Di configuration of \Magento\Framework\Url\SecurityInfo',
     '/config/global/dev' => 'This configuration moved to Di configuration of \Magento\Framework\App\Action\Context',
     '/config/global/webapi' => 'This configuration moved to Di configuration of \Magento\Webapi\Controller\Request\Rest\Interpreter\Factory' .
     ' and \Magento\Webapi\Controller\Response\Rest\Renderer\Factory',
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/ConfigurationTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/ConfigurationTest.php
@@ -143,7 +143,11 @@ public function testGetNotifyStockQty()
 
         $this->scopeConfigMock->expects($this->once())
             ->method('getValue')
-            ->with(Configuration::XML_PATH_NOTIFY_STOCK_QTY, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)
+            ->with(
+                Configuration::XML_PATH_NOTIFY_STOCK_QTY,
+                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                $store
+            )
             ->willReturn(1);
         $this->assertEquals(1, $this->model->getNotifyStockQty($store));
     }
@@ -188,7 +192,11 @@ public function testGetCanBackInStock()
         $store = 1;
         $this->scopeConfigMock->expects($this->once())
             ->method('isSetFlag')
-            ->with(Configuration::XML_PATH_CAN_BACK_IN_STOCK, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)
+            ->with(
+                Configuration::XML_PATH_CAN_BACK_IN_STOCK,
+                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                $store
+            )
             ->willReturn(1);
         $this->assertEquals(1, $this->model->getCanBackInStock($store));
     }
@@ -198,7 +206,11 @@ public function testIsShowOutOfStock()
         $store = 1;
         $this->scopeConfigMock->expects($this->once())
             ->method('isSetFlag')
-            ->with(Configuration::XML_PATH_SHOW_OUT_OF_STOCK, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)
+            ->with(
+                Configuration::XML_PATH_SHOW_OUT_OF_STOCK,
+                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                $store
+            )
             ->willReturn(1);
         $this->assertEquals(1, $this->model->isShowOutOfStock($store));
     }
@@ -208,7 +220,11 @@ public function testIsAutoReturnEnabled()
         $store = 1;
         $this->scopeConfigMock->expects($this->once())
             ->method('isSetFlag')
-            ->with(Configuration::XML_PATH_ITEM_AUTO_RETURN, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)
+            ->with(
+                Configuration::XML_PATH_ITEM_AUTO_RETURN,
+                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                $store
+            )
             ->willReturn(1);
         $this->assertEquals(1, $this->model->isAutoReturnEnabled($store));
     }
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Stock/ItemTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Stock/ItemTest.php
@@ -94,7 +94,10 @@ protected function setUp()
 
         $store = $this->getMock('Magento\Store\Model\Store', ['getId', '__wakeup'], [], '', false);
         $store->expects($this->any())->method('getId')->willReturn($this->storeId);
-        $this->storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface', ['getStore']);
+        $this->storeManager = $this->getMockForAbstractClass(
+            'Magento\Framework\Store\StoreManagerInterface',
+            ['getStore']
+        );
         $this->storeManager->expects($this->any())->method('getStore')->willReturn($store);
 
         $this->stockConfiguration = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGeneratorTest.php b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGeneratorTest.php
diff --git a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlPathGeneratorTest.php b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlPathGeneratorTest.php
diff --git a/dev/tests/unit/testsuite/Magento/Downloadable/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Downloadable/Model/ObserverTest.php
diff --git a/dev/tests/unit/testsuite/Magento/Review/Controller/Adminhtml/Product/PostTest.php b/dev/tests/unit/testsuite/Magento/Review/Controller/Adminhtml/Product/PostTest.php
diff --git a/dev/tests/unit/testsuite/Magento/SalesRule/Helper/CouponTest.php b/dev/tests/unit/testsuite/Magento/SalesRule/Helper/CouponTest.php
