Merge remote-tracking branch 'origin/MAGETWO-31500-Move-Minification-Config-Settings' into develop

Conflicts:
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php

Author: marcozheng

app/code/Magento/Core/etc/di.xml

@@ -27,7 +27,7 @@
     <preference for="Magento\Framework\View\Design\Theme\ThemeProviderInterface" type="Magento\Theme\Model\Theme\ThemeProvider" />
     <preference for="Magento\Framework\View\Design\Theme\FileProviderInterface" type="Magento\Theme\Model\Theme\FileProvider" />
     <preference for="Magento\Framework\View\Design\Theme\Customization\ConfigInterface" type="Magento\Theme\Model\Theme\Customization\Config" />
-    <preference for="Magento\Framework\View\Asset\ConfigInterface" type="Magento\Core\Model\Asset\Config" />
+    <preference for="Magento\Framework\View\Asset\ConfigInterface" type="Magento\Framework\View\Asset\Config" />
     <preference for="Magento\Framework\View\Asset\MergeStrategyInterface" type="Magento\Framework\View\Asset\MergeStrategy\Direct" />
     <preference for="Magento\Framework\App\ViewInterface" type="Magento\Framework\App\View" />
     <preference for="Magento\Framework\TranslateInterface" type="Magento\Framework\Translate" />

dev/tests/integration/testsuite/Magento/Framework/View/Asset/MinifierTest.php

@@ -36,8 +36,8 @@ protected function setUp()
      */
     public function testCssMinifierLibrary()
     {
-        /** @var \Magento\Core\Model\Asset\Config $config */
-        $config = $this->objectManager->get('\Magento\Core\Model\Asset\Config');
+        /** @var \Magento\Framework\View\Asset\Config $config */
+        $config = $this->objectManager->get('Magento\Framework\View\Asset\Config');
         $adapterClass = $config->getAssetMinificationAdapter('css');
 
         /** @var \Magento\Framework\Code\Minifier\AdapterInterface $adapter */

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

@@ -2915,5 +2915,6 @@
     ['Magento\Backend\Model\Config\Backend\Cookie\Lifetime', 'Magento\Cookie\Model\Config\Backend\Lifetime'],
     ['Magento\Backend\Model\Config\Backend\Cookie\Path', 'Magento\Cookie\Model\Config\Backend\Path'],
     ['Magento\Core\Block\RequireCookie', 'Magento\Cookie\Block\RequireCookie'],
-    ['Magento\Core\Controller\Index\NoCookies', 'Magento\Cookie\Controller\Index\NoCookies']
+    ['Magento\Core\Controller\Index\NoCookies', 'Magento\Cookie\Controller\Index\NoCookies'],
+    ['Magento\Core\Model\Asset\Config', 'Magento\Framework\View\Asset\Config'],
 ];

dev/tests/unit/testsuite/Magento/Core/Model/Asset/ConfigTest.php renamed to dev/tests/unit/testsuite/Magento/Framework/View/Asset/ConfigTest.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Tests Magento\Core\Model\Asset\Config
+ * Tests Magento\Framework\View\Asset\Config
  *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 // @codingStandardsIgnoreFile
 
-namespace Magento\Core\Model\Asset;
+namespace Magento\Framework\View\Asset;
 
 class ConfigTest extends \Magento\Test\BaseTestCase
 {
@@ -18,15 +18,15 @@ class ConfigTest extends \Magento\Test\BaseTestCase
     private $scopeConfigMock;
 
     /**
-     * @var \Magento\Core\Model\Asset\Config
+     * @var \Magento\Framework\View\Asset\Config
      */
     private $model;
 
     public function setUp()
     {
         parent::setUp();
         $this->scopeConfigMock = $this->basicMock('Magento\Framework\App\Config\ScopeConfigInterface');
-        $this->model = $this->objectManager->getObject('Magento\Core\Model\Asset\Config',
+        $this->model = $this->objectManager->getObject('Magento\Framework\View\Asset\Config',
             ['scopeConfig' => $this->scopeConfigMock]
         );
     }

app/code/Magento/Core/Model/Asset/Config.php renamed to lib/internal/Magento/Framework/View/Asset/Config.php

@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-namespace Magento\Core\Model\Asset;
+namespace Magento\Framework\View\Asset;
 
 /**
  * View asset configuration interface