Skip to content

Commit c93c9ef

Browse files
author
Yaroslav Onischenko
committed
MAGETWO-43302: Prepare pull request for M11 nord changes
1 parent f78b8ee commit c93c9ef

File tree

58 files changed

+324
-153
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+324
-153
lines changed

‎app/code/Magento/BundleSampleData/composer.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@
1313
"OSL-3.0",
1414
"AFL-3.0"
1515
],
16-
"extra": {
17-
"map": [
18-
[
19-
"*",
20-
"Magento/BundleSampleData"
21-
]
22-
]
16+
"autoload": {
17+
"files": [ "registration.php" ],
18+
"psr-4": {
19+
"Magento\\BundleSampleData\\": ""
20+
}
2321
}
2422
}

‎app/code/Magento/BundleSampleData/etc/module.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
99
<module name="Magento_BundleSampleData" setup_version="2.0.0">
1010
<sequence>
1111
<module name="Magento_Catalog"/>

‎app/code/Magento/BundleSampleData/registration.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
\Magento\Framework\Component\ComponentRegistrar::register(
8+
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9+
'Magento_BundleSampleData',
10+
__DIR__
11+
);

‎app/code/Magento/CatalogRuleSampleData/composer.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@
1212
"OSL-3.0",
1313
"AFL-3.0"
1414
],
15-
"extra": {
16-
"map": [
17-
[
18-
"*",
19-
"Magento/CatalogRuleSampleData"
20-
]
21-
]
15+
"autoload": {
16+
"files": [ "registration.php" ],
17+
"psr-4": {
18+
"Magento\\CatalogRuleSampleData\\\\": ""
19+
}
2220
}
2321
}

‎app/code/Magento/CatalogRuleSampleData/etc/module.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
99
<module name="Magento_CatalogRuleSampleData" setup_version="2.0.0">
1010
<sequence>
1111
<module name="Magento_CatalogRule"/>

‎app/code/Magento/CatalogRuleSampleData/registration.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
\Magento\Framework\Component\ComponentRegistrar::register(
8+
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9+
'Magento_CatalogRuleSampleData',
10+
__DIR__
11+
);

‎app/code/Magento/CatalogSampleData/composer.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@
1111
"OSL-3.0",
1212
"AFL-3.0"
1313
],
14-
"extra": {
15-
"map": [
16-
[
17-
"*",
18-
"Magento/CatalogSampleData"
19-
]
20-
]
14+
"autoload": {
15+
"files": [ "registration.php" ],
16+
"psr-4": {
17+
"Magento\\CatalogSampleData\\": ""
18+
}
2119
}
2220
}

‎app/code/Magento/CatalogSampleData/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
99
<type name="Magento\CatalogSampleData\Model\Product\Converter" shared="false" />
1010
</config>

‎app/code/Magento/CatalogSampleData/etc/module.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
99
<module name="Magento_CatalogSampleData" setup_version="2.0.0">
1010
<sequence>
1111
<module name="Magento_Store"/>

‎app/code/Magento/CatalogSampleData/registration.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
\Magento\Framework\Component\ComponentRegistrar::register(
8+
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9+
'Magento_CatalogSampleData',
10+
__DIR__
11+
);

0 commit comments

Comments
 (0)