diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index 162aba1cfa3ef6fd6d86ada42171e834be6bcb80..e755e364cde87cdb9b7b04ad6b5d7e86ee8eb35b 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -142,13 +142,17 @@
<label>Developer</label>
<tab>advanced</tab>
<resource>Magento_Backend::dev</resource>
- <group id="debug" translate="label" type="text" sortOrder="20" showInDefault="0" showInWebsite="1" showInStore="1">
+ <group id="debug" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Debug</label>
- <field id="template_hints" translate="label" type="select" sortOrder="20" showInDefault="0" showInWebsite="1" showInStore="1">
- <label>Template Path Hints</label>
+ <field id="template_hints_storefront" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+ <label>Enabled Template Path Hints for Storefront</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
</field>
- <field id="template_hints_blocks" translate="label" type="select" sortOrder="21" showInDefault="0" showInWebsite="1" showInStore="1">
+ <field id="template_hints_admin" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
+ <label>Enabled Template Path Hints for Admin</label>
+ <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+ </field>
+ <field id="template_hints_blocks" translate="label" type="select" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Add Block Names to Hints</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
</field>
diff --git a/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php b/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
index 33f9eea54015be86a303b36ce309b83340cd7331..b23ba2f88779d3be265a2dc489d9951b3dc56154 100644
--- a/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
+++ b/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
@@ -5,77 +5,100 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-
-// @codingStandardsIgnoreFile
-
namespace Magento\Developer\Model\TemplateEngine\Plugin;
+use Magento\Developer\Helper\Data as DevHelper;
+use Magento\Developer\Model\TemplateEngine\Decorator\DebugHintsFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\View\TemplateEngineFactory;
+use Magento\Framework\View\TemplateEngineInterface;
use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
class DebugHints
{
- /**#@+
- * XPath of configuration of the debugging hints
+ /**
+ * XPath of configuration of the debug block names
*/
- const XML_PATH_DEBUG_TEMPLATE_HINTS = 'dev/debug/template_hints';
-
const XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS = 'dev/debug/template_hints_blocks';
- /**#@-*/
+ /**
+ * @var ScopeConfigInterface
+ */
+ protected $scopeConfig;
+
+ /**
+ * @var StoreManagerInterface
+ */
+ protected $storeManager;
/**
- * @var \Magento\Framework\ObjectManagerInterface
+ * @var DevHelper
*/
- private $objectManager;
+ protected $devHelper;
/**
- * @var \Magento\Framework\App\Config\ScopeConfigInterface
+ * @var DebugHintsFactory
*/
- private $scopeConfig;
+ protected $debugHintsFactory;
/**
- * @var \Magento\Developer\Helper\Data
+ * XPath of configuration of the debug hints
+ *
+ * Allowed values:
+ * dev/debug/template_hints_storefront
+ * dev/debug/template_hints_admin
+ *
+ * @var string
*/
- private $devHelper;
+ protected $debugHintsPath;
/**
- * @param \Magento\Framework\ObjectManagerInterface $objectManager
- * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Developer\Helper\Data $devHelper
+ * @param ScopeConfigInterface $scopeConfig
+ * @param StoreManagerInterface $storeManager
+ * @param DevHelper $devHelper
+ * @param DebugHintsFactory $debugHintsFactory
+ * @param string $debugHintsPath
*/
public function __construct(
- \Magento\Framework\ObjectManagerInterface $objectManager,
- \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Developer\Helper\Data $devHelper
+ ScopeConfigInterface $scopeConfig,
+ StoreManagerInterface $storeManager,
+ DevHelper $devHelper,
+ DebugHintsFactory $debugHintsFactory,
+ $debugHintsPath
) {
- $this->objectManager = $objectManager;
$this->scopeConfig = $scopeConfig;
+ $this->storeManager = $storeManager;
$this->devHelper = $devHelper;
+ $this->debugHintsFactory = $debugHintsFactory;
+ $this->debugHintsPath = $debugHintsPath;
}
/**
* Wrap template engine instance with the debugging hints decorator, depending of the store configuration
*
- * @param \Magento\Framework\View\TemplateEngineFactory $subject
- * @param \Magento\Framework\View\TemplateEngineInterface $invocationResult
+ * @param TemplateEngineFactory $subject
+ * @param TemplateEngineInterface $invocationResult
*
- * @return \Magento\Framework\View\TemplateEngineInterface
+ * @return TemplateEngineInterface
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function afterCreate(
- \Magento\Framework\View\TemplateEngineFactory $subject,
- \Magento\Framework\View\TemplateEngineInterface $invocationResult
+ TemplateEngineFactory $subject,
+ TemplateEngineInterface $invocationResult
) {
- if ($this->scopeConfig->getValue(self::XML_PATH_DEBUG_TEMPLATE_HINTS, ScopeInterface::SCOPE_STORE) &&
- $this->devHelper->isDevAllowed()) {
+ $storeCode = $this->storeManager->getStore()->getCode();
+ if ($this->scopeConfig->getValue($this->debugHintsPath, ScopeInterface::SCOPE_STORE, $storeCode)
+ && $this->devHelper->isDevAllowed()) {
$showBlockHints = $this->scopeConfig->getValue(
self::XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS,
- ScopeInterface::SCOPE_STORE
- );
- return $this->objectManager->create(
- 'Magento\Developer\Model\TemplateEngine\Decorator\DebugHints',
- ['subject' => $invocationResult, 'showBlockHints' => $showBlockHints]
+ ScopeInterface::SCOPE_STORE,
+ $storeCode
);
+ return $this->debugHintsFactory->create([
+ 'subject' => $invocationResult,
+ 'showBlockHints' => $showBlockHints,
+ ]);
}
return $invocationResult;
}
diff --git a/app/code/Magento/Developer/Test/Unit/Model/TemplateEngine/Plugin/DebugHintsTest.php b/app/code/Magento/Developer/Test/Unit/Model/TemplateEngine/Plugin/DebugHintsTest.php
index 00cc776db30eb9e2195366971f391957be16f2a1..9ccd6cb99dd3ce194ec35007c2c11932a9eb52a4 100644
--- a/app/code/Magento/Developer/Test/Unit/Model/TemplateEngine/Plugin/DebugHintsTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Model/TemplateEngine/Plugin/DebugHintsTest.php
@@ -5,130 +5,194 @@
*/
namespace Magento\Developer\Test\Unit\Model\TemplateEngine\Plugin;
+use Magento\Developer\Model\TemplateEngine\Decorator\DebugHintsFactory;
use Magento\Developer\Model\TemplateEngine\Plugin\DebugHints;
+use Magento\Store\Model\ScopeInterface;
class DebugHintsTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var DebugHints
+ * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $model;
+ protected $scopeConfigMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $objectManagerMock;
+ protected $storeManager;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Developer\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $scopeConfigMock;
+ protected $devHelperMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var DebugHintsFactory | \PHPUnit_Framework_MockObject_MockObject
*/
- protected $devHelperMock;
+ protected $debugHintsFactory;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @return void
*/
- protected $subjectMock;
-
protected function setUp()
{
- $this->objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
- $this->scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
- $this->devHelperMock = $this->getMock('Magento\Developer\Helper\Data', [], [], '', false);
- $this->subjectMock = $this->getMock(
- 'Magento\Framework\View\TemplateEngineFactory',
- [],
- [],
- '',
- false
- );
- $this->model = new \Magento\Developer\Model\TemplateEngine\Plugin\DebugHints($this->objectManagerMock, $this->scopeConfigMock, $this->devHelperMock);
+ $this->scopeConfigMock = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
+ ->getMockForAbstractClass();
+
+ $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+ ->getMockForAbstractClass();
+
+ $this->devHelperMock = $this->getMockBuilder('Magento\Developer\Helper\Data')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->debugHintsFactory = $this->getMockBuilder(
+ 'Magento\Developer\Model\TemplateEngine\Decorator\DebugHintsFactory'
+ )
+ ->setMethods(['create'])
+ ->disableOriginalConstructor()
+ ->getMock();
}
/**
+ * @param string $debugHintsPath
* @param bool $showBlockHints
+ * @return void
* @dataProvider afterCreateActiveDataProvider
*/
- public function testAfterCreateActive($showBlockHints)
+ public function testAfterCreateActive($debugHintsPath, $showBlockHints)
{
- $this->devHelperMock->expects($this->once())->method('isDevAllowed')->will($this->returnValue(true));
- $this->_setupConfigFixture(true, $showBlockHints);
+ $this->devHelperMock->expects($this->once())
+ ->method('isDevAllowed')
+ ->willReturn(true);
+
+ $this->setupConfigFixture($debugHintsPath, true, $showBlockHints);
+
$engine = $this->getMock('Magento\Framework\View\TemplateEngineInterface');
- $engineDecorated = $this->getMock('Magento\Framework\View\TemplateEngineInterface');
- $this->objectManagerMock->expects(
- $this->once()
- )->method(
- 'create'
- )->with(
- 'Magento\Developer\Model\TemplateEngine\Decorator\DebugHints',
- $this->identicalTo(['subject' => $engine, 'showBlockHints' => $showBlockHints])
- )->will(
- $this->returnValue($engineDecorated)
+
+ $debugHintsDecorator = $this->getMockBuilder(
+ 'Magento\Developer\Model\TemplateEngine\Decorator\DebugHints'
+ )
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->debugHintsFactory->expects($this->once())
+ ->method('create')
+ ->with([
+ 'subject' => $engine,
+ 'showBlockHints' => $showBlockHints,
+ ])
+ ->willReturn($debugHintsDecorator);
+
+ $subjectMock = $this->getMockBuilder('Magento\Framework\View\TemplateEngineFactory')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $debugHints = new DebugHints(
+ $this->scopeConfigMock,
+ $this->storeManager,
+ $this->devHelperMock,
+ $this->debugHintsFactory,
+ $debugHintsPath
);
- $this->assertEquals($engineDecorated, $this->model->afterCreate($this->subjectMock, $engine));
+
+ $this->assertEquals($debugHintsDecorator, $debugHints->afterCreate($subjectMock, $engine));
}
+ /**
+ * @return array
+ */
public function afterCreateActiveDataProvider()
{
- return ['block hints disabled' => [false], 'block hints enabled' => [true]];
+ return [
+ ['dev/debug/template_hints_storefront', false],
+ ['dev/debug/template_hints_storefront', true],
+ ['dev/debug/template_hints_admin', false],
+ ['dev/debug/template_hints_admin', true],
+ ];
}
/**
+ * @param string $debugHintsPath
* @param bool $isDevAllowed
* @param bool $showTemplateHints
+ * @return void
* @dataProvider afterCreateInactiveDataProvider
*/
- public function testAfterCreateInactive($isDevAllowed, $showTemplateHints)
+ public function testAfterCreateInactive($debugHintsPath, $isDevAllowed, $showTemplateHints)
{
- $this->devHelperMock->expects($this->any())->method('isDevAllowed')->will($this->returnValue($isDevAllowed));
- $this->_setupConfigFixture($showTemplateHints, true);
- $this->objectManagerMock->expects($this->never())->method('create');
- $engine = $this->getMock('Magento\Framework\View\TemplateEngineInterface', [], [], '', false);
- $this->assertSame($engine, $this->model->afterCreate($this->subjectMock, $engine));
+ $this->devHelperMock->expects($this->any())
+ ->method('isDevAllowed')
+ ->willReturn($isDevAllowed);
+
+ $this->setupConfigFixture($debugHintsPath, $showTemplateHints, true);
+
+ $engine = $this->getMock('Magento\Framework\View\TemplateEngineInterface');
+
+ $subjectMock = $this->getMockBuilder('Magento\Framework\View\TemplateEngineFactory')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $debugHints = new DebugHints(
+ $this->scopeConfigMock,
+ $this->storeManager,
+ $this->devHelperMock,
+ $this->debugHintsFactory,
+ $debugHintsPath
+ );
+
+ $this->assertSame($engine, $debugHints->afterCreate($subjectMock, $engine));
}
+ /**
+ * @return array
+ */
public function afterCreateInactiveDataProvider()
{
return [
- 'dev disabled, template hints disabled' => [false, false],
- 'dev disabled, template hints enabled' => [false, true],
- 'dev enabled, template hints disabled' => [true, false]
+ ['dev/debug/template_hints_storefront', false, false],
+ ['dev/debug/template_hints_storefront', false, true],
+ ['dev/debug/template_hints_storefront', true, false],
+ ['dev/debug/template_hints_admin', false, false],
+ ['dev/debug/template_hints_admin', false, true],
+ ['dev/debug/template_hints_admin', true, false],
];
}
/**
* Setup fixture values for store config
*
+ * @param string $debugHintsPath
* @param bool $showTemplateHints
* @param bool $showBlockHints
+ * @return void
*/
- protected function _setupConfigFixture($showTemplateHints, $showBlockHints)
+ protected function setupConfigFixture($debugHintsPath, $showTemplateHints, $showBlockHints)
{
- $this->scopeConfigMock->expects(
- $this->atLeastOnce()
- )->method(
- 'getValue'
- )->will(
- $this->returnValueMap(
+ $storeCode = 'default';
+ $storeMock = $this->getMock('Magento\Store\Api\Data\StoreInterface');
+ $storeMock->expects($this->once())
+ ->method('getCode')
+ ->willReturn($storeCode);
+ $this->storeManager->expects($this->once())
+ ->method('getStore')
+ ->willReturn($storeMock);
+
+ $this->scopeConfigMock->expects($this->atLeastOnce())
+ ->method('getValue')
+ ->willReturnMap([
[
- [
- DebugHints::XML_PATH_DEBUG_TEMPLATE_HINTS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
- null,
- $showTemplateHints,
- ],
- [
- DebugHints::XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
- null,
- $showBlockHints
- ],
+ $debugHintsPath,
+ ScopeInterface::SCOPE_STORE,
+ $storeCode,
+ $showTemplateHints,
+ ],
+ [
+ DebugHints::XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS,
+ ScopeInterface::SCOPE_STORE,
+ $storeCode,
+ $showBlockHints
]
- )
- );
+ ]);
}
}
diff --git a/app/code/Magento/Developer/etc/adminhtml/di.xml b/app/code/Magento/Developer/etc/adminhtml/di.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ff22a95f0e92c698ff6d80185c0f5e505fca1e32
--- /dev/null
+++ b/app/code/Magento/Developer/etc/adminhtml/di.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
+ <type name="Magento\Framework\View\TemplateEngineFactory">
+ <plugin name="debug_hints" type="Magento\Developer\Model\TemplateEngine\Plugin\DebugHints" sortOrder="10"/>
+ </type>
+ <type name="Magento\Developer\Model\TemplateEngine\Plugin\DebugHints">
+ <arguments>
+ <argument name="debugHintsPath" xsi:type="string">dev/debug/template_hints_admin</argument>
+ </arguments>
+ </type>
+</config>
diff --git a/app/code/Magento/Developer/etc/di.xml b/app/code/Magento/Developer/etc/di.xml
index ea0f67f38bed507d85c70467b78457555a012136..436385046bc060fdce294221979dae5a5f6383a4 100644
--- a/app/code/Magento/Developer/etc/di.xml
+++ b/app/code/Magento/Developer/etc/di.xml
@@ -10,9 +10,6 @@
<preference for="Magento\Framework\Css\PreProcessor\ErrorHandlerInterface" type="Magento\Framework\Css\PreProcessor\ErrorHandler" />
<preference for="Magento\Framework\Css\PreProcessor\AdapterInterface" type="Magento\Framework\Css\PreProcessor\Adapter\Less\Oyejorge" />
- <type name="Magento\Framework\View\TemplateEngineFactory">
- <plugin name="debug_hints" type="Magento\Developer\Model\TemplateEngine\Plugin\DebugHints" sortOrder="10"/>
- </type>
<type name="Magento\Framework\View\Result\Page">
<arguments>
<argument name="pageConfigRendererFactory" xsi:type="object">Magento\Developer\Model\View\Page\Config\RendererFactory</argument>
diff --git a/app/code/Magento/Developer/etc/frontend/di.xml b/app/code/Magento/Developer/etc/frontend/di.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3fd5f545b9d04f1f9c68f9b2b969984c9ffaefba
--- /dev/null
+++ b/app/code/Magento/Developer/etc/frontend/di.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
+ <type name="Magento\Framework\View\TemplateEngineFactory">
+ <plugin name="debug_hints" type="Magento\Developer\Model\TemplateEngine\Plugin\DebugHints" sortOrder="10"/>
+ </type>
+ <type name="Magento\Developer\Model\TemplateEngine\Plugin\DebugHints">
+ <arguments>
+ <argument name="debugHintsPath" xsi:type="string">dev/debug/template_hints_storefront</argument>
+ </arguments>
+ </type>
+</config>
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListTest.php
index 078756484d66e89349eb59dde03d619f83f71bd8..84d96284b9945e52a6db58b749968bdd7fe7d4d2 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListTest.php
@@ -9,6 +9,7 @@ namespace Magento\Catalog\Block\Product;
* Test class for \Magento\Catalog\Block\Product\List.
*
* @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoAppArea frontend
*/
class ListTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/integration/testsuite/Magento/Config/Model/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Config/Model/ConfigTest.php
index 623db01dd154451011068f6e09d90c1097e0c6e0..09ceb5584c6b7398142d673c234958b8ac2f3381 100644
--- a/dev/tests/integration/testsuite/Magento/Config/Model/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Model/ConfigTest.php
@@ -36,16 +36,13 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
/** @var $_configDataObject \Magento\Config\Model\Config */
$_configDataObject = Bootstrap::getObjectManager()->create('Magento\Config\Model\Config');
- $_configDataObject->setSection('dev')->setWebsite('base');
-
- $_configData = $_configDataObject->load();
- $this->assertArrayHasKey('dev/debug/template_hints', $_configData);
+ $_configData = $_configDataObject->setSection('dev')->load();
+ $this->assertArrayHasKey('dev/debug/template_hints_admin', $_configData);
$this->assertArrayHasKey('dev/debug/template_hints_blocks', $_configData);
$_configDataObject = Bootstrap::getObjectManager()->create('Magento\Config\Model\Config');
- $_configDataObject->setSection('dev');
- $_configData = $_configDataObject->load();
- $this->assertArrayNotHasKey('dev/debug/template_hints', $_configData);
+ $_configData = $_configDataObject->setSection('dev')->setWebsite('base')->load();
+ $this->assertArrayNotHasKey('dev/debug/template_hints_admin', $_configData);
$this->assertArrayNotHasKey('dev/debug/template_hints_blocks', $_configData);
}
diff --git a/dev/tests/integration/testsuite/Magento/Config/Model/_files/config_groups.php b/dev/tests/integration/testsuite/Magento/Config/Model/_files/config_groups.php
index 7b2c8f02ba2759a2db8405a827508bba939d4dcd..6dca3bdf2658216af2bae0b26e6772f5070bfb95 100644
--- a/dev/tests/integration/testsuite/Magento/Config/Model/_files/config_groups.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Model/_files/config_groups.php
@@ -10,7 +10,7 @@ return [
'restrict' => ['fields' => ['allow_ips' => ['value' => '']]],
'debug' => [
'fields' => [
- 'template_hints' => ['value' => '0'],
+ 'template_hints_admin' => ['value' => '0'],
'template_hints_blocks' => ['value' => '0'],
],
],
diff --git a/dev/tests/integration/testsuite/Magento/Config/Model/_files/config_section.php b/dev/tests/integration/testsuite/Magento/Config/Model/_files/config_section.php
index c13e1e3e1b81260bda69f5aaeb86d454f2e118a8..06eb5f2789efb5006880517cbc374b9c5ec74e9d 100644
--- a/dev/tests/integration/testsuite/Magento/Config/Model/_files/config_section.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Model/_files/config_section.php
@@ -17,7 +17,7 @@ return [
],
'debug' => [
'fields' => [
- 'template_hints' => ['value' => '1'],
+ 'template_hints_storefront' => ['value' => '1'],
'template_hints_blocks' => ['value' => '0'],
],
],
@@ -28,7 +28,10 @@ return [
'dev/log/file' => 'fileName.log',
'dev/log/exception_file' => 'exceptionFileName.log',
],
- 'dev/debug' => ['dev/debug/template_hints' => '1', 'dev/debug/template_hints_blocks' => '0'],
+ 'dev/debug' => [
+ 'dev/debug/template_hints_storefront' => '1',
+ 'dev/debug/template_hints_blocks' => '0',
+ ],
],
]
];
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/GenderTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/GenderTest.php
index c612baf883b32e7b8a9216316473f80b630cb179..13c3a9e0c26481324defc4d7191329ccdbd25d26 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/GenderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/GenderTest.php
@@ -7,6 +7,9 @@ namespace Magento\Customer\Block\Widget;
use Magento\TestFramework\Helper\Bootstrap;
+/**
+ * @magentoAppArea frontend
+ */
class GenderTest extends \PHPUnit_Framework_TestCase
{
/** @var Gender */
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/NameTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/NameTest.php
index e5aea1f1e6d9a984cffc9c8e00eecdf28b1e9a9a..fa5fb5cfbc5b3d34ce45fc0dc5ef09343443a415 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/NameTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/NameTest.php
@@ -9,6 +9,7 @@ use Magento\TestFramework\Helper\Bootstrap;
/**
* Test \Magento\Customer\Block\Widget\Name
+ * @magentoAppArea frontend
*/
class NameTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Order/TotalsTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Order/TotalsTest.php
index 14d39817dec02dc1aa4c1304d2548827a2bf92ba..35e1a7dfc8d21e43fc9eb90dbca9afd8e02dd386 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Block/Order/TotalsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Order/TotalsTest.php
@@ -5,6 +5,9 @@
*/
namespace Magento\Sales\Block\Order;
+/**
+ * @magentoAppArea frontend
+ */
class TotalsTest extends \PHPUnit_Framework_TestCase
{
public function testToHtmlChildrenInitialized()
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/ShipmentSenderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/ShipmentSenderTest.php
index 1014c56087499dc1cacb3fbb86c3edbac5df6fd7..1588c0a838047247e301f0aefc80595538e271a9 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/ShipmentSenderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/ShipmentSenderTest.php
@@ -5,6 +5,9 @@
*/
namespace Magento\Sales\Model\Order\Email\Sender;
+/**
+ * @magentoAppArea frontend
+ */
class ShipmentSenderTest extends \PHPUnit_Framework_TestCase
{
/**
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Block/Html/BreadcrumbsTest.php b/dev/tests/integration/testsuite/Magento/Theme/Block/Html/BreadcrumbsTest.php
index 594369188dd1ab65a78ac26f6a6b340adff0be24..8a315025436d82696a8bd1497415d1f2850dd053 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/Block/Html/BreadcrumbsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Block/Html/BreadcrumbsTest.php
@@ -5,6 +5,9 @@
*/
namespace Magento\Theme\Block\Html;
+/**
+ * @magentoAppArea frontend
+ */
class BreadcrumbsTest extends \PHPUnit_Framework_TestCase
{
/**
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
index 353b7bef2f399d008fcee3a39a21802e0b9cb333..fa4ee8e1c8825fe8f62bf1d774f654f9aa7139b5 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
@@ -168,7 +168,6 @@ return [
[
'XML_PATH_DEBUG_TEMPLATE_HINTS',
'Magento\Framework\View\Element\Template',
- 'Magento\Core\Model\TemplateEngine\Plugin::XML_PATH_DEBUG_TEMPLATE_HINTS',
],
[
'XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS',