ENGCOM-2685: Declare module namespace before template path name #17394

Stanislav Idolov · web-flow · commit 728f29dae2a8 · 2018-08-10T11:25:09.000+03:00
diff --git a/app/code/Magento/Backend/Block/System/Store/Delete/Group.php b/app/code/Magento/Backend/Block/System/Store/Delete/Group.php
@@ -19,7 +19,7 @@ protected function _prepareLayout()
     {
         $itemId = $this->getRequest()->getParam('group_id');
 
-        $this->setTemplate('system/store/delete_group.phtml');
+        $this->setTemplate('Magento_Backend::system/store/delete_group.phtml');
         $this->setAction($this->getUrl('adminhtml/*/deleteGroupPost', ['group_id' => $itemId]));
         $this->addChild(
             'confirm_deletion_button',
diff --git a/app/code/Magento/Backend/Block/System/Store/Delete/Website.php b/app/code/Magento/Backend/Block/System/Store/Delete/Website.php
@@ -19,7 +19,7 @@ protected function _prepareLayout()
     {
         $itemId = $this->getRequest()->getParam('website_id');
 
-        $this->setTemplate('system/store/delete_website.phtml');
+        $this->setTemplate('Magento_Backend::system/store/delete_website.phtml');
         $this->setAction($this->getUrl('adminhtml/*/deleteWebsitePost', ['website_id' => $itemId]));
         $this->addChild(
             'confirm_deletion_button',
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
@@ -30,7 +30,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\Tree
      */
     protected function _prepareLayout()
     {
-        $this->setTemplate('catalog/category/checkboxes/tree.phtml');
+        $this->setTemplate('Magento_Catalog::catalog/category/checkboxes/tree.phtml');
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Ajax/Serializer.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Ajax/Serializer.php
@@ -41,7 +41,7 @@ public function __construct(
     public function _construct()
     {
         parent::_construct();
-        $this->setTemplate('catalog/product/edit/serializer.phtml');
+        $this->setTemplate('Magento_Catalog::catalog/product/edit/serializer.phtml');
         return $this;
     }
 
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php
@@ -82,7 +82,7 @@ protected function _construct()
         parent::_construct();
         $this->setUseAjax(true);
         $this->_parentTemplate = $this->getTemplate();
-        $this->setTemplate('tab/cart.phtml');
+        $this->setTemplate('Magento_Customer::tab/cart.phtml');
     }
 
     /**
diff --git a/app/code/Magento/Customer/Block/Adminhtml/System/Config/Validatevat.php b/app/code/Magento/Customer/Block/Adminhtml/System/Config/Validatevat.php
@@ -99,7 +99,7 @@ protected function _prepareLayout()
     {
         parent::_prepareLayout();
         if (!$this->getTemplate()) {
-            $this->setTemplate('system/config/validatevat.phtml');
+            $this->setTemplate('Magento_Customer::system/config/validatevat.phtml');
         }
         return $this;
     }
diff --git a/app/code/Magento/Customer/Block/Widget/Company.php b/app/code/Magento/Customer/Block/Widget/Company.php
@@ -69,7 +69,7 @@ public function _construct()
         parent::_construct();
 
         // default template location
-        $this->setTemplate('widget/company.phtml');
+        $this->setTemplate('Magento_Customer::widget/company.phtml');
     }
 
     /**
diff --git a/app/code/Magento/Customer/Block/Widget/Dob.php b/app/code/Magento/Customer/Block/Widget/Dob.php
@@ -66,7 +66,7 @@ public function __construct(
     public function _construct()
     {
         parent::_construct();
-        $this->setTemplate('widget/dob.phtml');
+        $this->setTemplate('Magento_Customer::widget/dob.phtml');
     }
 
     /**
diff --git a/app/code/Magento/Customer/Block/Widget/Fax.php b/app/code/Magento/Customer/Block/Widget/Fax.php
@@ -69,7 +69,7 @@ public function _construct()
         parent::_construct();
 
         // default template location
-        $this->setTemplate('widget/fax.phtml');
+        $this->setTemplate('Magento_Customer::widget/fax.phtml');
     }
 
     /**
diff --git a/app/code/Magento/Customer/Block/Widget/Gender.php b/app/code/Magento/Customer/Block/Widget/Gender.php
@@ -59,7 +59,7 @@ public function __construct(
     public function _construct()
     {
         parent::_construct();
-        $this->setTemplate('widget/gender.phtml');
+        $this->setTemplate('Magento_Customer::widget/gender.phtml');
     }
 
     /**
diff --git a/app/code/Magento/Customer/Block/Widget/Name.php b/app/code/Magento/Customer/Block/Widget/Name.php
@@ -62,7 +62,7 @@ public function _construct()
         parent::_construct();
 
         // default template location
-        $this->setTemplate('widget/name.phtml');
+        $this->setTemplate('Magento_Customer::widget/name.phtml');
     }
 
     /**
diff --git a/app/code/Magento/Customer/Block/Widget/Taxvat.php b/app/code/Magento/Customer/Block/Widget/Taxvat.php
@@ -41,7 +41,7 @@ public function __construct(
     public function _construct()
     {
         parent::_construct();
-        $this->setTemplate('widget/taxvat.phtml');
+        $this->setTemplate('Magento_Customer::widget/taxvat.phtml');
     }
 
     /**
diff --git a/app/code/Magento/Customer/Block/Widget/Telephone.php b/app/code/Magento/Customer/Block/Widget/Telephone.php
@@ -69,7 +69,7 @@ public function _construct()
         parent::_construct();
 
         // default template location
-        $this->setTemplate('widget/telephone.phtml');
+        $this->setTemplate('Magento_Customer::widget/telephone.phtml');
     }
 
     /**
diff --git a/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php b/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php
@@ -86,7 +86,7 @@ public function _construct()
             )
         );
 
-        $this->setTemplate('unitofmeasure.phtml');
+        $this->setTemplate('Magento_Dhl::unitofmeasure.phtml');
     }
 
     /**
diff --git a/app/code/Magento/Paypal/Block/Iframe.php b/app/code/Magento/Paypal/Block/Iframe.php
@@ -110,13 +110,13 @@ protected function _construct()
         if (in_array($paymentCode, $this->_hssHelper->getHssMethods())) {
             $this->_paymentMethodCode = $paymentCode;
             $templatePath = str_replace('_', '', $paymentCode);
-            $templateFile = "{$templatePath}/iframe.phtml";
+            $templateFile = "Magento_Paypal::{$templatePath}/iframe.phtml";
             $directory = $this->readFactory->create($this->reader->getModuleDir('', 'Magento_Paypal'));
             $file = $this->resolver->getTemplateFileName($templateFile, ['module' => 'Magento_Paypal']);
             if ($file && $directory->isExist($directory->getRelativePath($file))) {
                 $this->setTemplate($templateFile);
             } else {
-                $this->setTemplate('hss/iframe.phtml');
+                $this->setTemplate('Magento_Paypal::hss/iframe.phtml');
             }
         }
     }
@@ -198,7 +198,7 @@ protected function _beforeToHtml()
     protected function _toHtml()
     {
         if ($this->_isAfterPaymentSave()) {
-            $this->setTemplate('hss/js.phtml');
+            $this->setTemplate('Magento_Paypal::hss/js.phtml');
             return parent::_toHtml();
         }
         if (!$this->_shouldRender) {
diff --git a/app/code/Magento/Review/Block/Form.php b/app/code/Magento/Review/Block/Form.php
@@ -139,7 +139,7 @@ protected function _construct()
             );
         }
 
-        $this->setTemplate('form.phtml');
+        $this->setTemplate('Magento_Review::form.phtml');
     }
 
     /**
diff --git a/app/code/Magento/Review/Block/Rating/Entity/Detailed.php b/app/code/Magento/Review/Block/Rating/Entity/Detailed.php
@@ -49,7 +49,7 @@ protected function _toHtml()
         $reviewsCount = $this->_ratingFactory->create()->getTotalReviews($entityId, true);
         if ($reviewsCount == 0) {
             #return __('Be the first to review this product');
-            $this->setTemplate('empty.phtml');
+            $this->setTemplate('Magento_Review::empty.phtml');
             return parent::_toHtml();
         }
 
diff --git a/app/code/Magento/UrlRewrite/Block/Edit.php b/app/code/Magento/UrlRewrite/Block/Edit.php
@@ -65,7 +65,7 @@ public function __construct(
      */
     protected function _prepareLayout()
     {
-        $this->setTemplate('edit.phtml');
+        $this->setTemplate('Magento_UrlRewrite::edit.phtml');
 
         $this->_addBackButton();
         $this->_prepareLayoutFeatures();
diff --git a/app/code/Magento/User/Block/Role/Tab/Users.php b/app/code/Magento/User/Block/Role/Tab/Users.php
@@ -45,7 +45,7 @@ protected function _construct()
         $roleId = $this->getRequest()->getParam('rid', false);
         /** @var \Magento\User\Model\ResourceModel\User\Collection $users */
         $users = $this->_userCollectionFactory->create()->load();
-        $this->setTemplate('role/users.phtml')
+        $this->setTemplate('Magento_User::role/users.phtml')
              ->assign('users', $users->getItems())
              ->assign('roleId', $roleId);
     }
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder as AggregationBuilder;
 use Magento\Framework\Search\AdapterInterface;
 use Magento\Framework\Search\RequestInterface;

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ protected function _prepareLayout()`
`19`	`19`	`{`
`20`	`20`	`$itemId = $this->getRequest()->getParam('group_id');`
`21`	`21`
`22`		`- $this->setTemplate('system/store/delete_group.phtml');`
	`22`	`+ $this->setTemplate('Magento_Backend::system/store/delete_group.phtml');`
`23`	`23`	`$this->setAction($this->getUrl('adminhtml/*/deleteGroupPost', ['group_id' => $itemId]));`
`24`	`24`	`$this->addChild(`
`25`	`25`	`'confirm_deletion_button',`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\Tree`
`30`	`30`	`*/`
`31`	`31`	`protected function _prepareLayout()`
`32`	`32`	`{`
`33`		`- $this->setTemplate('catalog/category/checkboxes/tree.phtml');`
	`33`	`+ $this->setTemplate('Magento_Catalog::catalog/category/checkboxes/tree.phtml');`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function __construct(`
`41`	`41`	`public function _construct()`
`42`	`42`	`{`
`43`	`43`	`parent::_construct();`
`44`		`- $this->setTemplate('catalog/product/edit/serializer.phtml');`
	`44`	`+ $this->setTemplate('Magento_Catalog::catalog/product/edit/serializer.phtml');`
`45`	`45`	`return $this;`
`46`	`46`	`}`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ protected function _construct()`
`82`	`82`	`parent::_construct();`
`83`	`83`	`$this->setUseAjax(true);`
`84`	`84`	`$this->_parentTemplate = $this->getTemplate();`
`85`		`- $this->setTemplate('tab/cart.phtml');`
	`85`	`+ $this->setTemplate('Magento_Customer::tab/cart.phtml');`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ protected function _prepareLayout()`
`99`	`99`	`{`
`100`	`100`	`parent::_prepareLayout();`
`101`	`101`	`if (!$this->getTemplate()) {`
`102`		`- $this->setTemplate('system/config/validatevat.phtml');`
	`102`	`+ $this->setTemplate('Magento_Customer::system/config/validatevat.phtml');`
`103`	`103`	`}`
`104`	`104`	`return $this;`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function _construct()`
`69`	`69`	`parent::_construct();`
`70`	`70`
`71`	`71`	`// default template location`
`72`		`- $this->setTemplate('widget/company.phtml');`
	`72`	`+ $this->setTemplate('Magento_Customer::widget/company.phtml');`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function __construct(`
`66`	`66`	`public function _construct()`
`67`	`67`	`{`
`68`	`68`	`parent::_construct();`
`69`		`- $this->setTemplate('widget/dob.phtml');`
	`69`	`+ $this->setTemplate('Magento_Customer::widget/dob.phtml');`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function __construct(`
`59`	`59`	`public function _construct()`
`60`	`60`	`{`
`61`	`61`	`parent::_construct();`
`62`		`- $this->setTemplate('widget/gender.phtml');`
	`62`	`+ $this->setTemplate('Magento_Customer::widget/gender.phtml');`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/**`