Skip to content

Commit 728f29d

Browse files
author
Stanislav Idolov
authored
ENGCOM-2685: Declare module namespace before template path name #17394 
2 parents 69e182c + 5d84816 commit 728f29d

File tree

20 files changed

+21
-22
lines changed

20 files changed

+21
-22
lines changed

‎app/code/Magento/Backend/Block/System/Store/Delete/Group.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ protected function _prepareLayout()
1919
{
2020
$itemId = $this->getRequest()->getParam('group_id');
2121

22-
$this->setTemplate('system/store/delete_group.phtml');
22+
$this->setTemplate('Magento_Backend::system/store/delete_group.phtml');
2323
$this->setAction($this->getUrl('adminhtml/*/deleteGroupPost', ['group_id' => $itemId]));
2424
$this->addChild(
2525
'confirm_deletion_button',

‎app/code/Magento/Backend/Block/System/Store/Delete/Website.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ protected function _prepareLayout()
1919
{
2020
$itemId = $this->getRequest()->getParam('website_id');
2121

22-
$this->setTemplate('system/store/delete_website.phtml');
22+
$this->setTemplate('Magento_Backend::system/store/delete_website.phtml');
2323
$this->setAction($this->getUrl('adminhtml/*/deleteWebsitePost', ['website_id' => $itemId]));
2424
$this->addChild(
2525
'confirm_deletion_button',

‎app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\Tree
3030
*/
3131
protected function _prepareLayout()
3232
{
33-
$this->setTemplate('catalog/category/checkboxes/tree.phtml');
33+
$this->setTemplate('Magento_Catalog::catalog/category/checkboxes/tree.phtml');
3434
}
3535

3636
/**

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Ajax/Serializer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function __construct(
4141
public function _construct()
4242
{
4343
parent::_construct();
44-
$this->setTemplate('catalog/product/edit/serializer.phtml');
44+
$this->setTemplate('Magento_Catalog::catalog/product/edit/serializer.phtml');
4545
return $this;
4646
}
4747

‎app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ protected function _construct()
8282
parent::_construct();
8383
$this->setUseAjax(true);
8484
$this->_parentTemplate = $this->getTemplate();
85-
$this->setTemplate('tab/cart.phtml');
85+
$this->setTemplate('Magento_Customer::tab/cart.phtml');
8686
}
8787

8888
/**

‎app/code/Magento/Customer/Block/Adminhtml/System/Config/Validatevat.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ protected function _prepareLayout()
9999
{
100100
parent::_prepareLayout();
101101
if (!$this->getTemplate()) {
102-
$this->setTemplate('system/config/validatevat.phtml');
102+
$this->setTemplate('Magento_Customer::system/config/validatevat.phtml');
103103
}
104104
return $this;
105105
}

‎app/code/Magento/Customer/Block/Widget/Company.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function _construct()
6969
parent::_construct();
7070

7171
// default template location
72-
$this->setTemplate('widget/company.phtml');
72+
$this->setTemplate('Magento_Customer::widget/company.phtml');
7373
}
7474

7575
/**

‎app/code/Magento/Customer/Block/Widget/Dob.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function __construct(
6666
public function _construct()
6767
{
6868
parent::_construct();
69-
$this->setTemplate('widget/dob.phtml');
69+
$this->setTemplate('Magento_Customer::widget/dob.phtml');
7070
}
7171

7272
/**

‎app/code/Magento/Customer/Block/Widget/Fax.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function _construct()
6969
parent::_construct();
7070

7171
// default template location
72-
$this->setTemplate('widget/fax.phtml');
72+
$this->setTemplate('Magento_Customer::widget/fax.phtml');
7373
}
7474

7575
/**

‎app/code/Magento/Customer/Block/Widget/Gender.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function __construct(
5959
public function _construct()
6060
{
6161
parent::_construct();
62-
$this->setTemplate('widget/gender.phtml');
62+
$this->setTemplate('Magento_Customer::widget/gender.phtml');
6363
}
6464

6565
/**

‎app/code/Magento/Customer/Block/Widget/Name.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function _construct()
6262
parent::_construct();
6363

6464
// default template location
65-
$this->setTemplate('widget/name.phtml');
65+
$this->setTemplate('Magento_Customer::widget/name.phtml');
6666
}
6767

6868
/**

‎app/code/Magento/Customer/Block/Widget/Taxvat.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function __construct(
4141
public function _construct()
4242
{
4343
parent::_construct();
44-
$this->setTemplate('widget/taxvat.phtml');
44+
$this->setTemplate('Magento_Customer::widget/taxvat.phtml');
4545
}
4646

4747
/**

‎app/code/Magento/Customer/Block/Widget/Telephone.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function _construct()
6969
parent::_construct();
7070

7171
// default template location
72-
$this->setTemplate('widget/telephone.phtml');
72+
$this->setTemplate('Magento_Customer::widget/telephone.phtml');
7373
}
7474

7575
/**

‎app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function _construct()
8686
)
8787
);
8888

89-
$this->setTemplate('unitofmeasure.phtml');
89+
$this->setTemplate('Magento_Dhl::unitofmeasure.phtml');
9090
}
9191

9292
/**

‎app/code/Magento/Paypal/Block/Iframe.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,13 @@ protected function _construct()
110110
if (in_array($paymentCode, $this->_hssHelper->getHssMethods())) {
111111
$this->_paymentMethodCode = $paymentCode;
112112
$templatePath = str_replace('_', '', $paymentCode);
113-
$templateFile = "{$templatePath}/iframe.phtml";
113+
$templateFile = "Magento_Paypal::{$templatePath}/iframe.phtml";
114114
$directory = $this->readFactory->create($this->reader->getModuleDir('', 'Magento_Paypal'));
115115
$file = $this->resolver->getTemplateFileName($templateFile, ['module' => 'Magento_Paypal']);
116116
if ($file && $directory->isExist($directory->getRelativePath($file))) {
117117
$this->setTemplate($templateFile);
118118
} else {
119-
$this->setTemplate('hss/iframe.phtml');
119+
$this->setTemplate('Magento_Paypal::hss/iframe.phtml');
120120
}
121121
}
122122
}
@@ -198,7 +198,7 @@ protected function _beforeToHtml()
198198
protected function _toHtml()
199199
{
200200
if ($this->_isAfterPaymentSave()) {
201-
$this->setTemplate('hss/js.phtml');
201+
$this->setTemplate('Magento_Paypal::hss/js.phtml');
202202
return parent::_toHtml();
203203
}
204204
if (!$this->_shouldRender) {

‎app/code/Magento/Review/Block/Form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ protected function _construct()
139139
);
140140
}
141141

142-
$this->setTemplate('form.phtml');
142+
$this->setTemplate('Magento_Review::form.phtml');
143143
}
144144

145145
/**

‎app/code/Magento/Review/Block/Rating/Entity/Detailed.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected function _toHtml()
4949
$reviewsCount = $this->_ratingFactory->create()->getTotalReviews($entityId, true);
5050
if ($reviewsCount == 0) {
5151
#return __('Be the first to review this product');
52-
$this->setTemplate('empty.phtml');
52+
$this->setTemplate('Magento_Review::empty.phtml');
5353
return parent::_toHtml();
5454
}
5555

‎app/code/Magento/UrlRewrite/Block/Edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function __construct(
6565
*/
6666
protected function _prepareLayout()
6767
{
68-
$this->setTemplate('edit.phtml');
68+
$this->setTemplate('Magento_UrlRewrite::edit.phtml');
6969

7070
$this->_addBackButton();
7171
$this->_prepareLayoutFeatures();

‎app/code/Magento/User/Block/Role/Tab/Users.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected function _construct()
4545
$roleId = $this->getRequest()->getParam('rid', false);
4646
/** @var \Magento\User\Model\ResourceModel\User\Collection $users */
4747
$users = $this->_userCollectionFactory->create()->load();
48-
$this->setTemplate('role/users.phtml')
48+
$this->setTemplate('Magento_User::role/users.phtml')
4949
->assign('users', $users->getItems())
5050
->assign('roleId', $roleId);
5151
}

‎lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
use Magento\Framework\App\ResourceConnection;
99
use Magento\Framework\DB\Ddl\Table;
10-
use Magento\Framework\DB\Select;
1110
use Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder as AggregationBuilder;
1211
use Magento\Framework\Search\AdapterInterface;
1312
use Magento\Framework\Search\RequestInterface;

0 commit comments

Comments
 (0)