Skip to content

Commit 105b6c0

Browse files
committed
ENGCOM-1611: Fixed set template syntax in block file #15339 (fix tests)
1 parent 8a3086c commit 105b6c0

File tree

7 files changed

+10
-14
lines changed

7 files changed

+10
-14
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ protected function _construct()
116116
if ($file && $directory->isExist($directory->getRelativePath($file))) {
117117
$this->setTemplate($templateFile);
118118
} else {
119-
$this->setTemplate('Magento_Paypal::hss/iframe.phtml');
119+
$this->setTemplate('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('Magento_Paypal::hss/js.phtml');
201+
$this->setTemplate('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
@@ -138,7 +138,7 @@ protected function _construct()
138138
);
139139
}
140140

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

144144
/**

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('Magento_Review::empty.phtml');
52+
$this->setTemplate('empty.phtml');
5353
return parent::_toHtml();
5454
}
5555

app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function afterGetSectionData(\Magento\Checkout\CustomerData\Cart $subject
6666
foreach ($result['items'] as $key => $itemAsArray) {
6767
if ($item = $this->findItemById($itemAsArray['item_id'], $items)) {
6868
$this->itemPriceRenderer->setItem($item);
69-
$this->itemPriceRenderer->setTemplate('Magento_Tax::checkout/cart/item/price/sidebar.phtml');
69+
$this->itemPriceRenderer->setTemplate('checkout/cart/item/price/sidebar.phtml');
7070
$result['items'][$key]['product_price']=$this->itemPriceRenderer->toHtml();
7171
}
7272
}

app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,12 @@
1111
<?php $_item = $block->getItem() ?>
1212
<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
1313
<span class="price-wrapper price-including-tax" data-label="<?= /* @escapeNotVerified */ __('Incl. Tax') ?>">
14-
<span class="minicart-price">
15-
<?php $_incl = $_item->getPriceInclTax(); ?>
16-
<?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
17-
</span>
14+
<?php $_incl = $_item->getPriceInclTax(); ?>
15+
<?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
1816
</span>
1917
<?php endif; ?>
2018
<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
2119
<span class="price-wrapper price-excluding-tax" data-label="<?= /* @escapeNotVerified */ __('Excl. Tax') ?>">
22-
<span class="minicart-price">
23-
<?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
24-
</span>
20+
<?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
2521
</span>
2622
<?php endif; ?>

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('Magento_UrlRewrite::edit.phtml');
68+
$this->setTemplate('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('Magento_User::role/users.phtml')
48+
$this->setTemplate('role/users.phtml')
4949
->assign('users', $users->getItems())
5050
->assign('roleId', $roleId);
5151
}

0 commit comments

Comments
 (0)