Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Declare module namespace before template path in all other modules #16701

Merged
merged 1 commit into from
Jul 12, 2018
Merged

Declare module namespace before template path in all other modules #16701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/AdvancedSearch/Block/SearchData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ abstract class SearchData extends Template implements SearchDataInterface
/**
* @var string
*/
protected $_template = 'search_data.phtml';
protected $_template = 'Magento_AdvancedSearch::search_data.phtml';

/**
* @param Template\Context $context
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ class Attribute extends \Magento\Backend\Block\Template
/**
* @var string
*/
protected $_template = 'catalog/product/attribute/set/main/tree/attribute.phtml';
protected $_template = 'Magento_Catalog::catalog/product/attribute/set/main/tree/attribute.phtml';
}
2 changes: 1 addition & 1 deletion app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Js extends \Magento\Backend\Block\Template
* @var string
*/

protected $_template = 'attribute/edit/js.phtml';
protected $_template = 'Magento_Eav::attribute/edit/js.phtml';

/**
* @var \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ class Banktransfer extends \Magento\OfflinePayments\Block\Form\AbstractInstructi
*
* @var string
*/
protected $_template = 'form/banktransfer.phtml';
protected $_template = 'Magento_OfflinePayments::form/banktransfer.phtml';
}
2 changes: 1 addition & 1 deletion app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ class Cashondelivery extends \Magento\OfflinePayments\Block\Form\AbstractInstruc
*
* @var string
*/
protected $_template = 'form/cashondelivery.phtml';
protected $_template = 'Magento_OfflinePayments::form/cashondelivery.phtml';
}
2 changes: 1 addition & 1 deletion app/code/Magento/Payment/Block/Info/Instructions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Instructions extends \Magento\Payment\Block\Info
/**
* @var string
*/
protected $_template = 'info/instructions.phtml';
protected $_template = 'Magento_Payment::info/instructions.phtml';

/**
* Get instructions text from order payment
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/ProductAlert/Block/Email/Price.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Price extends \Magento\ProductAlert\Block\Email\AbstractEmail
/**
* @var string
*/
protected $_template = 'email/price.phtml';
protected $_template = 'Magento_ProductAlert::email/price.phtml';

/**
* Retrieve unsubscribe url for product
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/ProductAlert/Block/Email/Stock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Stock extends \Magento\ProductAlert\Block\Email\AbstractEmail
/**
* @var string
*/
protected $_template = 'email/stock.phtml';
protected $_template = 'Magento_ProductAlert::email/stock.phtml';

/**
* Retrieve unsubscribe url for product
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Rss/Block/Feeds.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Feeds extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
protected $_template = 'feeds.phtml';
protected $_template = 'Magento_Rss::feeds.phtml';

/**
* @var \Magento\Framework\App\Rss\RssManagerInterface
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class Grid extends \Magento\Backend\Block\Template
/**
* @var string
*/
protected $_template = 'order/packaging/grid.phtml';
protected $_template = 'Magento_Shipping::order/packaging/grid.phtml';

/**
* Core registry
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Shipping/Block/Order/Shipment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Shipment extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
protected $_template = 'order/shipment.phtml';
protected $_template = 'Magento_Shipping::order/shipment.phtml';

/**
* Core registry
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Signifyd/Block/Fingerprint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class Fingerprint extends Template
* @var string
* @since 100.2.0
*/
protected $_template = 'fingerprint.phtml';
protected $_template = 'Magento_Signifyd::fingerprint.phtml';

/**
* @param Context $context
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/UrlRewrite/Block/Catalog/Category/Tree.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
/**
* @var string
*/
protected $_template = 'categories.phtml';
protected $_template = 'Magento_UrlRewrite::categories.phtml';

/**
* Adminhtml data
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/UrlRewrite/Block/Selector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Selector extends \Magento\Backend\Block\Template
/**
* @var string
*/
protected $_template = 'selector.phtml';
protected $_template = 'Magento_UrlRewrite::selector.phtml';

/**
* Set block template and get available modes
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/User/Block/Role/Tab/Edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form implements \Magento\Backen
/**
* @var string
*/
protected $_template = 'role/edit.phtml';
protected $_template = 'Magento_User::role/edit.phtml';

/**
* Root ACL Resource
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Tax extends \Magento\Backend\Block\Widget implements
/**
* @var string
*/
protected $_template = 'renderer/tax.phtml';
protected $_template = 'Magento_Weee::renderer/tax.phtml';

/**
* Core registry
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class Layout extends Template implements RendererInterface
/**
* @var string
*/
protected $_template = 'instance/edit/layout.phtml';
protected $_template = 'Magento_Widget::instance/edit/layout.phtml';

/**
* @var \Magento\Catalog\Model\Product\Type
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Wishlist/Block/Rss/EmailLink.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class EmailLink extends Link
/**
* @var string
*/
protected $_template = 'rss/email.phtml';
protected $_template = 'Magento_Wishlist::rss/email.phtml';

/**
* @return array
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Wishlist/Block/Share/Email/Items.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Items extends \Magento\Wishlist\Block\AbstractBlock
/**
* @var string
*/
protected $_template = 'email/items.phtml';
protected $_template = 'Magento_Wishlist::email/items.phtml';

/**
* Retrieve Product View URL
Expand Down