MAGETWO-66675: Fix relative template references in individual Magento modules #1895

vrann · vrann · commit 7b337ae913bd · 2017-03-23T16:28:56.000-05:00
- fix references
- update static test
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml b/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml
@@ -17,7 +17,7 @@
                    name="notification_window"
                    as="notification_window"
                    acl="Magento_AdminNotification::show_toolbar"
-                   template="notification/window.phtml"/>
+                   template="Magento_AdminNotification::notification/window.phtml"/>
         </referenceContainer>
         <referenceContainer name="header">
             <block class="Magento\AdminNotification\Block\ToolbarEntry" name="notification.messages" before="user" template="Magento_AdminNotification::toolbar_entry.phtml"/>
diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_edit.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_edit.xml
@@ -11,7 +11,7 @@
             <container name="adminhtml.catalog.product.set.edit.wrapper" htmlTag="div" htmlClass="admin__scope-old"><!-- @todo ui: remove arguments within .admin__scope-old -->
                 <block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main"
                        name="adminhtml.catalog.product.set.edit"
-                       template="catalog/product/attribute/set/main.phtml"/>
+                       template="Magento_Catalog::catalog/product/attribute/set/main.phtml"/>
             </container>
         </referenceContainer>
     </body>
diff --git a/app/code/Magento/Customer/view/frontend/layout/default.xml b/app/code/Magento/Customer/view/frontend/layout/default.xml
@@ -20,7 +20,7 @@
                 </arguments>
             </block>
             <block class="Magento\Customer\Block\Account\AuthorizationLink" name="authorization-link"
-                   template="account/link/authorization.phtml"/>
+                   template="Magento_Customer::account/link/authorization.phtml"/>
         </referenceBlock>
         <referenceContainer name="content">
             <block class="Magento\Customer\Block\Account\AuthenticationPopup" name="authentication-popup" as="authentication-popup" template="Magento_Customer::account/authentication-popup.phtml">
diff --git a/app/code/Magento/Msrp/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Msrp/view/frontend/layout/checkout_cart_index.xml
@@ -9,7 +9,7 @@
     <update handle="msrp_popup"/>
     <body>
         <referenceContainer name="checkout.cart.totals.container">
-            <block name="checkout.cart.totals.msrp" before="checkout.cart.totals" class="Magento\Msrp\Block\Total" template="cart/totals.phtml">
+            <block name="checkout.cart.totals.msrp" before="checkout.cart.totals" class="Magento\Msrp\Block\Total" template="Magento_Msrp::cart/totals.phtml">
                 <arguments>
                     <argument name="original_block_name" xsi:type="string">checkout.cart.totals</argument>
                 </arguments>
diff --git a/app/code/Magento/Theme/view/adminhtml/layout/theme_design_config_edit.xml b/app/code/Magento/Theme/view/adminhtml/layout/theme_design_config_edit.xml
@@ -12,7 +12,7 @@
         <referenceContainer name="page.main.actions">
             <block class="Magento\Theme\Block\Adminhtml\Design\Config\Edit\Scope"
                    name="design.config.edit.scope"
-                   template="design/config/edit/scope.phtml"/>
+                   template="Magento_Theme::design/config/edit/scope.phtml"/>
         </referenceContainer>
         <referenceContainer name="content">
             <uiComponent name="design_config_form"/>
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure.xml
@@ -10,7 +10,7 @@
     <body>
         <referenceBlock name="product.info.addto">
             <block class="Magento\Wishlist\Block\Item\Configure" name="view.addto.wishlist"
-                template="item/configure/addto/wishlist.phtml" />
+                template="Magento_Wishlist::item/configure/addto/wishlist.phtml" />
         </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml
@@ -21,7 +21,7 @@
                 <block class="Magento\Catalog\Block\Product\View" name="product.info.addto.bundle" as="addto" after="product.info.addtocart.bundle"
                        template="Magento_Catalog::product/view/addto.phtml" cacheable="false">
                     <block class="Magento\Wishlist\Block\Item\Configure" name="view.addto.wishlist.bundle"
-                           template="item/configure/addto/wishlist.phtml" />
+                           template="Magento_Wishlist::item/configure/addto/wishlist.phtml" />
                     <block class="Magento\Catalog\Block\Product\View\AddTo\Compare" name="view.addto.compare.bundle" after="view.addto.wishlist"
                            template="Magento_Catalog::product/view/addto/compare.phtml" />
                 </block>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Layout/MergeTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/MergeTest.php
@@ -230,10 +230,12 @@ public function testLoadFileSystem()
         $expectedResult = '
             <root>
                 <body>
-                    <block class="Magento\Framework\View\Element\Template" template="Magento_Framework::fixture_template_one.phtml"/>
+                    <block class="Magento\Framework\View\Element\Template" 
+                           template="Magento_Framework::fixture_template_one.phtml"/>
                 </body>
                 <body>
-                    <block class="Magento\Framework\View\Element\Template" template="Magento_Framework::fixture_template_two.phtml"/>
+                    <block class="Magento\Framework\View\Element\Template" 
+                           template="Magento_Framework::fixture_template_two.phtml"/>
                 </body>
             </root>
         ';
@@ -249,7 +251,8 @@ public function testLoadFileSystemWithPageLayout()
             <root>
                 <body>
                     <referenceContainer name="main.container">
-                        <block class="Magento\Framework\View\Element\Template" template="Magento_Framework::fixture_template_one.phtml"/>
+                        <block class="Magento\Framework\View\Element\Template" 
+                               template="Magento_Framework::fixture_template_one.phtml"/>
                     </referenceContainer>
                 </body>
             </root>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/MergeTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/MergeTest.php
@@ -10,7 +10,8 @@ class MergeTest extends \PHPUnit_Framework_TestCase
     /**
      * Fixture XML instruction(s) to be used in tests
      */
-    const FIXTURE_LAYOUT_XML = '<block class="Magento\Framework\View\Element\Template" template="Magento_Framework::fixture.phtml"/>';
+    const FIXTURE_LAYOUT_XML
+        = '<block class="Magento\Framework\View\Element\Template" template="Magento_Framework::fixture.phtml"/>';
 
     /**
      * @var \Magento\Framework\View\Model\Layout\Merge
@@ -32,7 +33,8 @@ protected function setUp()
         $layoutUpdate1->setHandle('fixture_handle_one');
         $layoutUpdate1->setXml(
             '<body>
-                <block class="Magento\Framework\View\Element\Template" template="Magento_Framework::fixture_template_one.phtml"/>
+                <block class="Magento\Framework\View\Element\Template" 
+                       template="Magento_Framework::fixture_template_one.phtml"/>
             </body>'
         );
         $layoutUpdate1->setHasDataChanges(true);
@@ -49,7 +51,8 @@ protected function setUp()
         $layoutUpdate2->setHandle('fixture_handle_two');
         $layoutUpdate2->setXml(
             '<body>
-                <block class="Magento\Framework\View\Element\Template" template="Magento_Framework::fixture_template_two.phtml"/>
+                <block class="Magento\Framework\View\Element\Template"
+                       template="Magento_Framework::fixture_template_two.phtml"/>
             </body>'
         );
         $layoutUpdate2->setHasDataChanges(true);
@@ -74,10 +77,12 @@ public function testLoadDbApp()
         $expectedResult = '
             <root>
                 <body>
-                    <block class="Magento\Framework\View\Element\Template" template="Magento_Framework::fixture_template_one.phtml"/>
+                    <block class="Magento\Framework\View\Element\Template"
+                           template="Magento_Framework::fixture_template_one.phtml"/>
                 </body>
                 <body>
-                    <block class="Magento\Framework\View\Element\Template" template="Magento_Framework::fixture_template_two.phtml"/>
+                    <block class="Magento\Framework\View\Element\Template" 
+                           template="Magento_Framework::fixture_template_two.phtml"/>
                 </body>
             </root>
         ';
