Convert long form tags with echo to use short-echo tags #1563

davidalger · davidalger · commit 48bd39180ea1 · 2017-06-09T16:43:37.000-05:00
Manual short-echo tag updates for echo calls script didn't catch; sniff did though!
diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/grid/tooltip.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/grid/tooltip.phtml
@@ -7,4 +7,5 @@
 /**
  * @var \Magento\Backend\Block\Template $block
  */
-echo $block->escapeHtml($block->getData('tooltip_content'));
+?>
+<?= $block->escapeHtml($block->getData('tooltip_content'));
diff --git a/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml b/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml
@@ -21,8 +21,7 @@ $config = [
 
 ?>
 <div data-mage-init='<?= /* @noEscape */ json_encode($config) ?>'
-     class="paypal checkout paypal-logo braintree-paypal-logo<?php
-     /* @noEscape */ echo $block->getContainerId(); ?>-container">
+    class="paypal checkout paypal-logo braintree-paypal-logo<?= /* @noEscape */ $block->getContainerId() ?>-container">
     <button data-currency="<?= /* @noEscape */ $block->getCurrency() ?>"
        data-locale="<?= /* @noEscape */ $block->getLocale() ?>"
        data-amount="<?= /* @noEscape */ $block->getAmount() ?>"
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/search.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/search.phtml
@@ -5,4 +5,5 @@
  */
 
 /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Search */
-echo $block->getChildHtml();
+?>
+<?= $block->getChildHtml();
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/configured_price.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/configured_price.phtml
@@ -14,7 +14,7 @@ $priceLabel = ($block->getPriceLabel() !== null)
     : '';
 ?>
 <p class="price-as-configured">
-    <?php /* @escapeNotVerified */ echo $block->renderAmount($configuredPrice->getAmount(), [
+    <?= /* @escapeNotVerified */ $block->renderAmount($configuredPrice->getAmount(), [
         'display_label'     => $priceLabel,
         'price_id'          => $block->getPriceId('product-price-'),
         'price_type'        => 'finalPrice',
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/view.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/view.phtml
@@ -9,4 +9,5 @@
  */
 
 /** @var $block \Magento\Customer\Block\Adminhtml\Edit\Tab\View */
-echo $block->getChildHtml();
+?>
+<?= $block->getChildHtml();
diff --git a/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml b/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml
@@ -7,8 +7,7 @@
 /** @var \Magento\Customer\Block\CustomerData $block */
 ?>
 <script type="text/x-magento-init">
-<?php
-    /* @noEscape */ echo $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([
+<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([
         '*' => ['Magento_Customer/js/customer-data' => [
             'sectionLoadUrl' => $block->getCustomerDataUrl('customer/section/load'),
             'cookieLifeTime' => $block->getCookieLifeTime(),
diff --git a/app/code/Magento/Customer/view/frontend/templates/js/section-config.phtml b/app/code/Magento/Customer/view/frontend/templates/js/section-config.phtml
@@ -7,8 +7,7 @@
 /** @var \Magento\Customer\Block\SectionConfig $block */
 ?>
 <script type="text/x-magento-init">
-<?php
-    /* @noEscape */ echo $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([
+<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([
         '*' => ['Magento_Customer/js/section-config' => [
             'sections' => $block->getSections(),
             'clientSideSections' => $block->getClientSideSections(),
diff --git a/app/code/Magento/Dhl/view/adminhtml/templates/unitofmeasure.phtml b/app/code/Magento/Dhl/view/adminhtml/templates/unitofmeasure.phtml
@@ -17,12 +17,12 @@
                 dimensionUnit = "(<?= $block->escapeHtml($block->getCm()) ?>)";
                 dhlUnitOfMeasureNote = "<?= $block->escapeHtml($block->getDivideOrderWeightNoteKg()) ?>";
             }
-            $$('[for="carriers_dhl_height"]')[0].innerHTML = "<?php
-                echo $block->escapeHtml($block->getHeight()); ?> " + dimensionUnit;
-            $$('[for="carriers_dhl_depth"]')[0].innerHTML = "<?php
-                echo $block->escapeHtml($block->getDepth()); ?> " + dimensionUnit;
-            $$('[for="carriers_dhl_width"]')[0].innerHTML = "<?php
-                echo $block->escapeHtml($block->getWidth()); ?> " + dimensionUnit;
+            $$('[for="carriers_dhl_height"]')[0].innerHTML = "<?=
+                $block->escapeHtml($block->getHeight()); ?> " + dimensionUnit;
+            $$('[for="carriers_dhl_depth"]')[0].innerHTML = "<?=
+                $block->escapeHtml($block->getDepth()); ?> " + dimensionUnit;
+            $$('[for="carriers_dhl_width"]')[0].innerHTML = "<?=
+                $block->escapeHtml($block->getWidth()); ?> " + dimensionUnit;
 
             $("carriers_dhl_divide_order_weight").next().down().innerHTML = dhlUnitOfMeasureNote;
         }
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/api_wizard.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/api_wizard.phtml
@@ -28,9 +28,7 @@
 
         <a class="action-default"
            data-paypal-button="true"
-           href="<?php
-               /* @noEscape */ echo $block->escapeUrl($block->getSandboxButtonUrl(). '?' . $block->getQuery());
-           ?>"
+           href="<?= /* @noEscape */ $block->escapeUrl($block->getSandboxButtonUrl(). '?' . $block->getQuery()) ?>"
            target="PPFrame"><?= $block->escapeHtml($block->getSandboxButtonLabel()) ?></a>
     </div>
 </div>
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/base_image.phtml b/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/base_image.phtml
@@ -23,8 +23,7 @@
      data-max-file-size="<?= /* @escapeNotVerified */ $fileMaxSize ?>"
     >
     <div class="image image-placeholder">
-        <input type="file" name="image" data-url="<?php 
-        /* @escapeNotVerified */ echo $uploadUrl;?>" multiple="multiple" />
+        <input type="file" name="image" data-url="<?= /* @escapeNotVerified */ $uploadUrl ?>" multiple="multiple" />
         <img class="spacer" src="<?= /* @escapeNotVerified */ $spacerImage ?>"/>
         <p class="image-placeholder-text"><?= /* @escapeNotVerified */ $imagePlaceholderText ?></p>
     </div>
diff --git a/app/code/Magento/Security/view/adminhtml/templates/session/activity.phtml b/app/code/Magento/Security/view/adminhtml/templates/session/activity.phtml
@@ -54,11 +54,11 @@ $sessionInfoCollection = $block->getSessionInfoCollection();
                 <?php
                 if ($block->areMultipleSessionsActive()): ?>
                     data-mage-init='{"confirmRedirect":{
-                        "message": "<?php
-                            echo $block->escapeJs(__('Are you sure that you want to log out all other sessions?'))
+                        "message": "<?=
+                            $block->escapeJs(__('Are you sure that you want to log out all other sessions?'))
                         ?>",
-                        "url":"<?php
-                            echo $block->escapeJs($block->escapeUrl($block->getUrl('security/session/logoutAll')))
+                        "url":"<?=
+                            $block->escapeJs($block->escapeUrl($block->getUrl('security/session/logoutAll')))
                         ?>"
                     }}'
                 <?php
@@ -69,7 +69,6 @@ $sessionInfoCollection = $block->getSessionInfoCollection();
             </button>
         </div>
 
-        <div><?php
-            echo $block->escapeHtml(__('This computer is using IP address %1.', $block->getRemoteIp())) ?></div>
+        <div><?= $block->escapeHtml(__('This computer is using IP address %1.', $block->getRemoteIp())) ?></div>
     </div>
 </div>
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Source/CustomerTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Source/CustomerTest.php
@@ -286,7 +286,7 @@ public function dataProviderGetAllOptionsNameIntegrity()
                 'value' => ['value' => 5, 'label' => 'comment <!-- comment -->'],
             ],
             [
-                'value' => ['value' => 6, 'label' => 'php tag <?php echo "2"; ?>'],
+                'value' => ['value' => 6, 'label' => 'php tag <?= "2"; ?>'],
             ],
 
         ];
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Source/ProductTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Source/ProductTest.php
@@ -207,7 +207,7 @@ public function dataProviderGetAllOptionsNameIntegrity()
                 'value' => ['value' => 5, 'label' => 'comment <!-- comment -->'],
             ],
             [
-                'value' => ['value' => 6, 'label' => 'php tag <?php echo "2"; ?>'],
+                'value' => ['value' => 6, 'label' => 'php tag <?= "2"; ?>'],
             ],
 
         ];
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/absolute_footer.phtml b/app/code/Magento/Theme/view/frontend/templates/html/absolute_footer.phtml
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /* @escapeNotVerified */ echo $block->getMiscellaneousHtml();
+<?= /* @escapeNotVerified */ $block->getMiscellaneousHtml();
diff --git a/app/code/Magento/Theme/view/frontend/templates/template.phtml b/app/code/Magento/Theme/view/frontend/templates/template.phtml
@@ -4,4 +4,5 @@
  * See COPYING.txt for license details.
  */
 /** @var $block \Magento\Framework\View\Element\Template */
-echo $block->getChildHtml('', false);
+?>
+<?= $block->getChildHtml('', false);
diff --git a/app/code/Magento/Vault/view/frontend/templates/customer_account/credit_card.phtml b/app/code/Magento/Vault/view/frontend/templates/customer_account/credit_card.phtml
@@ -43,8 +43,8 @@ $ccNumberView = $block->escapeHtml($block->getNumberLast4Digits());
                                         "modalClass": "my-credit-cards-popup",
                                         "toggleEvent": "click",
                                         "title": "<?= $block->escapeHtml(__('Delete')) ?>",
-                                        "content": "Are you sure you want to delete this card: <?php
-                                            /* @noEscape */ echo $ccNumberView
+                                        "content": "Are you sure you want to delete this card: <?=
+                                            /* @noEscape */ $ccNumberView
                                         ?>?"
                                     }
                                 }'>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/addto.phtml b/app/code/Magento/Wishlist/view/frontend/templates/addto.phtml
@@ -9,7 +9,7 @@
 <script type="text/x-magento-init">
     {
         "body": {
-            "addToWishlist": <?php /* @noEscape */ echo $this->helper(\Magento\Framework\Json\Helper\Data::class)
+            "addToWishlist": <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)
                 ->jsonEncode($block->getWishlistOptions());
             ?>
         }
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/messages/addProductSuccessMessage.phtml b/app/code/Magento/Wishlist/view/frontend/templates/messages/addProductSuccessMessage.phtml
@@ -7,5 +7,4 @@
 /** @var \Magento\Framework\View\Element\Template $block */
 ?>
 
-<?php
-echo $block->escapeHtml(__('%1 has been added to your Wish List.', $block->getData('product_name'))) ?> <?= $block->escapeHtml(__('Click <a href="%1">here</a> to continue shopping.', $block->getData('referer')), ['a']);
+<?= $block->escapeHtml(__('%1 has been added to your Wish List.', $block->getData('product_name'))) ?> <?= $block->escapeHtml(__('Click <a href="%1">here</a> to continue shopping.', $block->getData('referer')), ['a']);
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/buffy.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/buffy.php
@@ -3,4 +3,5 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-echo 'At the young age of 15, Buffy Summers was chosen to hunt vampires, demons, and the forces of darkness.';
+?>
+<?= 'At the young age of 15, Buffy Summers was chosen to hunt vampires, demons, and the forces of darkness.';
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/interview_with_the_vampire.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/interview_with_the_vampire.php
@@ -3,4 +3,5 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-echo 'A man tells his epic life story: love, betrayal, loneliness, and hunger.';
+?>
+<?= 'A man tells his epic life story: love, betrayal, loneliness, and hunger.';
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/twilight/eclipse.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/twilight/eclipse.php
@@ -3,5 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-echo 'As a string of mysterious killings grips Seattle, Bella, whose high school graduation is fast approaching,
+?>
+<?= 'As a string of mysterious killings grips Seattle, Bella, whose high school graduation is fast approaching,
     is forced to choose between her love for vampire Edward and her friendship with demon Jacob.';
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/twilight/newmoon.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/twilight/newmoon.php
@@ -3,5 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-echo 'Vampire Edward leaves Bella after an attack that nearly claimed her life, and in her depression she falls into
+?>
+<?= 'Vampire Edward leaves Bella after an attack that nearly claimed her life, and in her depression she falls into
     yet another paranormal relationship - this time with demon Jacob Black.';
