Skip to content

Commit f4e2178

Browse files
committed
MAGETWO-32868: Move Magento\Core\Model\Asset\Config.php to the Magento\Framework\View\Asset component
1 parent 4134183 commit f4e2178

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<preference for="Magento\Framework\View\Design\Theme\ThemeProviderInterface" type="Magento\Theme\Model\Theme\ThemeProvider" />
2828
<preference for="Magento\Framework\View\Design\Theme\FileProviderInterface" type="Magento\Theme\Model\Theme\FileProvider" />
2929
<preference for="Magento\Framework\View\Design\Theme\Customization\ConfigInterface" type="Magento\Theme\Model\Theme\Customization\Config" />
30-
<preference for="Magento\Framework\View\Asset\ConfigInterface" type="Magento\Core\Model\Asset\Config" />
30+
<preference for="Magento\Framework\View\Asset\ConfigInterface" type="Magento\Framework\View\Asset\Config" />
3131
<preference for="Magento\Framework\View\Asset\MergeStrategyInterface" type="Magento\Framework\View\Asset\MergeStrategy\Direct" />
3232
<preference for="Magento\Framework\App\ViewInterface" type="Magento\Framework\App\View" />
3333
<preference for="Magento\Framework\TranslateInterface" type="Magento\Framework\Translate" />

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2906,4 +2906,5 @@
29062906
'Magento\Core\Model\TemplateEngine\Plugin\DebugHints',
29072907
'Magento\Developer\Model\TemplateEngine\Plugin\DebugHints'
29082908
],
2909+
['Magento\Core\Model\Asset\Config', 'Magento\Framework\View\Asset\Config'],
29092910
];

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22
/**
3-
* Tests Magento\Core\Model\Asset\Config
3+
* Tests Magento\Framework\View\Asset\Config
44
*
55
* Copyright © 2015 Magento. All rights reserved.
66
* See COPYING.txt for license details.
77
*/
88

99
// @codingStandardsIgnoreFile
1010

11-
namespace Magento\Core\Model\Asset;
11+
namespace Magento\Framework\View\Asset;
1212

1313
class ConfigTest extends \Magento\Test\BaseTestCase
1414
{
@@ -18,15 +18,15 @@ class ConfigTest extends \Magento\Test\BaseTestCase
1818
private $scopeConfigMock;
1919

2020
/**
21-
* @var \Magento\Core\Model\Asset\Config
21+
* @var \Magento\Framework\View\Asset\Config
2222
*/
2323
private $model;
2424

2525
public function setUp()
2626
{
2727
parent::setUp();
2828
$this->scopeConfigMock = $this->basicMock('Magento\Framework\App\Config\ScopeConfigInterface');
29-
$this->model = $this->objectManager->getObject('Magento\Core\Model\Asset\Config',
29+
$this->model = $this->objectManager->getObject('Magento\Framework\View\Asset\Config',
3030
['scopeConfig' => $this->scopeConfigMock]
3131
);
3232
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
// @codingStandardsIgnoreFile
88

9-
namespace Magento\Core\Model\Asset;
9+
namespace Magento\Framework\View\Asset;
1010

1111
/**
1212
* View asset configuration interface

0 commit comments

Comments
 (0)