merge magento/2.2.11-develop into magento-trigger/MC-29044

magento-mts-svc · web-flow · commit 09a789293488 · 2019-12-03T23:20:35.000-08:00
diff --git a/app/code/Magento/Backup/view/adminhtml/templates/backup/list.phtml b/app/code/Magento/Backup/view/adminhtml/templates/backup/list.phtml
@@ -3,8 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?= $block->getChildHtml('grid') ?>
 <?= $block->getGridHtml() ?>
 <?= $block->getDialogsHtml() ?>
-<?php
diff --git a/app/code/Magento/Bundle/view/base/templates/product/price/selection/amount.phtml b/app/code/Magento/Bundle/view/base/templates/product/price/selection/amount.phtml
@@ -3,9 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 
 <?php /** @var \Magento\Framework\Pricing\Render\Amount $block */ ?>
 
 <?= /* @noEscape */ $block->formatCurrency($block->getDisplayValue(), (bool) $block->getIncludeContainer()); ?>
-<?php
diff --git a/app/code/Magento/Captcha/view/frontend/templates/js/components.phtml b/app/code/Magento/Captcha/view/frontend/templates/js/components.phtml
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?= $block->getChildHtml() ?>
-<?php
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/grid.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?php
 /** @var $block \Magento\Ui\Block\Wrapper */
@@ -18,4 +20,3 @@
         ]
     ]
 ); ?>
-<?php
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/list.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?php
 /** @var $block \Magento\Ui\Block\Wrapper */
@@ -18,4 +20,3 @@
         ]
     ]
 ); ?>
-<?php
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/sidebar.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?php
 /** @var $block \Magento\Ui\Block\Wrapper */
@@ -18,4 +20,3 @@
         ]
     ]
 ); ?>
-<?php
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?php
 /** @var $block \Magento\Ui\Block\Wrapper */
@@ -16,4 +18,3 @@
         'imageCode' => 'recently_viewed_products_grid_content_widget'
     ]
 ]); ?>
-<?php
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable PSR2.Files.ClosingTag
+
 /** @var $block \Magento\Ui\Block\Wrapper */
 ?>
 
@@ -15,4 +17,3 @@
         'imageCode' => 'recently_viewed_products_list_content_widget'
     ]
 ]); ?>
-<?php
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/sidebar.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?php
 /** @var $block \Magento\Ui\Block\Wrapper */
@@ -18,4 +20,3 @@
         ]
     ]
 ); ?>
-<?php
diff --git a/app/code/Magento/Cms/view/frontend/templates/content.phtml b/app/code/Magento/Cms/view/frontend/templates/content.phtml
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?= /* @noEscape */ $pageData->getPageContent() ?>
-<?php
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/edit/js.phtml b/app/code/Magento/Customer/view/adminhtml/templates/edit/js.phtml
@@ -3,5 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
-<?php
diff --git a/app/code/Magento/Customer/view/frontend/templates/js/components.phtml b/app/code/Magento/Customer/view/frontend/templates/js/components.phtml
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?= $block->getChildHtml() ?>
-<?php
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminNewsletterPreviewTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminNewsletterPreviewTest.xml
@@ -17,6 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-23058"/>
             <stories value="Newsletter Preview"/>
+            <skip>
+                <issueId value="MC-29326"/>
+            </skip>
         </annotations>
 
         <before>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/list.phtml
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?= $block->getChildHtml('grid') ?>
-<?php
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/template/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/template/list.phtml
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?= $block->getChildHtml('grid') ?>
-<?php
diff --git a/app/code/Magento/Newsletter/view/frontend/templates/js/components.phtml b/app/code/Magento/Newsletter/view/frontend/templates/js/components.phtml
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?= $block->getChildHtml() ?>
-<?php
diff --git a/app/code/Magento/PageCache/view/frontend/templates/js/components.phtml b/app/code/Magento/PageCache/view/frontend/templates/js/components.phtml
@@ -4,7 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable PSR2.Files.ClosingTag
+
 /** @var \Magento\Framework\View\Element\Js\Components $block */
 ?>
 <?= $block->getChildHtml() ?>
-<?php
diff --git a/app/code/Magento/Paypal/view/frontend/templates/js/components.phtml b/app/code/Magento/Paypal/view/frontend/templates/js/components.phtml
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?= $block->getChildHtml() ?>
-<?php
diff --git a/app/code/Magento/Reports/view/frontend/templates/js/components.phtml b/app/code/Magento/Reports/view/frontend/templates/js/components.phtml
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?= $block->getChildHtml() ?>
-<?php
diff --git a/app/code/Magento/Review/view/frontend/templates/redirect.phtml b/app/code/Magento/Review/view/frontend/templates/redirect.phtml
@@ -3,9 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?php
     header("Location:{$block->getProduct()->getProductUrl()}#info-product_reviews");
     exit;
 ?>
-<?php
diff --git a/app/code/Magento/Robots/view/frontend/templates/robots.phtml b/app/code/Magento/Robots/view/frontend/templates/robots.phtml
@@ -3,5 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?><?= /* @noEscape */ $layoutContent; ?>
-<?php
diff --git a/app/code/Magento/Theme/view/frontend/templates/text.phtml b/app/code/Magento/Theme/view/frontend/templates/text.phtml
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable PSR2.Files.ClosingTag
+
 $attributes = $block->getCssClass() ? ' class="' . $block->escapeHtmlAttr($block->getCssClass()) . '"' : '';
 $attr = $block->getAttributes();
 $textHtml = '<'
@@ -20,4 +22,3 @@ if (!empty($attr)) {
     }
 }
 echo /* @noEscape */ $textHtml; ?>
-<?php
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/price.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/price.phtml
@@ -4,10 +4,11 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable PSR2.Files.ClosingTag
+
 /** @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Cart $block */
 ?>
 
 <?php foreach ($block->getChildNames() as $childName) : ?>
     <?= /* @noEscape */ $block->getLayout()->renderElement($childName, false) ?>
 <?php endforeach;?>
-<?php
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/js/components.phtml b/app/code/Magento/Wishlist/view/frontend/templates/js/components.phtml
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:disable PSR2.Files.ClosingTag
 ?>
 <?= $block->getChildHtml() ?>
-<?php
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/messages/removeWishlistItemSuccessMessage.phtml b/app/code/Magento/Wishlist/view/frontend/templates/messages/removeWishlistItemSuccessMessage.phtml
@@ -4,9 +4,9 @@
  * See COPYING.txt for license details.
  */
 
+// phpcs:disable PSR2.Files.ClosingTag
+
 /** @var \Magento\Framework\View\Element\Template $block */
 ?>
 
 <?= $block->escapeHtml(__('%1 has been removed from your Wish List.', $block->getData('product_name'))); ?>
-<?php
-

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`	`* Copyright © Magento, Inc. All rights reserved.`
`4`	`4`	`* See COPYING.txt for license details.`
`5`	`5`	`*/`
	`6`	`+`
	`7`	`+// phpcs:disable PSR2.Files.ClosingTag`
`6`	`8`	`?>`
`7`	`9`	`<?php`
`8`	`10`	`/** @var $block \Magento\Ui\Block\Wrapper */`
`@@ -18,4 +20,3 @@`
`18`	`20`	`]`
`19`	`21`	`]`
`20`	`22`	`); ?>`
`21`		`-<?php`