Skip to content

Commit 0f9ce0f

Browse files
author
Bryant Luk
committed
MAGETWO-34952: Final cleanup to ensure Core module is properly removed
- Remove Magento_Core references
1 parent 18a48b3 commit 0f9ce0f

File tree

27 files changed

+39
-47
lines changed

27 files changed

+39
-47
lines changed

‎app/code/Magento/Backend/etc/adminhtml/menu.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<menu>
1010
<add id="Magento_Backend::system_design_schedule" title="Schedule" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::system_design" action="adminhtml/system_design" resource="Magento_Backend::schedule"/>
1111
<add id="Magento_Backend::system_currency" title="Currency" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::stores" action="adminhtml/system_currency" resource="Magento_CurrencySymbol::system_currency"/>
12-
<add id="Magento_Backend::system_store" title="All Stores" module="Magento_Core" sortOrder="10" parent="Magento_Backend::stores_settings" action="adminhtml/system_store/" resource="Magento_Backend::store"/>
12+
<add id="Magento_Backend::system_store" title="All Stores" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::stores_settings" action="adminhtml/system_store/" resource="Magento_Backend::store"/>
1313
<add id="Magento_Backend::dashboard" title="Dashboard" module="Magento_Backend" sortOrder="10" action="adminhtml/dashboard" resource="Magento_Backend::dashboard"/>
1414
<add id="Magento_Backend::system" title="System" module="Magento_Backend" sortOrder="80" resource="Magento_Backend::system"/>
1515
<add id="Magento_Backend::system_tools" title="Tools" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::system" resource="Magento_Backend::tools"/>

‎app/code/Magento/Theme/Test/Unit/Helper/ThemeTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ public function getCssAssetsDataProvider()
5454
'<block class="Magento\Theme\Block\Html\Head" name="head">
5555
<block class="Magento\Theme\Block\Html\Head\Css" name="magento-loader-js">
5656
<arguments>
57-
<argument name="file" xsi:type="string">Magento_Core::test3.css</argument>
57+
<argument name="file" xsi:type="string">Magento_Theme::test3.css</argument>
5858
</arguments>
5959
</block>
6060
</block>',
61-
['Magento_Core::test3.css' => 'Magento_Core::test3.css'],
61+
['Magento_Theme::test3.css' => 'Magento_Theme::test3.css'],
6262
],
6363
[
6464
'<block class="Magento\Theme\Block\Html\Head" name="head">
@@ -67,7 +67,7 @@ public function getCssAssetsDataProvider()
6767
</block>
6868
<block class="Magento\Theme\Block\Html\Head\Css" name="magento-loader-js">
6969
<arguments>
70-
<argument name="file" xsi:type="string">Magento_Core::test.css</argument>
70+
<argument name="file" xsi:type="string">Magento_Theme::test.css</argument>
7171
</arguments>
7272
</block>
7373
</block>
@@ -76,7 +76,7 @@ public function getCssAssetsDataProvider()
7676
<arguments><argument name="file" xsi:type="string">testh.css</argument></arguments>
7777
</block>
7878
<block class="Magento\Theme\Block\Html\Head\Css" name="magento-loader-js">
79-
<arguments><argument name="file" xsi:type="string">Magento_Core::test.css</argument></arguments>
79+
<arguments><argument name="file" xsi:type="string">Magento_Theme::test.css</argument></arguments>
8080
</block>
8181
</referenceBlock>
8282
<block type="Some_Block_Class">
@@ -85,7 +85,7 @@ public function getCssAssetsDataProvider()
8585
</block>
8686
<block class="Magento\Theme\Block\Html\Head\Css" name="magento-loader-js">
8787
<arguments>
88-
<argument name="file" xsi:type="string">Magento_Core::testa.css</argument>
88+
<argument name="file" xsi:type="string">Magento_Theme::testa.css</argument>
8989
</arguments>
9090
</block>
9191
</block>
@@ -95,12 +95,12 @@ public function getCssAssetsDataProvider()
9595
</block>
9696
<block class="Magento\Theme\Block\Html\Head\Css" name="magento-loader-js">
9797
<arguments>
98-
<argument name="file" xsi:type="string">Magento_Core::testb.css</argument>
98+
<argument name="file" xsi:type="string">Magento_Theme::testb.css</argument>
9999
</arguments>
100100
</block>
101101
</referenceBlock>',
102102
[
103-
'Magento_Core::test.css' => 'Magento_Core::test.css',
103+
'Magento_Theme::test.css' => 'Magento_Theme::test.css',
104104
'test.css' => 'test.css',
105105
'testh.css' => 'testh.css',
106106
],

‎dev/tests/integration/framework/Magento/TestFramework/Event/Magento.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Observer of Magento events triggered using Magento_Core_Model_\Magento\TestFramework\EventManager::dispatch()
9-
*/
107
namespace Magento\TestFramework\Event;
118

9+
/**
10+
* Observer of Magento events triggered using \Magento\TestFramework\EventManager::dispatch()
11+
*/
1212
class Magento
1313
{
1414
/**

‎dev/tests/integration/testsuite/Magento/Core/Model/_files/Magento/Core/i18n/en_AU.csv

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎dev/tests/integration/testsuite/Magento/Core/_files/etc/module.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/InterfaceTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ protected function setUp()
3838
'\Magento\Framework\Setup\ModuleDataSetupInterface',
3939
[
4040
'resourceName' => 'core_setup',
41-
'moduleName' => 'Magento_Core'
41+
'moduleName' => 'Magento_Test'
4242
]
4343
);
4444
$this->_connection = $installer->getConnection();

‎dev/tests/integration/testsuite/Magento/Framework/Translate/_files/_translation_data.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
?>
77
<?php return [
8-
'Original value for Magento_Core module' => 'Translated value for Magento_Core module',
9-
'Magento_Core::Text with different translation on different modules' => 'Text translation by Magento_Core module',
8+
'Original value for Magento_Store module' => 'Translated value for Magento_Store module',
9+
'Magento_Store::Text with different translation on different modules' => 'Text translation by Magento_Store module',
1010
'Some non-translated value for Magento_Catalog' => 'Translation for some value for Magento_Catalog',
1111
'Another non-translated value for Magento_Catalog' => 'Translation for another value for Magento_Catalog',
1212
'Magento_Catalog::Text with different translation on different modules' =>

‎dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,15 @@ protected function setUp()
4040

4141
/** @var $moduleReader \Magento\Framework\Module\Dir\Reader */
4242
$moduleReader = $objectManager->get('Magento\Framework\Module\Dir\Reader');
43-
$moduleReader->setModuleDir('Magento_Core', 'i18n', dirname(__DIR__) . '/Core/Model/_files/Magento/Core/i18n');
43+
$moduleReader->setModuleDir(
44+
'Magento_Store',
45+
'i18n',
46+
dirname(__DIR__) . '/Translation/Model/_files/Magento/Store/i18n'
47+
);
4448
$moduleReader->setModuleDir(
4549
'Magento_Catalog',
4650
'i18n',
47-
dirname(__DIR__) . '/Core/Model/_files/Magento/Catalog/i18n'
51+
dirname(__DIR__) . '/Translation/Model/_files/Magento/Catalog/i18n'
4852
);
4953

5054
/** @var \Magento\Theme\Model\View\Design $designModel */

‎dev/tests/integration/testsuite/Magento/Framework/View/Element/AbstractBlockTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ protected function setUp()
3535
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
3636
'Magento\Framework\View\Element\Context'
3737
),
38-
['module_name' => 'Magento_Core']
38+
['module_name' => 'Magento_Theme']
3939
]
4040
);
4141
}
@@ -500,8 +500,8 @@ public function testFormatTime()
500500

501501
public function testGetModuleName()
502502
{
503-
$this->assertEquals('Magento_Core', $this->_block->getModuleName());
504-
$this->assertEquals('Magento_Core', $this->_block->getData('module_name'));
503+
$this->assertEquals('Magento_Theme', $this->_block->getModuleName());
504+
$this->assertEquals('Magento_Theme', $this->_block->getData('module_name'));
505505
}
506506

507507
/**
@@ -636,7 +636,7 @@ protected function _createBlockWithLayout(
636636
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
637637
'Magento\Framework\View\Element\Context'
638638
),
639-
['module_name' => 'Magento_Core']
639+
['module_name' => 'Magento_Theme']
640640
],
641641
$mockClass
642642
);

‎dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Test/default/etc/view.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77
-->
88
<view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../lib/internal/Magento/Framework/Config/etc/view.xsd">
9-
<vars module="Magento_Core">
10-
<var name="var1">Core Value1</var>
9+
<vars module="Magento_Store">
10+
<var name="var1">Store Value1</var>
1111
</vars>
1212
<vars module="Namespace_Module">
1313
<var name="var1">value1</var>

0 commit comments

Comments
 (0)