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 Magento_Theme, Magento_Newsletter and Magento_Tax #16699

Merged
merged 3 commits into from
Jul 12, 2018
Merged

Declare module namespace before template path in Magento_Theme, Magento_Newsletter and Magento_Tax #16699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e31a8c3
Declare module namespace
mageprince Jul 10, 2018
f30b65e
Declare module namespace
mageprince Jul 10, 2018
6cb335d
Merge pull request https://github.com/magento/magento2/pull/16700 to …
magento-engcom-team Jul 11, 2018
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/Newsletter/Block/Adminhtml/Problem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Problem extends \Magento\Backend\Block\Template
/**
* @var string
*/
protected $_template = 'problem/list.phtml';
protected $_template = 'Magento_Newsletter::problem/list.phtml';

/**
* @var \Magento\Newsletter\Model\ResourceModel\Problem\Collection
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Newsletter/Block/Adminhtml/Queue/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\Template
/**
* @var string
*/
protected $_template = 'queue/edit.phtml';
protected $_template = 'Magento_Newsletter::queue/edit.phtml';

/**
* Core registry
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Subscriber extends \Magento\Backend\Block\Template
/**
* @var string
*/
protected $_template = 'subscriber/list.phtml';
protected $_template = 'Magento_Newsletter::subscriber/list.phtml';

/**
* @var \Magento\Newsletter\Model\ResourceModel\Queue\CollectionFactory
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Newsletter/Block/Adminhtml/Template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Template extends \Magento\Backend\Block\Template
/**
* @var string
*/
protected $_template = 'template/list.phtml';
protected $_template = 'Magento_Newsletter::template/list.phtml';

/**
* @return $this
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Reports/Block/Adminhtml/Product/Viewed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class Viewed extends \Magento\Backend\Block\Widget\Grid\Container
/**
* @var string
*/
protected $_template = 'report/grid/container.phtml';
protected $_template = 'Magento_Reports::report/grid/container.phtml';

/**
* @return void
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Bestsellers extends \Magento\Backend\Block\Widget\Grid\Container
*
* @var string
*/
protected $_template = 'report/grid/container.phtml';
protected $_template = 'Magento_Reports::report/grid/container.phtml';

/**
* {@inheritdoc}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Coupons extends \Magento\Backend\Block\Widget\Grid\Container
*
* @var string
*/
protected $_template = 'report/grid/container.phtml';
protected $_template = 'Magento_Reports::report/grid/container.phtml';

/**
* {@inheritdoc}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Invoiced extends \Magento\Backend\Block\Widget\Grid\Container
*
* @var string
*/
protected $_template = 'report/grid/container.phtml';
protected $_template = 'Magento_Reports::report/grid/container.phtml';

/**
* {@inheritdoc}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Refunded extends \Magento\Backend\Block\Widget\Grid\Container
*
* @var string
*/
protected $_template = 'report/grid/container.phtml';
protected $_template = 'Magento_Reports::report/grid/container.phtml';

/**
* {@inheritdoc}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Sales extends \Magento\Backend\Block\Widget\Grid\Container
*
* @var string
*/
protected $_template = 'report/grid/container.phtml';
protected $_template = 'Magento_Reports::report/grid/container.phtml';

/**
* {@inheritdoc}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Shipping extends \Magento\Backend\Block\Widget\Grid\Container
*
* @var string
*/
protected $_template = 'report/grid/container.phtml';
protected $_template = 'Magento_Reports::report/grid/container.phtml';

/**
* {@inheritdoc}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Tax extends \Magento\Backend\Block\Widget\Grid\Container
*
* @var string
*/
protected $_template = 'report/grid/container.phtml';
protected $_template = 'Magento_Reports::report/grid/container.phtml';

/**
* {@inheritdoc}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Wishlist extends \Magento\Backend\Block\Template
*
* @var string
*/
protected $_template = 'report/wishlist.phtml';
protected $_template = 'Magento_Reports::report/wishlist.phtml';

/**
* Reports wishlist collection factory
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/**
* @var string
*/
protected $_template = 'rating/form.phtml';
protected $_template = 'Magento_Review::rating/form.phtml';

/**
* Session
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Link extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
protected $_template = 'rss/grid/link.phtml';
protected $_template = 'Magento_Review::rss/grid/link.phtml';

/**
* @var \Magento\Framework\App\Rss\UrlBuilderInterface
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Review/Block/Customer/Recent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Recent extends \Magento\Framework\View\Element\Template
*
* @var string
*/
protected $_template = 'customer/list.phtml';
protected $_template = 'Magento_Review::customer/list.phtml';

/**
* Product reviews collection
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Review/Block/Customer/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
*
* @var string
*/
protected $_template = 'customer/view.phtml';
protected $_template = 'Magento_Review::customer/view.phtml';

/**
* Catalog product model
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Review/Block/Rating/Entity/Detailed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Detailed extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
protected $_template = 'detailed.phtml';
protected $_template = 'Magento_Review::detailed.phtml';

/**
* @var \Magento\Review\Model\RatingFactory
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Review/Block/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class View extends \Magento\Catalog\Block\Product\AbstractProduct
*
* @var string
*/
protected $_template = 'view.phtml';
protected $_template = 'Magento_Review::view.phtml';

/**
* Rating option model
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/**
* @var string
*/
protected $_template = 'rate/form.phtml';
protected $_template = 'Magento_Tax::rate/form.phtml';

/**
* Tax data
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Title extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
protected $_template = 'rate/title.phtml';
protected $_template = 'Magento_Tax::rate/title.phtml';

/**
* @var \Magento\Store\Model\StoreFactory
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Add extends \Magento\Backend\Block\Template implements \Magento\Backend\Bl
/**
* @var string
*/
protected $_template = 'toolbar/rate/add.phtml';
protected $_template = 'Magento_Tax::toolbar/rate/add.phtml';

/**
* @var \Magento\Backend\Block\Widget\Button\ButtonList
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Save extends \Magento\Backend\Block\Template implements \Magento\Backend\B
/**
* @var string
*/
protected $_template = 'toolbar/rate/save.phtml';
protected $_template = 'Magento_Tax::toolbar/rate/save.phtml';

/**
* @var \Magento\Backend\Block\Widget\Button\ButtonList
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Tax/Block/Checkout/Grandtotal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Grandtotal extends \Magento\Checkout\Block\Total\DefaultTotal
*
* @var string
*/
protected $_template = 'checkout/grandtotal.phtml';
protected $_template = 'Magento_Tax::checkout/grandtotal.phtml';

/**
* @var \Magento\Tax\Model\Config
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Tax/Block/Checkout/Shipping.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Shipping extends \Magento\Checkout\Block\Total\DefaultTotal
*
* @var string
*/
protected $_template = 'checkout/shipping.phtml';
protected $_template = 'Magento_Tax::checkout/shipping.phtml';

/**
* @var \Magento\Tax\Model\Config
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Tax/Block/Checkout/Subtotal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Subtotal extends \Magento\Checkout\Block\Total\DefaultTotal
*
* @var string
*/
protected $_template = 'checkout/subtotal.phtml';
protected $_template = 'Magento_Tax::checkout/subtotal.phtml';

/**
* @var \Magento\Tax\Model\Config
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Tax/Block/Checkout/Tax.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ class Tax extends \Magento\Checkout\Block\Total\DefaultTotal
/**
* @var string
*/
protected $_template = 'checkout/tax.phtml';
protected $_template = 'Magento_Tax::checkout/tax.phtml';
}
2 changes: 1 addition & 1 deletion app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class ImportExport extends \Magento\Backend\Block\Widget
/**
* @var string
*/
protected $_template = 'importExport.phtml';
protected $_template = 'Magento_TaxImportExport::importExport.phtml';

/**
* @param \Magento\Backend\Block\Template\Context $context
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportHeader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ class ImportExportHeader extends \Magento\Backend\Block\Widget
*
* @var string
*/
protected $_template = 'importExportHeader.phtml';
protected $_template = 'Magento_TaxImportExport::importExportHeader.phtml';
}
2 changes: 1 addition & 1 deletion app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Uploader extends \Magento\Backend\Block\Media\Uploader
*
* @var string
*/
protected $_template = 'browser/content/uploader.phtml';
protected $_template = 'Magento_Theme::browser/content/uploader.phtml';

/**
* @var \Magento\Theme\Helper\Storage
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Theme/Block/Html/Breadcrumbs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Breadcrumbs extends \Magento\Framework\View\Element\Template
*
* @var string
*/
protected $_template = 'html/breadcrumbs.phtml';
protected $_template = 'Magento_Theme::html/breadcrumbs.phtml';

/**
* List of available breadcrumb properties
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Theme/Block/Html/Header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Header extends \Magento\Framework\View\Element\Template
*
* @var string
*/
protected $_template = 'html/header.phtml';
protected $_template = 'Magento_Theme::html/header.phtml';

/**
* Retrieve welcome text
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Theme/Block/Html/Header/Logo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Logo extends \Magento\Framework\View\Element\Template
*
* @var string
*/
protected $_template = 'html/header/logo.phtml';
protected $_template = 'Magento_Theme::html/header/logo.phtml';

/**
* @var \Magento\MediaStorage\Helper\File\Storage\Database
Expand Down