Skip to content

Commit 92cb085

Browse files
marcozhengmarcozheng
committed
Merge remote-tracking branch 'origin/MAGETWO-31504_MoveDebugHintsToMagentoDeveloperModule' into develop
Conflicts: app/code/Magento/Developer/Model/TemplateEngine/Decorator/DebugHints.php app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
2 parents fed8607 + c4e4db3 commit 92cb085

File tree

12 files changed

+72
-15
lines changed

12 files changed

+72
-15
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -454,14 +454,6 @@
454454
<argument name="fileStorage" xsi:type="object">Magento\Core\Model\File\Storage\File\Proxy</argument>
455455
</arguments>
456456
</type>
457-
<type name="Magento\Framework\View\TemplateEngineFactory">
458-
<plugin name="debug_hints" type="Magento\Core\Model\TemplateEngine\Plugin\DebugHints" sortOrder="10"/>
459-
<arguments>
460-
<argument name="engines" xsi:type="array">
461-
<item name="phtml" xsi:type="string">Magento\Framework\View\TemplateEngine\Php</item>
462-
</argument>
463-
</arguments>
464-
</type>
465457
<type name="Magento\Framework\Image">
466458
<arguments>
467459
<argument name="adapter" xsi:type="object">Magento\Framework\Image\Adapter\Gd2</argument>

‎app/code/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php renamed to ‎app/code/Magento/Developer/Model/TemplateEngine/Decorator/DebugHints.php

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

99
// @codingStandardsIgnoreFile
1010

11-
namespace Magento\Core\Model\TemplateEngine\Decorator;
11+
namespace Magento\Developer\Model\TemplateEngine\Decorator;
1212

1313
class DebugHints implements \Magento\Framework\View\TemplateEngineInterface
1414
{

‎app/code/Magento/Core/Model/TemplateEngine/Plugin/DebugHints.php renamed to ‎app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
// @codingStandardsIgnoreFile
1010

11-
namespace Magento\Core\Model\TemplateEngine\Plugin;
11+
namespace Magento\Developer\Model\TemplateEngine\Plugin;
1212

1313
class DebugHints
1414
{
@@ -67,7 +67,7 @@ public function afterCreate(
6767
if ($this->_scopeConfig->getValue(self::XML_PATH_DEBUG_TEMPLATE_HINTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE) && $this->_coreData->isDevAllowed()) {
6868
$showBlockHints = $this->_scopeConfig->getValue(self::XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
6969
return $this->_objectManager->create(
70-
'Magento\Core\Model\TemplateEngine\Decorator\DebugHints',
70+
'Magento\Developer\Model\TemplateEngine\Decorator\DebugHints',
7171
['subject' => $invocationResult, 'showBlockHints' => $showBlockHints]
7272
);
7373
}

‎app/code/Magento/Developer/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The Magento_Developer module provides functionality to make it easier to develop in Magento 2.

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"name": "magento/module-developer",
3+
"description": "N/A",
4+
"require": {
5+
"php": "~5.4.11|~5.5.0|~5.6.0",
6+
"magento/module-core": "0.42.0-beta3",
7+
"magento/framework": "0.42.0-beta3",
8+
"magento/magento-composer-installer": "*"
9+
},
10+
"type": "magento2-module",
11+
"version": "0.42.0-beta3",
12+
"license": [
13+
"OSL-3.0",
14+
"AFL-3.0"
15+
],
16+
"extra": {
17+
"map": [
18+
[
19+
"*",
20+
"Magento/Developer"
21+
]
22+
]
23+
}
24+
}

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © 2015 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
9+
<type name="Magento\Framework\View\TemplateEngineFactory">
10+
<plugin name="debug_hints" type="Magento\Developer\Model\TemplateEngine\Plugin\DebugHints" sortOrder="10"/>
11+
<arguments>
12+
<argument name="engines" xsi:type="array">
13+
<item name="phtml" xsi:type="string">Magento\Framework\View\TemplateEngine\Php</item>
14+
</argument>
15+
</arguments>
16+
</type>
17+
</config>

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © 2015 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
9+
<module name="Magento_Developer" schema_version="2.0.0">
10+
</module>
11+
</config>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2869,6 +2869,10 @@
28692869
['Magento\Catalog\Block\Product\Send'],
28702870
['Magento\Catalog\Helper\Product\Options'],
28712871
['Magento\Cms\Model\Resource\Page\Service'],
2872+
[
2873+
'Magento\Core\Model\TemplateEngine\Decorator\DebugHints',
2874+
'Magento\Developer\Model\TemplateEngine\Decorator\DebugHints'
2875+
],
28722876
['Magento\Directory\Helper\Url'],
28732877
['Magento\GiftMessage\Helper\Url'],
28742878
['Magento\Rss\Helper\Data'],
@@ -2890,4 +2894,8 @@
28902894
['Magento\Sales\Model\Quote\Address\Total\Nominal\Shipping'],
28912895
['Magento\Sales\Model\Quote\Address\Total\Nominal\Subtotal'],
28922896
['Magento\Core\Model\Validator\Factory', 'Magento\Framework\Validator\Factory'],
2897+
[
2898+
'Magento\Core\Model\TemplateEngine\Plugin\DebugHints',
2899+
'Magento\Developer\Model\TemplateEngine\Plugin\DebugHints'
2900+
],
28932901
];

‎dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,6 @@
7070
['Magento\RecurringPayment'],
7171
['Magento\PayPalRecurringPayment'],
7272
['Magento\ConfigurableProduct\Service'],
73-
['Magento\Catalog\Service']
73+
['Magento\Catalog\Service'],
74+
['Magento\Core\Model\TemplateEngine\Decorator', 'Magento\Developer\Model\TemplateEngine\Decorator']
7475
];

‎dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_paths.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,4 +252,7 @@
252252
['/app/code/Magento/Sales/Model/Quote/Address/Total/Nominal'],
253253
['/app/code/Magento/Checkout/Block/Total/Nominal.php'],
254254
['/app/code/Magento/Checkout/etc/sales.xml'],
255+
['/app/code/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php'],
256+
['/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php'],
257+
255258
];

0 commit comments

Comments
 (0)