From 8078623d0874b229c6a6d015cb4ecb644fc41dfd Mon Sep 17 00:00:00 2001
From: Lorenzo Stramaccia <lorenzost@gmail.com>
Date: Wed, 1 Mar 2017 22:19:21 +0100
Subject: [PATCH 1/2] simplify product lists

---
 .../frontend/templates/product/list.phtml     |   5 +-
 .../templates/product/list/items.phtml        |   7 +-
 .../frontend/templates/product/listing.phtml  | 103 ++++++-----
 .../widget/new/column/new_default_list.phtml  |  91 +++++-----
 .../product/widget/new/content/new_grid.phtml |   5 +-
 .../product/widget/new/content/new_list.phtml | 159 ++++++++--------
 .../product/widget/content/grid.phtml         | 126 +++++++------
 .../column/compared_default_list.phtml        |  97 +++++-----
 .../compared/content/compared_grid.phtml      | 155 ++++++++--------
 .../compared/content/compared_list.phtml      | 171 +++++++++---------
 .../viewed/column/viewed_default_list.phtml   |  95 +++++-----
 .../viewed/column/viewed_images_list.phtml    |   7 +-
 .../widget/viewed/content/viewed_grid.phtml   | 151 ++++++++--------
 .../widget/viewed/content/viewed_list.phtml   | 167 +++++++++--------
 .../view/frontend/templates/item/list.phtml   |  15 +-
 15 files changed, 669 insertions(+), 685 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
index bcbd2882e02c2..0109cdd348dea 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -42,11 +42,10 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
     $pos = $block->getPositioned();
     ?>
     <div class="products wrapper <?php /* @escapeNotVerified */ echo $viewMode; ?> products-<?php /* @escapeNotVerified */ echo $viewMode; ?>">
-        <?php $iterator = 1; ?>
         <ol class="products list items product-items">
             <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
             <?php foreach ($_productCollection as $_product): ?>
-                <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="item product product-item">' : '</li><li class="item product product-item">' ?>
+            <li class="item product product-item">
                 <div class="product-item-info" data-container="product-grid">
                     <?php
                     $productImage = $block->getImage($_product, $image);
@@ -112,7 +111,7 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                         </div>
                     </div>
                 </div>
-                <?php echo($iterator == count($_productCollection)+1) ? '</li>' : '' ?>
+            </li>
             <?php endforeach; ?>
         </ol>
     </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
index 84be9271980b4..3d1cb88cac4d8 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
@@ -174,7 +174,6 @@ switch ($type = $block->getType()) {
         <?php endif; ?>
         <div class="products wrapper grid products-grid products-<?php /* @escapeNotVerified */ echo $type; ?>">
             <ol class="products list items product-items">
-                <?php $iterator = 1; ?>
                 <?php foreach ($items as $_item): ?>
                 <?php $available = ''; ?>
                 <?php if (!$_item->isComposite() && $_item->isSaleable() && $type == 'related'): ?>
@@ -183,9 +182,9 @@ switch ($type = $block->getType()) {
                     <?php endif; ?>
                 <?php endif; ?>
                 <?php if ($type == 'related' || $type == 'upsell'): ?>
-                    <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="item product product-item" style="display: none;">' : '</li><li class="item product product-item" style="display: none;">' ?>
+                    <li class="item product product-item" style="display: none;">
                 <?php else: ?>
-                    <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="item product product-item">' : '</li><li class="item product product-item">' ?>
+                    <li class="item product product-item">
                 <?php endif; ?>
                 <div class="product-item-info <?php /* @escapeNotVerified */ echo $available; ?>">
                     <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
@@ -252,7 +251,7 @@ switch ($type = $block->getType()) {
                             <?php endif; ?>
                         </div>
                     </div>
-                    <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                </li>
                 <?php endforeach ?>
             </ol>
         </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
index 2f5bb0211a1ee..27907bf5ebe95 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
@@ -38,61 +38,60 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
     }
 ?>
 <div class="products wrapper <?php /* @escapeNotVerified */ echo $viewMode; ?>">
-    <?php $iterator = 1; ?>
     <ol class="products list items">
         <?php foreach ($_productCollection as $_product): ?>
-        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="item product">' : '</li><li class="item product">' ?>
-            <div class="product">
-                <?php // Product Image ?>
-                <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>" class="product photo">
-                    <?php echo $block->getImage($_product, $image)->toHtml(); ?>
-                </a>
-                <div class="product details">
-                <?php
-
-                    $info = [];
-                    $info['name'] = '<strong class="product name">'
-                                    . ' <a href="' . $_product->getProductUrl() . '" title="'
-                                    . $block->stripTags($_product->getName(), null, true) . '">'
-                                    . $_helper->productAttribute($_product, $_product->getName(), 'name')
-                                    . '</a></strong>';
-                    $info['price'] = $block->getProductPrice($_product);
-                    $info['review'] = $block->getReviewsSummaryHtml($_product, $templateType);
-
-                    if ($_product->isSaleable()) {
-                        $info['button'] = '<button type="button" title="' . __('Add to Cart') . '" class="action tocart"'
-                                        . ' data-mage-init=\'{ "redirectUrl": { "event": "click", url: "' . $block->getAddToCartUrl($_product) . '"} }\'>'
-                                        . '<span>' . __('Add to Cart') . '</span></button>';
-                    } else {
-                        $info['button'] = $_product->getIsSalable() ?   '<div class="stock available"><span>' . __('In stock') . '</span></div>' :
-                                                                        '<div class="stock unavailable"><span>' . __('Out of stock') . '</span></div>';
-                    }
-
-                    $info['links'] = '<div class="product links" data-role="add-to-links">'
-                                    . '<a href="#" data-post=\'' . $this->helper('Magento\Wishlist\Helper\Data')->getAddParams($_product) . '\' class="action towishlist" data-action="add-to-wishlist">'
-                                    . '<span>' . __('Add to Wish List') . '</span></a>'
-                                    . '<a href="' . $block->getAddToCompareUrl($_product) . '" class="action tocompare">'
-                                    . '<span>' . __('Add to Compare') . '</span></a></div>';
-                    $info['actions'] = '<div class="product action">' . $info['button'] . $info['links'] . '</div>';
-
-                    if ($showDescription) {
-                        $info['description'] =  '<div class="product description">'
-                                                . $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description')
-                                                . ' <a href="' . $_product->getProductUrl() . '" class="action more">'
-                                                . __('Learn More') . '</a></div>';
-                    } else {
-                        $info['description'] = '';
-                    }
-
-                    $details = $block->getInfoOrder() ?: ['name','price','review','description','actions'];
-                    foreach ($details as $detail) {
-                        /* @escapeNotVerified */ echo $info[$detail];
-                    }
-                    ?>
-
+            <li class="item product">
+                <div class="product">
+                    <?php // Product Image ?>
+                    <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>" class="product photo">
+                        <?php echo $block->getImage($_product, $image)->toHtml(); ?>
+                    </a>
+                    <div class="product details">
+                    <?php
+    
+                        $info = [];
+                        $info['name'] = '<strong class="product name">'
+                                        . ' <a href="' . $_product->getProductUrl() . '" title="'
+                                        . $block->stripTags($_product->getName(), null, true) . '">'
+                                        . $_helper->productAttribute($_product, $_product->getName(), 'name')
+                                        . '</a></strong>';
+                        $info['price'] = $block->getProductPrice($_product);
+                        $info['review'] = $block->getReviewsSummaryHtml($_product, $templateType);
+    
+                        if ($_product->isSaleable()) {
+                            $info['button'] = '<button type="button" title="' . __('Add to Cart') . '" class="action tocart"'
+                                            . ' data-mage-init=\'{ "redirectUrl": { "event": "click", url: "' . $block->getAddToCartUrl($_product) . '"} }\'>'
+                                            . '<span>' . __('Add to Cart') . '</span></button>';
+                        } else {
+                            $info['button'] = $_product->getIsSalable() ?   '<div class="stock available"><span>' . __('In stock') . '</span></div>' :
+                                                                            '<div class="stock unavailable"><span>' . __('Out of stock') . '</span></div>';
+                        }
+    
+                        $info['links'] = '<div class="product links" data-role="add-to-links">'
+                                        . '<a href="#" data-post=\'' . $this->helper('Magento\Wishlist\Helper\Data')->getAddParams($_product) . '\' class="action towishlist" data-action="add-to-wishlist">'
+                                        . '<span>' . __('Add to Wish List') . '</span></a>'
+                                        . '<a href="' . $block->getAddToCompareUrl($_product) . '" class="action tocompare">'
+                                        . '<span>' . __('Add to Compare') . '</span></a></div>';
+                        $info['actions'] = '<div class="product action">' . $info['button'] . $info['links'] . '</div>';
+    
+                        if ($showDescription) {
+                            $info['description'] =  '<div class="product description">'
+                                                    . $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description')
+                                                    . ' <a href="' . $_product->getProductUrl() . '" class="action more">'
+                                                    . __('Learn More') . '</a></div>';
+                        } else {
+                            $info['description'] = '';
+                        }
+    
+                        $details = $block->getInfoOrder() ?: ['name','price','review','description','actions'];
+                        foreach ($details as $detail) {
+                            /* @escapeNotVerified */ echo $info[$detail];
+                        }
+                        ?>
+    
+                    </div>
                 </div>
-            </div>
-        <?php echo($iterator == count($_productCollection)+1) ? '</li>' : '' ?>
+            </li>
         <?php endforeach; ?>
     </ol>
 </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
index e2f3c1888c30e..b5f7d2e1559f0 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
@@ -14,59 +14,58 @@
         </div>
         <div class="block-content">
             <?php $suffix = $block->getNameInLayout(); ?>
-            <?php $iterator = 1; ?>
             <ol class="product-items" id="widget-new-products-<?php /* @escapeNotVerified */ echo $suffix; ?>">
                 <?php foreach ($_products->getItems() as $_product): ?>
-                    <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
-                    <div class="product-item-info">
-                        <a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                           title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>">
-                            <?php echo $block->getImage($_product, 'side_column_widget_product_thumbnail')->toHtml(); ?>
-                        </a>
-                        <div class="product-item-details">
-                            <strong class="product-item-name">
-                                <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                                   title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>)" class="product-item-link">
-                                    <?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
-                                </a>
-                            </strong>
-                            <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml($_product, '-widget-new-' . $suffix) ?>
-                            <div class="product-item-actions">
-                                <div class="actions-primary">
-                                    <?php if ($_product->isSaleable()): ?>
-                                        <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
-                                            <button type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>"
-                                                    class="action tocart primary"
-                                                    data-mage-init='{"redirectUrl":{"url":"<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_product) ?>"}}'>
-                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
-                                            </button>
+                    <li class="product-item">
+                        <div class="product-item-info">
+                            <a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
+                               title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>">
+                                <?php echo $block->getImage($_product, 'side_column_widget_product_thumbnail')->toHtml(); ?>
+                            </a>
+                            <div class="product-item-details">
+                                <strong class="product-item-name">
+                                    <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
+                                       title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>)" class="product-item-link">
+                                        <?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                                    </a>
+                                </strong>
+                                <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml($_product, '-widget-new-' . $suffix) ?>
+                                <div class="product-item-actions">
+                                    <div class="actions-primary">
+                                        <?php if ($_product->isSaleable()): ?>
+                                            <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
+                                                <button type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>"
+                                                        class="action tocart primary"
+                                                        data-mage-init='{"redirectUrl":{"url":"<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_product) ?>"}}'>
+                                                    <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                </button>
+                                            <?php else: ?>
+                                                <?php
+                                                    $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
+                                                    $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()]);
+                                            ?>
+                                                <button type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>"
+                                                        class="action tocart primary"
+                                                        data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'>
+                                                    <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                </button>
+                                            <?php endif; ?>
                                         <?php else: ?>
-                                            <?php
-                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                                $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()]);
-                                        ?>
-                                            <button type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>"
-                                                    class="action tocart primary"
-                                                    data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'>
-                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
-                                            </button>
+                                            <?php if ($_product->getIsSalable()): ?>
+                                                <div class="stock available" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
+                                                    <span><?php /* @escapeNotVerified */ echo __('In stock') ?></span>
+                                                </div>
+                                            <?php else: ?>
+                                                <div class="stock unavailable" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
+                                                    <span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span>
+                                                </div>
+                                            <?php endif; ?>
                                         <?php endif; ?>
-                                    <?php else: ?>
-                                        <?php if ($_product->getIsSalable()): ?>
-                                            <div class="stock available" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
-                                                <span><?php /* @escapeNotVerified */ echo __('In stock') ?></span>
-                                            </div>
-                                        <?php else: ?>
-                                            <div class="stock unavailable" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
-                                                <span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span>
-                                            </div>
-                                        <?php endif; ?>
-                                    <?php endif; ?>
+                                    </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
-                    <?php echo($iterator == count($_products->getItems())+1) ? '</li>' : '' ?>
+                    </li>
                 <?php endforeach; ?>
             </ol>
             <?php echo $block->getPagerHtml() ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
index 897d70c23acc2..342613f5efcb4 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
@@ -39,9 +39,8 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
             <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
             <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
                 <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
-                    <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                    <li class="product-item">
                         <div class="product-item-info">
                             <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
                                 <?php echo $block->getImage($_item, $image)->toHtml(); ?>
@@ -117,7 +116,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                 <?php endif; ?>
                             </div>
                         </div>
-                        <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                     </li>
                     <?php endforeach ?>
                 </ol>
             </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
index 567ccb2d11581..125e92683be9f 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
@@ -40,91 +40,90 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
             <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
             <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
                 <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
-                    <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
-                        <div class="product-item-info">
-                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                <?php echo $block->getImage($_item, $image)->toHtml(); ?>
-                            </a>
-                            <div class="product-item-details">
-                                <strong class="product-item-name">
-                                    <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
-                                       class="product-item-link">
-                                        <?php echo $block->escapeHtml($_item->getName()) ?>
-                                    </a>
-                                </strong>
-                                <?php echo $block->getProductPriceHtml($_item, $type); ?>
-
-                                <?php if ($templateType): ?>
-                                    <?php echo $block->getReviewsSummaryHtml($_item, $templateType) ?>
-                                <?php endif; ?>
-
-                                <?php if ($showWishlist || $showCompare || $showCart): ?>
-                                    <div class="product-item-actions">
-                                        <?php if ($showCart): ?>
-                                            <div class="actions-primary">
-                                                <?php if ($_item->isSaleable()): ?>
-                                                    <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                        <button class="action tocart primary"
-                                                                data-mage-init='{"redirectUrl":{"url":"<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
-                                                        </button>
+                        <li class="product-item">
+                            <div class="product-item-info">
+                                <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
+                                    <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                                </a>
+                                <div class="product-item-details">
+                                    <strong class="product-item-name">
+                                        <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
+                                           href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
+                                           class="product-item-link">
+                                            <?php echo $block->escapeHtml($_item->getName()) ?>
+                                        </a>
+                                    </strong>
+                                    <?php echo $block->getProductPriceHtml($_item, $type); ?>
+    
+                                    <?php if ($templateType): ?>
+                                        <?php echo $block->getReviewsSummaryHtml($_item, $templateType) ?>
+                                    <?php endif; ?>
+    
+                                    <?php if ($showWishlist || $showCompare || $showCart): ?>
+                                        <div class="product-item-actions">
+                                            <?php if ($showCart): ?>
+                                                <div class="actions-primary">
+                                                    <?php if ($_item->isSaleable()): ?>
+                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
+                                                            <button class="action tocart primary"
+                                                                    data-mage-init='{"redirectUrl":{"url":"<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
+                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                            </button>
+                                                        <?php else: ?>
+                                                            <?php
+                                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
+                                                                $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
+                                                            ?>
+                                                            <button class="action tocart primary"
+                                                                    data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
+                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                            </button>
+                                                        <?php endif; ?>
                                                     <?php else: ?>
-                                                        <?php
-                                                            $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                                            $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-                                                        ?>
-                                                        <button class="action tocart primary"
-                                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
-                                                        </button>
+                                                        <?php if ($_item->getIsSalable()): ?>
+                                                            <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                                        <?php else: ?>
+                                                            <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                        <?php endif; ?>
                                                     <?php endif; ?>
-                                                <?php else: ?>
-                                                    <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
-                                                    <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                </div>
+                                            <?php endif; ?>
+                                            <?php if ($showWishlist || $showCompare): ?>
+                                                <div class="actions-secondary" data-role="add-to-links">
+                                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+                                                        <a href="#"
+                                                           data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
+                                                           class="action towishlist" data-action="add-to-wishlist"
+                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
+                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                                                        </a>
                                                     <?php endif; ?>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
-                                        <?php if ($showWishlist || $showCompare): ?>
-                                            <div class="actions-secondary" data-role="add-to-links">
-                                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                                    <a href="#"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
-                                                       class="action towishlist" data-action="add-to-wishlist"
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
-                                                    <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare'); ?>
-                                                    <a href="#" class="action tocompare"
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'>
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
-                                    </div>
-                                <?php endif; ?>
-                                <?php if ($description):?>
-                                    <div class="product-item-description">
-                                        <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
-                                        <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                           href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
-                                           class="action more"><?php /* @escapeNotVerified */ echo __('Learn More') ?></a>
-                                    </div>
-                                <?php endif; ?>
+                                                    <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
+                                                        <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare'); ?>
+                                                        <a href="#" class="action tocompare"
+                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>"
+                                                           data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'>
+                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+                                                        </a>
+                                                    <?php endif; ?>
+                                                </div>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+                                    <?php if ($description):?>
+                                        <div class="product-item-description">
+                                            <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
+                                            <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
+                                               href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
+                                               class="action more"><?php /* @escapeNotVerified */ echo __('Learn More') ?></a>
+                                        </div>
+                                    <?php endif; ?>
+                                </div>
                             </div>
-                        </div>
-                        <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                        </li>
                     <?php endforeach ?>
                 </ol>
             </div>
diff --git a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
index 51943355e8ea7..9976d6fa6bdd6 100644
--- a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
+++ b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
@@ -33,78 +33,76 @@
             <?php /* @noEscape */ echo '<!-- ' . $image . '-->' ?>
             <div class="products-<?php /* @noEscape */ echo $mode; ?> <?php /* @noEscape */ echo $mode; ?>">
                 <ol class="product-items <?php /* @noEscape */ echo $type; ?>">
-                    <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php if ($iterator++ != 1): ?></li><?php endif ?>
                         <li class="product-item">
-                        <div class="product-item-info">
-                            <a href="<?php echo $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
-                                <?php echo $block->getImage($_item, $image)->toHtml(); ?>
-                            </a>
-                            <div class="product-item-details">
-                                <strong class="product-item-name">
-                                    <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?php echo $block->escapeUrl($block->getProductUrl($_item)) ?>"
-                                       class="product-item-link">
-                                        <?php echo $block->escapeHtml($_item->getName()) ?>
-                                    </a>
-                                </strong>
-                                <?php
-                                echo $block->getProductPriceHtml($_item, $type);
-                                ?>
+                            <div class="product-item-info">
+                                <a href="<?php echo $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
+                                    <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                                </a>
+                                <div class="product-item-details">
+                                    <strong class="product-item-name">
+                                        <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
+                                           href="<?php echo $block->escapeUrl($block->getProductUrl($_item)) ?>"
+                                           class="product-item-link">
+                                            <?php echo $block->escapeHtml($_item->getName()) ?>
+                                        </a>
+                                    </strong>
+                                    <?php
+                                    echo $block->getProductPriceHtml($_item, $type);
+                                    ?>
 
-                                <?php if ($templateType): ?>
-                                    <?php echo $block->getReviewsSummaryHtml($_item, $templateType) ?>
-                                <?php endif; ?>
+                                    <?php if ($templateType): ?>
+                                        <?php echo $block->getReviewsSummaryHtml($_item, $templateType) ?>
+                                    <?php endif; ?>
 
-                                <?php if ($showWishlist || $showCompare || $showCart): ?>
-                                    <div class="product-item-actions">
-                                        <?php if ($showCart): ?>
-                                            <div class="actions-primary">
-                                                <?php if ($_item->isSaleable()): ?>
-                                                    <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                        <button class="action tocart primary" data-mage-init='{"redirectUrl":{"url":"<?php echo $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?php echo $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                            <span><?php echo $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                        </button>
+                                    <?php if ($showWishlist || $showCompare || $showCart): ?>
+                                        <div class="product-item-actions">
+                                            <?php if ($showCart): ?>
+                                                <div class="actions-primary">
+                                                    <?php if ($_item->isSaleable()): ?>
+                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
+                                                            <button class="action tocart primary" data-mage-init='{"redirectUrl":{"url":"<?php echo $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?php echo $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                                <span><?php echo $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                            </button>
+                                                        <?php else: ?>
+                                                            <?php
+                                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
+                                                                $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
+                                                            ?>
+                                                            <button class="action tocart primary" data-post='<?php /* @noEscape */ echo $postData; ?>' type="button" title="<?php echo $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                                <span><?php echo $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                            </button>
+                                                        <?php endif; ?>
                                                     <?php else: ?>
-                                                        <?php
-                                                            $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                                            $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-                                                        ?>
-                                                        <button class="action tocart primary" data-post='<?php /* @noEscape */ echo $postData; ?>' type="button" title="<?php echo $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                            <span><?php echo $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                        </button>
+                                                        <?php if ($_item->getIsSalable()): ?>
+                                                            <div class="stock available"><span><?php echo $block->escapeHtml(__('In stock')) ?></span></div>
+                                                        <?php else: ?>
+                                                            <div class="stock unavailable"><span><?php echo $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                                        <?php endif; ?>
                                                     <?php endif; ?>
-                                                <?php else: ?>
-                                                    <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php echo $block->escapeHtml(__('In stock')) ?></span></div>
-                                                    <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php echo $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                                </div>
+                                            <?php endif; ?>
+                                            <?php if ($showWishlist || $showCompare): ?>
+                                                <div class="actions-secondary" data-role="add-to-links">
+                                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+                                                        <a href="#"
+                                                           data-post='<?php /* @noEscape */ echo $block->getAddToWishlistParams($_item); ?>' class="action towishlist" data-action="add-to-wishlist" title="<?php echo $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
+                                                            <span><?php echo $block->escapeHtml(__('Add to Wish List')) ?></span>
+                                                        </a>
+                                                    <?php endif; ?>
+                                                    <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
+                                                        <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
+                                                        <a href="#" class="action tocompare" data-post='<?php /* @noEscape */ echo $compareHelper->getPostDataParams($_item);?>' title="<?php echo $block->escapeHtmlAttr(__('Add to Compare')) ?>">
+                                                            <span><?php echo $block->escapeHtml(__('Add to Compare')) ?></span>
+                                                        </a>
                                                     <?php endif; ?>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
-                                        <?php if ($showWishlist || $showCompare): ?>
-                                            <div class="actions-secondary" data-role="add-to-links">
-                                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                                    <a href="#"
-                                                       data-post='<?php /* @noEscape */ echo $block->getAddToWishlistParams($_item); ?>' class="action towishlist" data-action="add-to-wishlist" title="<?php echo $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
-                                                        <span><?php echo $block->escapeHtml(__('Add to Wish List')) ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
-                                                    <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-                                                    <a href="#" class="action tocompare" data-post='<?php /* @noEscape */ echo $compareHelper->getPostDataParams($_item);?>' title="<?php echo $block->escapeHtmlAttr(__('Add to Compare')) ?>">
-                                                        <span><?php echo $block->escapeHtml(__('Add to Compare')) ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
-                                    </div>
-                                <?php endif; ?>
+                                                </div>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+                                </div>
                             </div>
-                        </div>
-                        <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                        </li>
                     <?php endforeach ?>
                 </ol>
             </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml
index f26c96a9f9e2f..b6a76e945d0a2 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml
@@ -33,61 +33,60 @@ if ($exist = $block->getRecentlyComparedProducts()) {
     <div class="block-content">
         <?php $suffix = $block->getNameInLayout(); ?>
         <ol class="product-items" id="widget-compared-<?php /* @escapeNotVerified */ echo $suffix; ?>">
-            <?php $iterator = 1; ?>
             <?php foreach ($items as $_product): ?>
-                <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
-                <div class="product-item-info">
-                    <a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                       title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>">
-                        <?php echo $block->getImage($_product, $image)->toHtml(); ?>
-                    </a>
-                    <div class="product-item-details">
-                        <strong class="product-item-name">
-                            <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                               title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>)">
-                                <?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
-                            </a>
-                        </strong>
-                        <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
-                            $_product,
-                            \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                            \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-                            [
-                                'price_id_suffix' => '-widget-compared-' . $suffix
-                            ]
-                        ) ?>
-                        <div class="product-item-actions">
-                        <?php if ($_product->isSaleable()): ?>
-                            <div class="actions-primary">
-                            <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
-                                <button class="action tocart primary"
-                                        data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_product) ?>"}}'
-                                        type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                    <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
-                                </button>
+                <li class="product-item">
+                    <div class="product-item-info">
+                        <a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
+                           title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>">
+                            <?php echo $block->getImage($_product, $image)->toHtml(); ?>
+                        </a>
+                        <div class="product-item-details">
+                            <strong class="product-item-name">
+                                <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
+                                   title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>)">
+                                    <?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                                </a>
+                            </strong>
+                            <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
+                                $_product,
+                                \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
+                                \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
+                                [
+                                    'price_id_suffix' => '-widget-compared-' . $suffix
+                                ]
+                            ) ?>
+                            <div class="product-item-actions">
+                            <?php if ($_product->isSaleable()): ?>
+                                <div class="actions-primary">
+                                <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
+                                    <button class="action tocart primary"
+                                            data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_product) ?>"}}'
+                                            type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                        <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                    </button>
+                                <?php else: ?>
+                                    <?php
+                                    $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
+                                    $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()])
+                                    ?>
+                                    <button class="action tocart primary"
+                                            data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
+                                            type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                        <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                    </button>
+                                <?php endif; ?>
+                                </div>
                             <?php else: ?>
-                                <?php
-                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()])
-                                ?>
-                                <button class="action tocart primary"
-                                        data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                        type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                    <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
-                                </button>
+                                <?php if ($_product->getIsSalable()): ?>
+                                    <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                <?php else: ?>
+                                    <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                <?php endif; ?>
                             <?php endif; ?>
                             </div>
-                        <?php else: ?>
-                            <?php if ($_product->getIsSalable()): ?>
-                                <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
-                            <?php else: ?>
-                                <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
-                            <?php endif; ?>
-                        <?php endif; ?>
                         </div>
                     </div>
-                </div>
-                <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                </li>
             <?php endforeach; ?>
         </ol>
     </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
index 151e5d6044515..8d0a87fe615ab 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
@@ -37,89 +37,88 @@ if ($exist = $block->getRecentlyComparedProducts()) {
             <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
             <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
                 <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
-                    <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
-                        <div class="product-item-info">
-                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                <?php echo $block->getImage($_item, $image)->toHtml(); ?>
-                            </a>
-                            <div class="product-item-details">
-                                <strong class="product-item-name">
-                                    <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
-                                        <?php echo $block->escapeHtml($_item->getName()) ?>
-                                    </a>
-                                </strong>
-                                <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
-                                    $_item,
-                                    \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                                    \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-                                    [
-                                        'price_id_suffix' => '-' . $type
-                                    ]
-                                ) ?>
-                                <?php if ($rating): ?>
-                                    <?php echo $block->getReviewsSummaryHtml($_item, $rating) ?>
-                                <?php endif; ?>
-                                <?php if ($showWishlist || $showCompare || $showCart): ?>
-                                    <div class="product-item-actions">
-                                        <?php if ($showCart): ?>
-                                            <div class="actions-primary">
-                                                <?php if ($_item->isSaleable()): ?>
-                                                    <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                        <button class="action tocart primary"
-                                                                data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
-                                                        </button>
+                        <li class="product-item">
+                            <div class="product-item-info">
+                                <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
+                                    <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                                </a>
+                                <div class="product-item-details">
+                                    <strong class="product-item-name">
+                                        <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
+                                           href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
+                                            <?php echo $block->escapeHtml($_item->getName()) ?>
+                                        </a>
+                                    </strong>
+                                    <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
+                                        $_item,
+                                        \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
+                                        \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
+                                        [
+                                            'price_id_suffix' => '-' . $type
+                                        ]
+                                    ) ?>
+                                    <?php if ($rating): ?>
+                                        <?php echo $block->getReviewsSummaryHtml($_item, $rating) ?>
+                                    <?php endif; ?>
+                                    <?php if ($showWishlist || $showCompare || $showCart): ?>
+                                        <div class="product-item-actions">
+                                            <?php if ($showCart): ?>
+                                                <div class="actions-primary">
+                                                    <?php if ($_item->isSaleable()): ?>
+                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
+                                                            <button class="action tocart primary"
+                                                                    data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
+                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                            </button>
+                                                        <?php else: ?>
+                                                            <?php
+                                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
+                                                                $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
+                                                            ?>
+                                                            <button class="action tocart primary"
+                                                                    data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
+                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                            </button>
+                                                        <?php endif; ?>
                                                     <?php else: ?>
-                                                        <?php
-                                                            $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                                            $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-                                                        ?>
-                                                        <button class="action tocart primary"
-                                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
-                                                        </button>
+                                                        <?php if ($_item->getIsSalable()): ?>
+                                                            <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                                        <?php else: ?>
+                                                            <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                        <?php endif; ?>
                                                     <?php endif; ?>
-                                                <?php else: ?>
-                                                    <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
-                                                    <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                </div>
+                                            <?php endif; ?>
+    
+                                            <?php if ($showWishlist || $showCompare): ?>
+                                                <div class="actions-secondary" data-role="add-to-links">
+                                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+                                                        <a href="#"
+                                                           data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
+                                                           data-action="add-to-wishlist"
+                                                           class="action towishlist"
+                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
+                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                                                        </a>
                                                     <?php endif; ?>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
-
-                                        <?php if ($showWishlist || $showCompare): ?>
-                                            <div class="actions-secondary" data-role="add-to-links">
-                                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                                    <a href="#"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
-                                                       data-action="add-to-wishlist"
-                                                       class="action towishlist"
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
-                                                    <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare'); ?>
-                                                    <a href="#" class="action tocompare"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
-                                    </div>
-                                <?php endif; ?>
+                                                    <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
+                                                        <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare'); ?>
+                                                        <a href="#" class="action tocompare"
+                                                           data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
+                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
+                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+                                                        </a>
+                                                    <?php endif; ?>
+                                                </div>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+                                </div>
                             </div>
-                        </div>
-                        <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                        </li>
                     <?php endforeach ?>
                 </ol>
             </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
index 9b6dbc9cbac2c..0ddfc9d936a78 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
@@ -38,97 +38,96 @@ if ($exist = $block->getRecentlyComparedProducts()) {
             <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
             <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
                 <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
-                    <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
-                        <div class="product-item-info">
-                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                <?php echo $block->getImage($_item, $image)->toHtml(); ?>
-                            </a>
-                            <div class="product-item-details">
-                                <strong class="product-item-name">
-                                    <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
-                                        <?php echo $block->escapeHtml($_item->getName()) ?>
-                                    </a>
-                                </strong>
-                                <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
-                                    $_item,
-                                    \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                                    \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-                                    [
-                                        'price_id_suffix' => '-' . $type
-                                    ]
-                                ) ?>
-                                <?php if ($rating): ?>
-                                    <?php echo $block->getReviewsSummaryHtml($_item, $rating) ?>
-                                <?php endif; ?>
-                                <?php if ($showWishlist || $showCompare || $showCart): ?>
-                                    <div class="product-item-actions">
-                                        <?php if ($showCart): ?>
-                                            <div class="actions-primary">
-                                                <?php if ($_item->isSaleable()): ?>
-                                                    <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                        <button class="action tocart primary"
-                                                                data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
-                                                        </button>
+                        <li class="product-item">
+                            <div class="product-item-info">
+                                <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
+                                    <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                                </a>
+                                <div class="product-item-details">
+                                    <strong class="product-item-name">
+                                        <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
+                                           href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
+                                            <?php echo $block->escapeHtml($_item->getName()) ?>
+                                        </a>
+                                    </strong>
+                                    <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
+                                        $_item,
+                                        \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
+                                        \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
+                                        [
+                                            'price_id_suffix' => '-' . $type
+                                        ]
+                                    ) ?>
+                                    <?php if ($rating): ?>
+                                        <?php echo $block->getReviewsSummaryHtml($_item, $rating) ?>
+                                    <?php endif; ?>
+                                    <?php if ($showWishlist || $showCompare || $showCart): ?>
+                                        <div class="product-item-actions">
+                                            <?php if ($showCart): ?>
+                                                <div class="actions-primary">
+                                                    <?php if ($_item->isSaleable()): ?>
+                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
+                                                            <button class="action tocart primary"
+                                                                    data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
+                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                            </button>
+                                                        <?php else: ?>
+                                                            <?php
+                                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
+                                                                $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
+                                                            ?>
+                                                            <button class="action tocart primary"
+                                                                    data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
+                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                            </button>
+                                                        <?php endif; ?>
                                                     <?php else: ?>
-                                                        <?php
-                                                            $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                                            $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-                                                        ?>
-                                                        <button class="action tocart primary"
-                                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
-                                                        </button>
+                                                        <?php if ($_item->getIsSalable()): ?>
+                                                            <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                                        <?php else: ?>
+                                                            <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                        <?php endif; ?>
                                                     <?php endif; ?>
-                                                <?php else: ?>
-                                                    <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
-                                                    <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                </div>
+                                            <?php endif; ?>
+    
+                                            <?php if ($showWishlist || $showCompare): ?>
+                                                <div class="actions-secondary" data-role="add-to-links">
+                                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+                                                        <a href="#"
+                                                           data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
+                                                           data-action="add-to-wishlist"
+                                                           class="action towishlist"
+                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
+                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                                                        </a>
                                                     <?php endif; ?>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
-
-                                        <?php if ($showWishlist || $showCompare): ?>
-                                            <div class="actions-secondary" data-role="add-to-links">
-                                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                                    <a href="#"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
-                                                       data-action="add-to-wishlist"
-                                                       class="action towishlist"
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
-                                                    <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-                                                    <a href="#" class="action tocompare"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
-                                    </div>
-                                <?php endif; ?>
-                                <?php if ($description):?>
-                                    <div class="product-item-description">
-                                        <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
-                                        <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                           href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
-                                           class="action more"><?php /* @escapeNotVerified */ echo __('Learn More') ?></a>
-                                    </div>
-                                <?php endif; ?>
+                                                    <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
+                                                        <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
+                                                        <a href="#" class="action tocompare"
+                                                           data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
+                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
+                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+                                                        </a>
+                                                    <?php endif; ?>
+                                                </div>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+                                    <?php if ($description):?>
+                                        <div class="product-item-description">
+                                            <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
+                                            <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
+                                               href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
+                                               class="action more"><?php /* @escapeNotVerified */ echo __('Learn More') ?></a>
+                                        </div>
+                                    <?php endif; ?>
+                                </div>
                             </div>
-                        </div>
-                        <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                        </li>
                     <?php endforeach ?>
                 </ol>
             </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
index 0c4b84737a08c..3b84087284881 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
@@ -38,60 +38,59 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
     <div class="block-content">
         <?php $suffix = $block->getNameInLayout(); ?>
         <ol class="product-items" id="widget-viewed-<?php /* @escapeNotVerified */ echo $suffix; ?>">
-            <?php $iterator = 1; ?>
             <?php foreach ($items as $_product): ?>
-                <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
-                <div class="product-item-info">
-                    <a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                       title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>">
-                        <?php echo $block->getImage($_product, $image)->toHtml(); ?>
-                    </a>
-                    <div class="product-item-details">
-                        <strong class="product-item-name">
-                            <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                               title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>"
-                               class="product-item-link">
-                                <?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
-                            </a>
-                        </strong>
-                        <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
-                            $_product,
-                            \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                            \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-                            [
-                                'price_id_suffix' => '-widget-viewed-' . $suffix
-                            ]
-                        ) ?>
-                        <div class="product-item-actions">
-                            <?php if ($_product->isSaleable()): ?>
-                            <div class="actions-primary">
-                                <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
-                                    <button class="action tocart primary"
-                                            data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_product) ?>"}}'
-                                            type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                        <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
-                                    </button>
+                <li class="product-item">
+                    <div class="product-item-info">
+                        <a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
+                           title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>">
+                            <?php echo $block->getImage($_product, $image)->toHtml(); ?>
+                        </a>
+                        <div class="product-item-details">
+                            <strong class="product-item-name">
+                                <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
+                                   title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>"
+                                   class="product-item-link">
+                                    <?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                                </a>
+                            </strong>
+                            <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
+                                $_product,
+                                \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
+                                \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
+                                [
+                                    'price_id_suffix' => '-widget-viewed-' . $suffix
+                                ]
+                            ) ?>
+                            <div class="product-item-actions">
+                                <?php if ($_product->isSaleable()): ?>
+                                <div class="actions-primary">
+                                    <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
+                                        <button class="action tocart primary"
+                                                data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_product) ?>"}}'
+                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                        </button>
+                                    <?php else: ?>
+                                        <?php
+                                            $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
+                                            $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()]);
+                                        ?>
+                                        <button type="button" class="action tocart primary" data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'>
+                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                        </button>
+                                    <?php endif; ?>
+                                </div>
                                 <?php else: ?>
-                                    <?php
-                                        $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                        $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()]);
-                                    ?>
-                                    <button type="button" class="action tocart primary" data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'>
-                                        <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
-                                    </button>
+                                    <?php if ($_product->getIsSalable()): ?>
+                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                    <?php else: ?>
+                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                    <?php endif; ?>
                                 <?php endif; ?>
                             </div>
-                            <?php else: ?>
-                                <?php if ($_product->getIsSalable()): ?>
-                                    <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
-                                <?php else: ?>
-                                    <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
-                                <?php endif; ?>
-                            <?php endif; ?>
                         </div>
                     </div>
-                </div>
-                <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                </li>
             <?php endforeach; ?>
         </ol>
     </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml
index 3a548aaedb8ad..e5b3b735edb10 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml
@@ -35,14 +35,13 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
         <div class="block-content">
             <?php $suffix = $block->getNameInLayout(); ?>
             <ol id="widget-viewed-<?php /* @escapeNotVerified */ echo $suffix; ?>" class="product-items product-items-images">
-                <?php $iterator = 1; ?>
                 <?php foreach ($items as $_product): ?>
-                    <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                    <li class="product-item">
                         <a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>" title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>">
                             <?php echo $block->getImage($_product, $image)->toHtml(); ?>
                         </a>
-                    <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
-            <?php endforeach; ?>
+                    </li>
+                <?php endforeach; ?>
             </ol>
         </div>
     </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
index e9fe8c8c3aea9..d2c694179eb0f 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
@@ -39,87 +39,86 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
             <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
             <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
                 <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
-                    <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
-                        <div class="product-item-info">
-                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                <?php echo $block->getImage($_item, $image)->toHtml(); ?>
-                            </a>
-                            <div class="product-item-details">
-                                <strong class="product-item-name">
-                                    <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
-                                        <?php echo $block->escapeHtml($_item->getName()) ?>
-                                    </a>
-                                </strong>
-                                <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
-                                    $_item,
-                                    \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                                    \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-                                    [
-                                        'price_id_suffix' => '-' . $type
-                                    ]
-                                ) ?>
-                                <?php if ($rating): ?>
-                                    <?php echo $block->getReviewsSummaryHtml($_item, $rating) ?>
-                                <?php endif; ?>
-                                <?php if ($showWishlist || $showCompare || $showCart): ?>
-                                    <div class="product-item-actions">
-                                        <?php if ($showCart): ?>
-                                            <div class="actions-primary">
-                                                <?php if ($_item->isSaleable()): ?>
-                                                    <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                        <button class="action tocart primary"
-                                                                data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
-                                                        </button>
+                        <li class="product-item">
+                            <div class="product-item-info">
+                                <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
+                                    <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                                </a>
+                                <div class="product-item-details">
+                                    <strong class="product-item-name">
+                                        <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
+                                           href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
+                                            <?php echo $block->escapeHtml($_item->getName()) ?>
+                                        </a>
+                                    </strong>
+                                    <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
+                                        $_item,
+                                        \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
+                                        \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
+                                        [
+                                            'price_id_suffix' => '-' . $type
+                                        ]
+                                    ) ?>
+                                    <?php if ($rating): ?>
+                                        <?php echo $block->getReviewsSummaryHtml($_item, $rating) ?>
+                                    <?php endif; ?>
+                                    <?php if ($showWishlist || $showCompare || $showCart): ?>
+                                        <div class="product-item-actions">
+                                            <?php if ($showCart): ?>
+                                                <div class="actions-primary">
+                                                    <?php if ($_item->isSaleable()): ?>
+                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
+                                                            <button class="action tocart primary"
+                                                                    data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
+                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                            </button>
+                                                        <?php else: ?>
+                                                            <?php
+                                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
+                                                                $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
+                                                            ?>
+                                                            <button class="action tocart primary"
+                                                                    data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
+                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                            </button>
+                                                        <?php endif; ?>
                                                     <?php else: ?>
-                                                        <?php
-                                                            $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                                            $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-                                                        ?>
-                                                        <button class="action tocart primary"
-                                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
-                                                        </button>
+                                                        <?php if ($_item->getIsSalable()): ?>
+                                                            <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                                        <?php else: ?>
+                                                            <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                        <?php endif; ?>
                                                     <?php endif; ?>
-                                                <?php else: ?>
-                                                    <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
-                                                    <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                </div>
+                                            <?php endif; ?>
+                                            <?php if ($showWishlist || $showCompare): ?>
+                                                <div class="actions-secondary" data-role="add-to-links">
+                                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+                                                        <a href="#"
+                                                           class="action towishlist" data-action="add-to-wishlist"
+                                                           data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
+                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
+                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                                                        </a>
+                                                    <?php endif; ?>
+                                                    <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
+                                                        <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
+                                                        <a href="#" class="action tocompare"
+                                                           data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
+                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
+                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+                                                        </a>
                                                     <?php endif; ?>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
-                                        <?php if ($showWishlist || $showCompare): ?>
-                                            <div class="actions-secondary" data-role="add-to-links">
-                                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                                    <a href="#"
-                                                       class="action towishlist" data-action="add-to-wishlist"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
-                                                    <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-                                                    <a href="#" class="action tocompare"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
-                                    </div>
-                                <?php endif; ?>
+                                                </div>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+                                </div>
                             </div>
-                        </div>
-                        <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                        </li>
                     <?php endforeach ?>
                 </ol>
             </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
index b2077b441b79f..2a2700886a9d9 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
@@ -41,96 +41,95 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
             <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
             <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
                 <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
-                    <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
-                        <div class="product-item-info">
-                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                <?php echo $block->getImage($_item, $image)->toHtml(); ?>
-                            </a>
-                            <div class="product-item-details">
-                                <strong class="product-item-name">
-                                    <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
-                                        <?php echo $block->escapeHtml($_item->getName()) ?>
-                                    </a>
-                                </strong>
-                                <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
-                                    $_item,
-                                    \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                                    \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
-                                    [
-                                        'price_id_suffix' => '-' . $type
-                                    ]
-                                ) ?>
-                                <?php if ($rating): ?>
-                                    <?php echo $block->getReviewsSummaryHtml($_item, $rating) ?>
-                                <?php endif; ?>
-                                <?php if ($showWishlist || $showCompare || $showCart): ?>
-                                    <div class="product-item-actions">
-                                        <?php if ($showCart): ?>
-                                            <div class="actions-primary">
-                                                <?php if ($_item->isSaleable()): ?>
-                                                    <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                        <button class="action tocart primary"
-                                                                data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
-                                                        </button>
+                        <li class="product-item">
+                            <div class="product-item-info">
+                                <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
+                                    <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                                </a>
+                                <div class="product-item-details">
+                                    <strong class="product-item-name">
+                                        <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
+                                           href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
+                                            <?php echo $block->escapeHtml($_item->getName()) ?>
+                                        </a>
+                                    </strong>
+                                    <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
+                                        $_item,
+                                        \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
+                                        \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
+                                        [
+                                            'price_id_suffix' => '-' . $type
+                                        ]
+                                    ) ?>
+                                    <?php if ($rating): ?>
+                                        <?php echo $block->getReviewsSummaryHtml($_item, $rating) ?>
+                                    <?php endif; ?>
+                                    <?php if ($showWishlist || $showCompare || $showCart): ?>
+                                        <div class="product-item-actions">
+                                            <?php if ($showCart): ?>
+                                                <div class="actions-primary">
+                                                    <?php if ($_item->isSaleable()): ?>
+                                                        <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
+                                                            <button class="action tocart primary"
+                                                                    data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
+                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                            </button>
+                                                        <?php else: ?>
+                                                            <?php
+                                                                $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
+                                                                $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()]);
+                                                            ?>
+                                                            <button class="action tocart primary"
+                                                                    data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
+                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                            </button>
+                                                            <?php endif; ?>
                                                     <?php else: ?>
-                                                        <?php
-                                                            $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                                            $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()]);
-                                                        ?>
-                                                        <button class="action tocart primary"
-                                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
-                                                        </button>
+                                                        <?php if ($_item->getIsSalable()): ?>
+                                                            <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                                        <?php else: ?>
+                                                            <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
                                                         <?php endif; ?>
-                                                <?php else: ?>
-                                                    <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
-                                                    <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
                                                     <?php endif; ?>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
+                                                </div>
+                                            <?php endif; ?>
 
-                                        <?php if ($showWishlist || $showCompare): ?>
-                                            <div class="actions-secondary" data-role="add-to-links">
-                                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                                    <a href="#"
-                                                       class="action towishlist" data-action="add-to-wishlist"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
-                                                    <?php  $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-                                                    <a href="#" class="action tocompare"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
-                                    </div>
-                                <?php endif; ?>
-                                <?php if ($description):?>
-                                    <div class="product-item-description">
-                                        <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
-                                        <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                           href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
-                                           class="action more"><?php /* @escapeNotVerified */ echo __('Learn More') ?></a>
-                                    </div>
-                                <?php endif; ?>
+                                            <?php if ($showWishlist || $showCompare): ?>
+                                                <div class="actions-secondary" data-role="add-to-links">
+                                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+                                                        <a href="#"
+                                                           class="action towishlist" data-action="add-to-wishlist"
+                                                           data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
+                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
+                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                                                        </a>
+                                                    <?php endif; ?>
+                                                    <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
+                                                        <?php  $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
+                                                        <a href="#" class="action tocompare"
+                                                           data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
+                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
+                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+                                                        </a>
+                                                    <?php endif; ?>
+                                                </div>
+                                            <?php endif; ?>
+                                        </div>
+                                    <?php endif; ?>
+                                    <?php if ($description):?>
+                                        <div class="product-item-description">
+                                            <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
+                                            <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
+                                               href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
+                                               class="action more"><?php /* @escapeNotVerified */ echo __('Learn More') ?></a>
+                                        </div>
+                                    <?php endif; ?>
+                                </div>
                             </div>
-                        </div>
-                        <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                        </li>
                     <?php endforeach ?>
                 </ol>
             </div>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
index dce3241ea5f92..38cda03093018 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
@@ -13,17 +13,16 @@ $columns = $block->getColumns();
 ?>
 
 <div class="products-grid wishlist">
-    <?php $iterator = 1; ?>
     <?php if (count($block->getItems())): ?>
     <ol class="product-items">
         <?php foreach ($block->getItems() as $item): ?>
-        <?php /* @noEscape */ echo($iterator++ == 1) ? '<li data-row="product-item" class="product-item" id="item_' . $block->escapeHtmlAttr($item->getId()) . '">' : '</li><li class="product-item" id="item_' . $block->escapeHtmlAttr($item->getId()) . '">' ?>
-            <div class="product-item-info">
-                <?php foreach ($columns as $column): ?>
-                    <?php $column->setItem($item); echo $column->toHtml($item);?>
-                <?php endforeach; ?>
-            </div>
-        <?php echo($iterator == count($block->getItems())+1) ? '</li>' : '' ?>
+            <li data-row="product-item" class="product-item" id="item_<?php echo $block->escapeHtmlAttr($item->getId()) ?>">
+                <div class="product-item-info">
+                    <?php foreach ($columns as $column): ?>
+                        <?php $column->setItem($item); echo $column->toHtml($item);?>
+                    <?php endforeach; ?>
+                </div>
+            </li>
         <?php endforeach; ?>
     </ol>
     <?php else: ?>

From 8e22bacb8e5ff15634a93fc4e1336616156988bf Mon Sep 17 00:00:00 2001
From: Oleksii Korshenko <okorshenko@magento.com>
Date: Thu, 13 Jul 2017 17:52:47 -0500
Subject: [PATCH 2/2] Updated php tags format

---
 .../frontend/templates/product/list.phtml     | 54 ++++++++--------
 .../templates/product/list/items.phtml        | 52 ++++++++--------
 .../frontend/templates/product/listing.phtml  | 16 ++---
 .../widget/new/column/new_default_list.phtml  | 40 ++++++------
 .../product/widget/new/content/new_grid.phtml | 52 ++++++++--------
 .../product/widget/new/content/new_list.phtml | 62 +++++++++----------
 .../product/widget/content/grid.phtml         | 44 ++++++-------
 .../column/compared_default_list.phtml        | 34 +++++-----
 .../compared/content/compared_grid.phtml      | 52 ++++++++--------
 .../compared/content/compared_list.phtml      | 60 +++++++++---------
 .../viewed/column/viewed_default_list.phtml   | 32 +++++-----
 .../viewed/column/viewed_images_list.phtml    |  8 +--
 .../widget/viewed/content/viewed_grid.phtml   | 52 ++++++++--------
 .../widget/viewed/content/viewed_list.phtml   | 60 +++++++++---------
 .../view/frontend/templates/item/list.phtml   |  6 +-
 15 files changed, 312 insertions(+), 312 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
index 0109cdd348dea..b48c138e5450b 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -20,10 +20,10 @@ $_productCollection = $block->getLoadedProductCollection();
 $_helper = $this->helper('Magento\Catalog\Helper\Output');
 ?>
 <?php if (!$_productCollection->count()): ?>
-    <div class="message info empty"><div><?php /* @escapeNotVerified */ echo __('We can\'t find products matching the selection.') ?></div></div>
+    <div class="message info empty"><div><?= /* @escapeNotVerified */ __('We can\'t find products matching the selection.') ?></div></div>
 <?php else: ?>
-    <?php echo $block->getToolbarHtml() ?>
-    <?php echo $block->getAdditionalHtml() ?>
+    <?= $block->getToolbarHtml() ?>
+    <?= $block->getAdditionalHtml() ?>
     <?php
     if ($block->getMode() == 'grid') {
         $viewMode = 'grid';
@@ -41,7 +41,7 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
      */
     $pos = $block->getPositioned();
     ?>
-    <div class="products wrapper <?php /* @escapeNotVerified */ echo $viewMode; ?> products-<?php /* @escapeNotVerified */ echo $viewMode; ?>">
+    <div class="products wrapper <?= /* @escapeNotVerified */ $viewMode ?> products-<?= /* @escapeNotVerified */ $viewMode ?>">
         <ol class="products list items product-items">
             <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
             <?php foreach ($_productCollection as $_product): ?>
@@ -55,8 +55,8 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                     }
                     ?>
                     <?php // Product Image ?>
-                    <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>" class="product photo product-item-photo" tabindex="-1">
-                        <?php echo $productImage->toHtml(); ?>
+                    <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" class="product photo product-item-photo" tabindex="-1">
+                        <?= $productImage->toHtml() ?>
                     </a>
                     <div class="product details product-item-details">
                         <?php
@@ -64,48 +64,48 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                         ?>
                         <strong class="product name product-item-name">
                             <a class="product-item-link"
-                               href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>">
-                                <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_product, $_product->getName(), 'name'); ?>
+                               href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>">
+                                <?= /* @escapeNotVerified */ $_helper->productAttribute($_product, $_product->getName(), 'name') ?>
                             </a>
                         </strong>
-                        <?php echo $block->getReviewsSummaryHtml($_product, $templateType); ?>
-                        <?php /* @escapeNotVerified */ echo $block->getProductPrice($_product) ?>
-                        <?php echo $block->getProductDetailsHtml($_product); ?>
+                        <?= $block->getReviewsSummaryHtml($_product, $templateType) ?>
+                        <?= /* @escapeNotVerified */ $block->getProductPrice($_product) ?>
+                        <?= $block->getProductDetailsHtml($_product) ?>
 
                         <div class="product-item-inner">
-                            <div class="product actions product-item-actions"<?php echo strpos($pos, $viewMode . '-actions') ? $position : ''; ?>>
-                                <div class="actions-primary"<?php echo strpos($pos, $viewMode . '-primary') ? $position : ''; ?>>
+                            <div class="product actions product-item-actions"<?= strpos($pos, $viewMode . '-actions') ? $position : ''; ?>>
+                                <div class="actions-primary"<?= strpos($pos, $viewMode . '-primary') ? $position : ''; ?>>
                                     <?php if ($_product->isSaleable()): ?>
                                         <?php $postParams = $block->getAddToCartPostParams($_product); ?>
-                                        <form data-role="tocart-form" action="<?php /* @escapeNotVerified */ echo $postParams['action']; ?>" method="post">
-                                            <input type="hidden" name="product" value="<?php /* @escapeNotVerified */ echo $postParams['data']['product']; ?>">
-                                            <input type="hidden" name="<?php /* @escapeNotVerified */ echo Action::PARAM_NAME_URL_ENCODED; ?>" value="<?php /* @escapeNotVerified */ echo $postParams['data'][Action::PARAM_NAME_URL_ENCODED]; ?>">
-                                            <?php echo $block->getBlockHtml('formkey')?>
+                                        <form data-role="tocart-form" action="<?= /* @escapeNotVerified */ $postParams['action'] ?>" method="post">
+                                            <input type="hidden" name="product" value="<?= /* @escapeNotVerified */ $postParams['data']['product'] ?>">
+                                            <input type="hidden" name="<?= /* @escapeNotVerified */ Action::PARAM_NAME_URL_ENCODED ?>" value="<?= /* @escapeNotVerified */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] ?>">
+                                            <?= $block->getBlockHtml('formkey') ?>
                                             <button type="submit"
-                                                    title="<?php echo $block->escapeHtml(__('Add to Cart')); ?>"
+                                                    title="<?= $block->escapeHtml(__('Add to Cart')) ?>"
                                                     class="action tocart primary">
-                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                             </button>
                                         </form>
                                     <?php else: ?>
                                         <?php if ($_product->isAvailable()): ?>
-                                            <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                            <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                         <?php else: ?>
-                                            <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                            <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                         <?php endif; ?>
                                     <?php endif; ?>
                                 </div>
-                                <div data-role="add-to-links" class="actions-secondary"<?php echo strpos($pos, $viewMode . '-secondary') ? $position : ''; ?>>
+                                <div data-role="add-to-links" class="actions-secondary"<?= strpos($pos, $viewMode . '-secondary') ? $position : ''; ?>>
                                     <?php if ($addToBlock = $block->getChildBlock('addto')): ?>
-                                        <?php echo $addToBlock->setProduct($_product)->getChildHtml(); ?>
+                                        <?= $addToBlock->setProduct($_product)->getChildHtml() ?>
                                     <?php endif; ?>
                                 </div>
                             </div>
                             <?php if ($showDescription):?>
                                 <div class="product description product-item-description">
-                                    <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
-                                    <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>" title="<?php /* @escapeNotVerified */ echo $_productNameStripped ?>"
-                                       class="action more"><?php /* @escapeNotVerified */ echo __('Learn More') ?></a>
+                                    <?= /* @escapeNotVerified */ $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
+                                    <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" title="<?= /* @escapeNotVerified */ $_productNameStripped ?>"
+                                       class="action more"><?= /* @escapeNotVerified */ __('Learn More') ?></a>
                                 </div>
                             <?php endif; ?>
                         </div>
@@ -115,7 +115,7 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
             <?php endforeach; ?>
         </ol>
     </div>
-    <?php echo $block->getToolbarHtml() ?>
+    <?= $block->getToolbarHtml() ?>
     <?php if (!$block->isRedirectToCartEnabled()) : ?>
         <script type="text/x-magento-init">
         {
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
index 3d1cb88cac4d8..28fa38a63e3d4 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
@@ -155,24 +155,24 @@ switch ($type = $block->getType()) {
 
     <?php if ($type == 'related' || $type == 'upsell'): ?>
         <?php if ($type == 'related'): ?>
-            <div class="block <?php /* @escapeNotVerified */ echo $class; ?>" data-mage-init='{"relatedProducts":{"relatedCheckbox":".related.checkbox"}}' data-limit="<?php /* @escapeNotVerified */ echo $limit; ?>" data-shuffle="<?php /* @escapeNotVerified */ echo $shuffle; ?>">
+            <div class="block <?= /* @escapeNotVerified */ $class ?>" data-mage-init='{"relatedProducts":{"relatedCheckbox":".related.checkbox"}}' data-limit="<?= /* @escapeNotVerified */ $limit ?>" data-shuffle="<?= /* @escapeNotVerified */ $shuffle ?>">
         <?php else: ?>
-            <div class="block <?php /* @escapeNotVerified */ echo $class; ?>" data-mage-init='{"upsellProducts":{}}' data-limit="<?php /* @escapeNotVerified */ echo $limit; ?>" data-shuffle="<?php /* @escapeNotVerified */ echo $shuffle; ?>">
+            <div class="block <?= /* @escapeNotVerified */ $class ?>" data-mage-init='{"upsellProducts":{}}' data-limit="<?= /* @escapeNotVerified */ $limit ?>" data-shuffle="<?= /* @escapeNotVerified */ $shuffle ?>">
         <?php endif; ?>
     <?php else: ?>
-        <div class="block <?php /* @escapeNotVerified */ echo $class; ?>">
+        <div class="block <?= /* @escapeNotVerified */ $class ?>">
     <?php endif; ?>
     <div class="block-title title">
-        <strong id="block-<?php /* @escapeNotVerified */ echo $class?>-heading" role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
+        <strong id="block-<?= /* @escapeNotVerified */ $class ?>-heading" role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
     </div>
-    <div class="block-content content" aria-labelledby="block-<?php /* @escapeNotVerified */ echo $class?>-heading">
+    <div class="block-content content" aria-labelledby="block-<?= /* @escapeNotVerified */ $class ?>-heading">
         <?php if ($type == 'related' && $canItemsAddToCart): ?>
         <div class="block-actions">
-            <?php /* @escapeNotVerified */ echo __('Check items to add to the cart or') ?>
-            <button type="button" class="action select" role="select-all"><span><?php /* @escapeNotVerified */ echo __('select all') ?></span></button>
+            <?= /* @escapeNotVerified */ __('Check items to add to the cart or') ?>
+            <button type="button" class="action select" role="select-all"><span><?= /* @escapeNotVerified */ __('select all') ?></span></button>
         </div>
         <?php endif; ?>
-        <div class="products wrapper grid products-grid products-<?php /* @escapeNotVerified */ echo $type; ?>">
+        <div class="products wrapper grid products-grid products-<?= /* @escapeNotVerified */ $type ?>">
             <ol class="products list items product-items">
                 <?php foreach ($items as $_item): ?>
                 <?php $available = ''; ?>
@@ -186,27 +186,27 @@ switch ($type = $block->getType()) {
                 <?php else: ?>
                     <li class="item product product-item">
                 <?php endif; ?>
-                <div class="product-item-info <?php /* @escapeNotVerified */ echo $available; ?>">
-                    <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
-                    <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product photo product-item-photo">
-                        <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                <div class="product-item-info <?= /* @escapeNotVerified */ $available ?>">
+                    <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
+                    <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product photo product-item-photo">
+                        <?= $block->getImage($_item, $image)->toHtml() ?>
                     </a>
                     <div class="product details product-item-details">
-                        <strong class="product name product-item-name"><a class="product-item-link" title="<?php echo $block->escapeHtml($_item->getName()) ?>" href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>">
-                            <?php echo $block->escapeHtml($_item->getName()) ?></a>
+                        <strong class="product name product-item-name"><a class="product-item-link" title="<?= $block->escapeHtml($_item->getName()) ?>" href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>">
+                            <?= $block->escapeHtml($_item->getName()) ?></a>
                         </strong>
 
-                        <?php /* @escapeNotVerified */ echo $block->getProductPrice($_item); ?>
+                        <?= /* @escapeNotVerified */ $block->getProductPrice($_item) ?>
 
                             <?php if ($templateType): ?>
-                                <?php echo $block->getReviewsSummaryHtml($_item, $templateType) ?>
+                                <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
                             <?php endif; ?>
 
                             <?php if (!$_item->isComposite() && $_item->isSaleable() && $type == 'related'): ?>
                                 <?php if (!$_item->getRequiredOptions()): ?>
                                     <div class="field choice related">
-                                        <input type="checkbox" class="checkbox related" id="related-checkbox<?php /* @escapeNotVerified */ echo $_item->getId() ?>" name="related_products[]" value="<?php /* @escapeNotVerified */ echo $_item->getId() ?>" />
-                                        <label class="label" for="related-checkbox<?php /* @escapeNotVerified */ echo $_item->getId() ?>"><span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span></label>
+                                        <input type="checkbox" class="checkbox related" id="related-checkbox<?= /* @escapeNotVerified */ $_item->getId() ?>" name="related_products[]" value="<?= /* @escapeNotVerified */ $_item->getId() ?>" />
+                                        <label class="label" for="related-checkbox<?= /* @escapeNotVerified */ $_item->getId() ?>"><span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span></label>
                                     </div>
                                 <?php endif; ?>
                             <?php endif; ?>
@@ -217,24 +217,24 @@ switch ($type = $block->getType()) {
                                         <div class="actions-primary">
                                             <?php if ($_item->isSaleable()): ?>
                                                 <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                    <button class="action tocart primary" data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}' type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                    <button class="action tocart primary" data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}' type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                     </button>
                                                 <?php else: ?>
                                                     <?php $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
                                                     $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
                                                     ?>
                                                     <button class="action tocart primary"
-                                                            data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                            type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                            data-post='<?= /* @escapeNotVerified */ $postData ?>'
+                                                            type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                     </button>
                                                 <?php endif; ?>
                                             <?php else: ?>
                                                 <?php if ($_item->getIsSalable()): ?>
-                                                    <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                                    <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                                 <?php else: ?>
-                                                    <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                    <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                                 <?php endif; ?>
                                             <?php endif; ?>
                                         </div>
@@ -243,7 +243,7 @@ switch ($type = $block->getType()) {
                                     <?php if ($showAddTo): ?>
                                         <div class="secondary-addto-links actions-secondary" data-role="add-to-links">
                                             <?php if ($addToBlock = $block->getChildBlock('addto')): ?>
-                                                <?php echo $addToBlock->setProduct($_item)->getChildHtml(); ?>
+                                                <?= $addToBlock->setProduct($_item)->getChildHtml() ?>
                                             <?php endif; ?>
                                         </div>
                                     <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
index 27907bf5ebe95..253bf0bcb8020 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
@@ -20,10 +20,10 @@ $_productCollection = $block->getLoadedProductCollection();
 $_helper = $this->helper('Magento\Catalog\Helper\Output');
 ?>
 <?php if (!$_productCollection->count()): ?>
-<p class="message note"><?php /* @escapeNotVerified */ echo __('We can\'t find products matching the selection.') ?></p>
+<p class="message note"><?= /* @escapeNotVerified */ __('We can\'t find products matching the selection.') ?></p>
 <?php else: ?>
-<?php echo $block->getToolbarHtml() ?>
-<?php echo $block->getAdditionalHtml() ?>
+<?= $block->getToolbarHtml() ?>
+<?= $block->getAdditionalHtml() ?>
 <?php
     if ($block->getMode() == 'grid') {
         $viewMode = 'grid';
@@ -37,14 +37,14 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
         $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::FULL_VIEW;
     }
 ?>
-<div class="products wrapper <?php /* @escapeNotVerified */ echo $viewMode; ?>">
+<div class="products wrapper <?= /* @escapeNotVerified */ $viewMode ?>">
     <ol class="products list items">
         <?php foreach ($_productCollection as $_product): ?>
             <li class="item product">
                 <div class="product">
                     <?php // Product Image ?>
-                    <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>" class="product photo">
-                        <?php echo $block->getImage($_product, $image)->toHtml(); ?>
+                    <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" class="product photo">
+                        <?= $block->getImage($_product, $image)->toHtml() ?>
                     </a>
                     <div class="product details">
                     <?php
@@ -95,6 +95,6 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
         <?php endforeach; ?>
     </ol>
 </div>
-<?php echo $block->getToolbarHtml() ?>
+<?= $block->getToolbarHtml() ?>
 <?php endif; ?>
-<?php /* @escapeNotVerified */ echo $time_taken = microtime(true) - $start; ?>
+<?= /* @escapeNotVerified */ $time_taken = microtime(true) - $start ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
index b5f7d2e1559f0..929d7b267445a 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
@@ -10,54 +10,54 @@
 <?php if (($_products = $block->getProductCollection()) && $_products->getSize()): ?>
     <div class="block widget block-new-products-list">
         <div class="block-title">
-            <strong><?php /* @escapeNotVerified */ echo __('New Products') ?></strong>
+            <strong><?= /* @escapeNotVerified */ __('New Products') ?></strong>
         </div>
         <div class="block-content">
             <?php $suffix = $block->getNameInLayout(); ?>
-            <ol class="product-items" id="widget-new-products-<?php /* @escapeNotVerified */ echo $suffix; ?>">
+            <ol class="product-items" id="widget-new-products-<?= /* @escapeNotVerified */ $suffix ?>">
                 <?php foreach ($_products->getItems() as $_product): ?>
                     <li class="product-item">
                         <div class="product-item-info">
-                            <a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                               title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>">
-                                <?php echo $block->getImage($_product, 'side_column_widget_product_thumbnail')->toHtml(); ?>
+                            <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
+                               title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
+                                <?= $block->getImage($_product, 'side_column_widget_product_thumbnail')->toHtml() ?>
                             </a>
                             <div class="product-item-details">
                                 <strong class="product-item-name">
-                                    <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                                       title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>)" class="product-item-link">
-                                        <?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                                    <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
+                                       title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>)" class="product-item-link">
+                                        <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
                                     </a>
                                 </strong>
-                                <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml($_product, '-widget-new-' . $suffix) ?>
+                                <?= /* @escapeNotVerified */ $block->getProductPriceHtml($_product, '-widget-new-' . $suffix) ?>
                                 <div class="product-item-actions">
                                     <div class="actions-primary">
                                         <?php if ($_product->isSaleable()): ?>
                                             <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
-                                                <button type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>"
+                                                <button type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>"
                                                         class="action tocart primary"
-                                                        data-mage-init='{"redirectUrl":{"url":"<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_product) ?>"}}'>
-                                                    <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                        data-mage-init='{"redirectUrl":{"url":"<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_product) ?>"}}'>
+                                                    <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                 </button>
                                             <?php else: ?>
                                                 <?php
                                                     $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
                                                     $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()]);
                                             ?>
-                                                <button type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>"
+                                                <button type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>"
                                                         class="action tocart primary"
-                                                        data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'>
-                                                    <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                        data-post='<?= /* @escapeNotVerified */ $postData ?>'>
+                                                    <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                 </button>
                                             <?php endif; ?>
                                         <?php else: ?>
                                             <?php if ($_product->getIsSalable()): ?>
-                                                <div class="stock available" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
-                                                    <span><?php /* @escapeNotVerified */ echo __('In stock') ?></span>
+                                                <div class="stock available" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
+                                                    <span><?= /* @escapeNotVerified */ __('In stock') ?></span>
                                                 </div>
                                             <?php else: ?>
-                                                <div class="stock unavailable" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
-                                                    <span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span>
+                                                <div class="stock unavailable" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
+                                                    <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
                                                 </div>
                                             <?php endif; ?>
                                         <?php endif; ?>
@@ -68,7 +68,7 @@
                     </li>
                 <?php endforeach; ?>
             </ol>
-            <?php echo $block->getPagerHtml() ?>
+            <?= $block->getPagerHtml() ?>
         </div>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
index 342613f5efcb4..c724291cc9033 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
@@ -31,26 +31,26 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
 ?>
 
 <?php if ($exist):?>
-    <div class="block widget block-new-products <?php /* @escapeNotVerified */ echo $mode; ?>">
+    <div class="block widget block-new-products <?= /* @escapeNotVerified */ $mode ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
+            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
         </div>
         <div class="block-content">
-            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
-                <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
+            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
+            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
+                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
                     <?php foreach ($items as $_item): ?>
                     <li class="product-item">
                         <div class="product-item-info">
-                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                            <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
+                                <?= $block->getImage($_item, $image)->toHtml() ?>
                             </a>
                             <div class="product-item-details">
                                 <strong class="product-item-name">
-                                    <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
+                                    <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                       href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
                                        class="product-item-link">
-                                        <?php echo $block->escapeHtml($_item->getName()) ?>
+                                        <?= $block->escapeHtml($_item->getName()) ?>
                                     </a>
                                 </strong>
                                 <?php
@@ -58,7 +58,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                 ?>
 
                                 <?php if ($templateType): ?>
-                                    <?php echo $block->getReviewsSummaryHtml($_item, $templateType) ?>
+                                    <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
                                 <?php endif; ?>
 
                                 <?php if ($showWishlist || $showCompare || $showCart): ?>
@@ -68,9 +68,9 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                 <?php if ($_item->isSaleable()): ?>
                                                     <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
                                                         <button class="action tocart primary"
-                                                                data-mage-init='{"redirectUrl":{"url":"<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                data-mage-init='{"redirectUrl":{"url":"<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
+                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                         </button>
                                                     <?php else: ?>
                                                         <?php
@@ -78,16 +78,16 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                             $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
                                                         ?>
                                                         <button class="action tocart primary"
-                                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                data-post='<?= /* @escapeNotVerified */ $postData ?>'
+                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                         </button>
                                                     <?php endif; ?>
                                                 <?php else: ?>
                                                     <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                                        <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                                     <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                        <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                                     <?php endif; ?>
                                                 <?php endif; ?>
                                             </div>
@@ -96,18 +96,18 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                             <div class="actions-secondary" data-role="add-to-links">
                                                 <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
                                                     <a href="#"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
+                                                       data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
                                                        class="action towishlist" data-action="add-to-wishlist"
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                                                       title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
+                                                        <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                                 <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
                                                     <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
                                                     <a href="#" class="action tocompare"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+                                                       data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
+                                                       title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
+                                                        <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                             </div>
@@ -120,7 +120,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                     <?php endforeach ?>
                 </ol>
             </div>
-            <?php echo $block->getPagerHtml() ?>
+            <?= $block->getPagerHtml() ?>
         </div>
     </div>
 <?php endif;?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
index 125e92683be9f..dcb0ca276112d 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
@@ -32,32 +32,32 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
 ?>
 
 <?php if ($exist):?>
-    <div class="block widget block-new-products <?php /* @escapeNotVerified */ echo $mode; ?>">
+    <div class="block widget block-new-products <?= /* @escapeNotVerified */ $mode ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
+            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
         </div>
         <div class="block-content">
-            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
-                <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
+            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
+            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
+                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
                     <?php foreach ($items as $_item): ?>
                         <li class="product-item">
                             <div class="product-item-info">
-                                <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                    <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                                <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
+                                    <?= $block->getImage($_item, $image)->toHtml() ?>
                                 </a>
                                 <div class="product-item-details">
                                     <strong class="product-item-name">
-                                        <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                           href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
+                                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                           href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
                                            class="product-item-link">
-                                            <?php echo $block->escapeHtml($_item->getName()) ?>
+                                            <?= $block->escapeHtml($_item->getName()) ?>
                                         </a>
                                     </strong>
-                                    <?php echo $block->getProductPriceHtml($_item, $type); ?>
+                                    <?= $block->getProductPriceHtml($_item, $type) ?>
     
                                     <?php if ($templateType): ?>
-                                        <?php echo $block->getReviewsSummaryHtml($_item, $templateType) ?>
+                                        <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
                                     <?php endif; ?>
     
                                     <?php if ($showWishlist || $showCompare || $showCart): ?>
@@ -67,9 +67,9 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                     <?php if ($_item->isSaleable()): ?>
                                                         <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
                                                             <button class="action tocart primary"
-                                                                    data-mage-init='{"redirectUrl":{"url":"<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                    data-mage-init='{"redirectUrl":{"url":"<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
+                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                             </button>
                                                         <?php else: ?>
                                                             <?php
@@ -77,16 +77,16 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                                 $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
                                                             ?>
                                                             <button class="action tocart primary"
-                                                                    data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                    data-post='<?= /* @escapeNotVerified */ $postData ?>'
+                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                             </button>
                                                         <?php endif; ?>
                                                     <?php else: ?>
                                                         <?php if ($_item->getIsSalable()): ?>
-                                                            <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                                            <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                                         <?php else: ?>
-                                                            <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                            <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                                         <?php endif; ?>
                                                     <?php endif; ?>
                                                 </div>
@@ -95,18 +95,18 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                 <div class="actions-secondary" data-role="add-to-links">
                                                     <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
                                                         <a href="#"
-                                                           data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
+                                                           data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
                                                            class="action towishlist" data-action="add-to-wishlist"
-                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                                                           title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
                                                         </a>
                                                     <?php endif; ?>
                                                     <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
                                                         <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare'); ?>
                                                         <a href="#" class="action tocompare"
-                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>"
-                                                           data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'>
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+                                                           title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>"
+                                                           data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'>
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
                                                         </a>
                                                     <?php endif; ?>
                                                 </div>
@@ -115,10 +115,10 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                     <?php endif; ?>
                                     <?php if ($description):?>
                                         <div class="product-item-description">
-                                            <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
-                                            <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                               href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
-                                               class="action more"><?php /* @escapeNotVerified */ echo __('Learn More') ?></a>
+                                            <?= /* @escapeNotVerified */ $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
+                                            <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                               href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
+                                               class="action more"><?= /* @escapeNotVerified */ __('Learn More') ?></a>
                                         </div>
                                     <?php endif; ?>
                                 </div>
@@ -127,7 +127,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                     <?php endforeach ?>
                 </ol>
             </div>
-            <?php echo $block->getPagerHtml() ?>
+            <?= $block->getPagerHtml() ?>
         </div>
     </div>
 <?php endif;?>
diff --git a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
index 9976d6fa6bdd6..4b6ee10077f70 100644
--- a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
+++ b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
@@ -23,28 +23,28 @@
     $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::DEFAULT_VIEW;
     $description = false;
 ?>
-    <div class="block widget block-products-list <?php /* @noEscape */ echo $mode; ?>">
+    <div class="block widget block-products-list <?= /* @noEscape */ $mode ?>">
         <?php if ($block->getTitle()): ?>
         <div class="block-title">
-            <strong><?php echo $block->escapeHtml(__($block->getTitle())); ?></strong>
+            <strong><?= $block->escapeHtml(__($block->getTitle())) ?></strong>
         </div>
         <?php endif ?>
         <div class="block-content">
-            <?php /* @noEscape */ echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php /* @noEscape */ echo $mode; ?> <?php /* @noEscape */ echo $mode; ?>">
-                <ol class="product-items <?php /* @noEscape */ echo $type; ?>">
+            <?= /* @noEscape */ '<!-- ' . $image . '-->' ?>
+            <div class="products-<?= /* @noEscape */ $mode ?> <?= /* @noEscape */ $mode ?>">
+                <ol class="product-items <?= /* @noEscape */ $type ?>">
                     <?php foreach ($items as $_item): ?>
                         <li class="product-item">
                             <div class="product-item-info">
-                                <a href="<?php echo $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
-                                    <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                                <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
+                                    <?= $block->getImage($_item, $image)->toHtml() ?>
                                 </a>
                                 <div class="product-item-details">
                                     <strong class="product-item-name">
-                                        <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                           href="<?php echo $block->escapeUrl($block->getProductUrl($_item)) ?>"
+                                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                           href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
                                            class="product-item-link">
-                                            <?php echo $block->escapeHtml($_item->getName()) ?>
+                                            <?= $block->escapeHtml($_item->getName()) ?>
                                         </a>
                                     </strong>
                                     <?php
@@ -52,7 +52,7 @@
                                     ?>
 
                                     <?php if ($templateType): ?>
-                                        <?php echo $block->getReviewsSummaryHtml($_item, $templateType) ?>
+                                        <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
                                     <?php endif; ?>
 
                                     <?php if ($showWishlist || $showCompare || $showCart): ?>
@@ -61,23 +61,23 @@
                                                 <div class="actions-primary">
                                                     <?php if ($_item->isSaleable()): ?>
                                                         <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                            <button class="action tocart primary" data-mage-init='{"redirectUrl":{"url":"<?php echo $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?php echo $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                                <span><?php echo $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                            <button class="action tocart primary" data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                                                             </button>
                                                         <?php else: ?>
                                                             <?php
                                                                 $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
                                                                 $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
                                                             ?>
-                                                            <button class="action tocart primary" data-post='<?php /* @noEscape */ echo $postData; ?>' type="button" title="<?php echo $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                                <span><?php echo $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                            <button class="action tocart primary" data-post='<?= /* @noEscape */ $postData ?>' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                                                             </button>
                                                         <?php endif; ?>
                                                     <?php else: ?>
                                                         <?php if ($_item->getIsSalable()): ?>
-                                                            <div class="stock available"><span><?php echo $block->escapeHtml(__('In stock')) ?></span></div>
+                                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
                                                         <?php else: ?>
-                                                            <div class="stock unavailable"><span><?php echo $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
                                                         <?php endif; ?>
                                                     <?php endif; ?>
                                                 </div>
@@ -86,14 +86,14 @@
                                                 <div class="actions-secondary" data-role="add-to-links">
                                                     <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
                                                         <a href="#"
-                                                           data-post='<?php /* @noEscape */ echo $block->getAddToWishlistParams($_item); ?>' class="action towishlist" data-action="add-to-wishlist" title="<?php echo $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
-                                                            <span><?php echo $block->escapeHtml(__('Add to Wish List')) ?></span>
+                                                           data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>' class="action towishlist" data-action="add-to-wishlist" title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
                                                         </a>
                                                     <?php endif; ?>
                                                     <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
                                                         <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-                                                        <a href="#" class="action tocompare" data-post='<?php /* @noEscape */ echo $compareHelper->getPostDataParams($_item);?>' title="<?php echo $block->escapeHtmlAttr(__('Add to Compare')) ?>">
-                                                            <span><?php echo $block->escapeHtml(__('Add to Compare')) ?></span>
+                                                        <a href="#" class="action tocompare" data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>' title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
                                                         </a>
                                                     <?php endif; ?>
                                                 </div>
@@ -106,7 +106,7 @@
                     <?php endforeach ?>
                 </ol>
             </div>
-            <?php echo $block->getPagerHtml() ?>
+            <?= $block->getPagerHtml() ?>
         </div>
     </div>
 <?php endif;?>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml
index b6a76e945d0a2..5c6f9d2c64095 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml
@@ -26,25 +26,25 @@ if ($exist = $block->getRecentlyComparedProducts()) {
 }
 ?>
 <?php if ($exist): ?>
-<div class="block widget block-compared-products-<?php /* @escapeNotVerified */ echo $mode; ?>">
+<div class="block widget block-compared-products-<?= /* @escapeNotVerified */ $mode ?>">
     <div class="block-title">
-        <strong><?php /* @escapeNotVerified */ echo $title; ?></strong>
+        <strong><?= /* @escapeNotVerified */ $title ?></strong>
     </div>
     <div class="block-content">
         <?php $suffix = $block->getNameInLayout(); ?>
-        <ol class="product-items" id="widget-compared-<?php /* @escapeNotVerified */ echo $suffix; ?>">
+        <ol class="product-items" id="widget-compared-<?= /* @escapeNotVerified */ $suffix ?>">
             <?php foreach ($items as $_product): ?>
                 <li class="product-item">
                     <div class="product-item-info">
-                        <a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                           title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>">
-                            <?php echo $block->getImage($_product, $image)->toHtml(); ?>
+                        <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
+                           title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
+                            <?= $block->getImage($_product, $image)->toHtml() ?>
                         </a>
                         <div class="product-item-details">
                             <strong class="product-item-name">
-                                <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                                   title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>)">
-                                    <?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                                <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
+                                   title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>)">
+                                    <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
                                 </a>
                             </strong>
                             <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
@@ -60,9 +60,9 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                 <div class="actions-primary">
                                 <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
                                     <button class="action tocart primary"
-                                            data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_product) ?>"}}'
-                                            type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                        <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                            data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_product) ?>"}}'
+                                            type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                     </button>
                                 <?php else: ?>
                                     <?php
@@ -70,17 +70,17 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                     $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()])
                                     ?>
                                     <button class="action tocart primary"
-                                            data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                            type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                        <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                            data-post='<?= /* @escapeNotVerified */ $postData ?>'
+                                            type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                     </button>
                                 <?php endif; ?>
                                 </div>
                             <?php else: ?>
                                 <?php if ($_product->getIsSalable()): ?>
-                                    <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                    <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                 <?php else: ?>
-                                    <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                    <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                 <?php endif; ?>
                             <?php endif; ?>
                             </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
index 8d0a87fe615ab..d589682200557 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
@@ -29,25 +29,25 @@ if ($exist = $block->getRecentlyComparedProducts()) {
 ?>
 
 <?php if ($exist):?>
-    <div class="block widget block-compared-products-<?php /* @escapeNotVerified */ echo $mode; ?>">
+    <div class="block widget block-compared-products-<?= /* @escapeNotVerified */ $mode ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
+            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
         </div>
         <div class="block-content">
-            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
-                <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
+            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
+            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
+                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
                     <?php foreach ($items as $_item): ?>
                         <li class="product-item">
                             <div class="product-item-info">
-                                <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                    <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                                <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
+                                    <?= $block->getImage($_item, $image)->toHtml() ?>
                                 </a>
                                 <div class="product-item-details">
                                     <strong class="product-item-name">
-                                        <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                           href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
-                                            <?php echo $block->escapeHtml($_item->getName()) ?>
+                                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                           href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-link">
+                                            <?= $block->escapeHtml($_item->getName()) ?>
                                         </a>
                                     </strong>
                                     <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
@@ -59,7 +59,7 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                         ]
                                     ) ?>
                                     <?php if ($rating): ?>
-                                        <?php echo $block->getReviewsSummaryHtml($_item, $rating) ?>
+                                        <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
                                     <?php endif; ?>
                                     <?php if ($showWishlist || $showCompare || $showCart): ?>
                                         <div class="product-item-actions">
@@ -68,9 +68,9 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                                     <?php if ($_item->isSaleable()): ?>
                                                         <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
                                                             <button class="action tocart primary"
-                                                                    data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                    data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
+                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                             </button>
                                                         <?php else: ?>
                                                             <?php
@@ -78,16 +78,16 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                                                 $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
                                                             ?>
                                                             <button class="action tocart primary"
-                                                                    data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                    data-post='<?= /* @escapeNotVerified */ $postData ?>'
+                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                             </button>
                                                         <?php endif; ?>
                                                     <?php else: ?>
                                                         <?php if ($_item->getIsSalable()): ?>
-                                                            <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                                            <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                                         <?php else: ?>
-                                                            <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                            <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                                         <?php endif; ?>
                                                     <?php endif; ?>
                                                 </div>
@@ -97,19 +97,19 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                                 <div class="actions-secondary" data-role="add-to-links">
                                                     <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
                                                         <a href="#"
-                                                           data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
+                                                           data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
                                                            data-action="add-to-wishlist"
                                                            class="action towishlist"
-                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                                                           title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
                                                         </a>
                                                     <?php endif; ?>
                                                     <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
                                                         <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare'); ?>
                                                         <a href="#" class="action tocompare"
-                                                           data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
-                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+                                                           data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
+                                                           title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
                                                         </a>
                                                     <?php endif; ?>
                                                 </div>
@@ -122,7 +122,7 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                     <?php endforeach ?>
                 </ol>
             </div>
-            <?php echo $block->getPagerHtml() ?>
+            <?= $block->getPagerHtml() ?>
         </div>
     </div>
 <?php endif;?>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
index 0ddfc9d936a78..d6019551c7a3b 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
@@ -30,25 +30,25 @@ if ($exist = $block->getRecentlyComparedProducts()) {
 ?>
 
 <?php if ($exist):?>
-    <div class="block widget block-compared-products-<?php /* @escapeNotVerified */ echo $mode; ?>">
+    <div class="block widget block-compared-products-<?= /* @escapeNotVerified */ $mode ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
+            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
         </div>
         <div class="block-content">
-            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
-                <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
+            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
+            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
+                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
                     <?php foreach ($items as $_item): ?>
                         <li class="product-item">
                             <div class="product-item-info">
-                                <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                    <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                                <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
+                                    <?= $block->getImage($_item, $image)->toHtml() ?>
                                 </a>
                                 <div class="product-item-details">
                                     <strong class="product-item-name">
-                                        <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                           href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
-                                            <?php echo $block->escapeHtml($_item->getName()) ?>
+                                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                           href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-link">
+                                            <?= $block->escapeHtml($_item->getName()) ?>
                                         </a>
                                     </strong>
                                     <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
@@ -60,7 +60,7 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                         ]
                                     ) ?>
                                     <?php if ($rating): ?>
-                                        <?php echo $block->getReviewsSummaryHtml($_item, $rating) ?>
+                                        <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
                                     <?php endif; ?>
                                     <?php if ($showWishlist || $showCompare || $showCart): ?>
                                         <div class="product-item-actions">
@@ -69,9 +69,9 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                                     <?php if ($_item->isSaleable()): ?>
                                                         <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
                                                             <button class="action tocart primary"
-                                                                    data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                    data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
+                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                             </button>
                                                         <?php else: ?>
                                                             <?php
@@ -79,16 +79,16 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                                                 $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
                                                             ?>
                                                             <button class="action tocart primary"
-                                                                    data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                    data-post='<?= /* @escapeNotVerified */ $postData ?>'
+                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                             </button>
                                                         <?php endif; ?>
                                                     <?php else: ?>
                                                         <?php if ($_item->getIsSalable()): ?>
-                                                            <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                                            <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                                         <?php else: ?>
-                                                            <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                            <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                                         <?php endif; ?>
                                                     <?php endif; ?>
                                                 </div>
@@ -98,19 +98,19 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                                 <div class="actions-secondary" data-role="add-to-links">
                                                     <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
                                                         <a href="#"
-                                                           data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
+                                                           data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
                                                            data-action="add-to-wishlist"
                                                            class="action towishlist"
-                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                                                           title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
                                                         </a>
                                                     <?php endif; ?>
                                                     <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
                                                         <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
                                                         <a href="#" class="action tocompare"
-                                                           data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
-                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+                                                           data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
+                                                           title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
                                                         </a>
                                                     <?php endif; ?>
                                                 </div>
@@ -119,10 +119,10 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                     <?php endif; ?>
                                     <?php if ($description):?>
                                         <div class="product-item-description">
-                                            <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
-                                            <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                               href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
-                                               class="action more"><?php /* @escapeNotVerified */ echo __('Learn More') ?></a>
+                                            <?= /* @escapeNotVerified */ $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
+                                            <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                               href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
+                                               class="action more"><?= /* @escapeNotVerified */ __('Learn More') ?></a>
                                         </div>
                                     <?php endif; ?>
                                 </div>
@@ -131,7 +131,7 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                     <?php endforeach ?>
                 </ol>
             </div>
-            <?php echo $block->getPagerHtml() ?>
+            <?= $block->getPagerHtml() ?>
         </div>
     </div>
 <?php endif;?>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
index 3b84087284881..e50ef3ad65d21 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
@@ -31,26 +31,26 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
 }
 ?>
 <?php if ($exist): ?>
-<div class="block widget block-viewed-products-<?php /* @escapeNotVerified */ echo $mode; ?>">
+<div class="block widget block-viewed-products-<?= /* @escapeNotVerified */ $mode ?>">
     <div class="block-title">
-        <strong><?php /* @escapeNotVerified */ echo $title; ?></strong>
+        <strong><?= /* @escapeNotVerified */ $title ?></strong>
     </div>
     <div class="block-content">
         <?php $suffix = $block->getNameInLayout(); ?>
-        <ol class="product-items" id="widget-viewed-<?php /* @escapeNotVerified */ echo $suffix; ?>">
+        <ol class="product-items" id="widget-viewed-<?= /* @escapeNotVerified */ $suffix ?>">
             <?php foreach ($items as $_product): ?>
                 <li class="product-item">
                     <div class="product-item-info">
-                        <a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                           title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>">
-                            <?php echo $block->getImage($_product, $image)->toHtml(); ?>
+                        <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
+                           title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
+                            <?= $block->getImage($_product, $image)->toHtml() ?>
                         </a>
                         <div class="product-item-details">
                             <strong class="product-item-name">
-                                <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                                   title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>"
+                                <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
+                                   title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>"
                                    class="product-item-link">
-                                    <?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                                    <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
                                 </a>
                             </strong>
                             <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
@@ -66,25 +66,25 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                 <div class="actions-primary">
                                     <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
                                         <button class="action tocart primary"
-                                                data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_product) ?>"}}'
-                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_product) ?>"}}'
+                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                         </button>
                                     <?php else: ?>
                                         <?php
                                             $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
                                             $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()]);
                                         ?>
-                                        <button type="button" class="action tocart primary" data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'>
-                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                        <button type="button" class="action tocart primary" data-post='<?= /* @escapeNotVerified */ $postData ?>'>
+                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                         </button>
                                     <?php endif; ?>
                                 </div>
                                 <?php else: ?>
                                     <?php if ($_product->getIsSalable()): ?>
-                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                        <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                     <?php else: ?>
-                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                        <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                     <?php endif; ?>
                                 <?php endif; ?>
                             </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml
index e5b3b735edb10..27ba7d2240d4b 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml
@@ -30,15 +30,15 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
 <?php if ($exist): ?>
     <div class="block widget block-viewed-products-images">
         <div class="block-title">
-            <strong><?php /* @escapeNotVerified */ echo $title; ?></strong>
+            <strong><?= /* @escapeNotVerified */ $title ?></strong>
         </div>
         <div class="block-content">
             <?php $suffix = $block->getNameInLayout(); ?>
-            <ol id="widget-viewed-<?php /* @escapeNotVerified */ echo $suffix; ?>" class="product-items product-items-images">
+            <ol id="widget-viewed-<?= /* @escapeNotVerified */ $suffix ?>" class="product-items product-items-images">
                 <?php foreach ($items as $_product): ?>
                     <li class="product-item">
-                        <a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>" title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>">
-                            <?php echo $block->getImage($_product, $image)->toHtml(); ?>
+                        <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
+                            <?= $block->getImage($_product, $image)->toHtml() ?>
                         </a>
                     </li>
                 <?php endforeach; ?>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
index d2c694179eb0f..50d3c8a31c5e7 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
@@ -31,25 +31,25 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
 }
 ?>
 <?php if ($exist):?>
-    <div class="block widget block-viewed-products-<?php /* @escapeNotVerified */ echo $mode; ?>">
+    <div class="block widget block-viewed-products-<?= /* @escapeNotVerified */ $mode ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
+            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
         </div>
         <div class="block-content">
-            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
-                <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
+            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
+            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
+                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
                     <?php foreach ($items as $_item): ?>
                         <li class="product-item">
                             <div class="product-item-info">
-                                <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                    <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                                <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
+                                    <?= $block->getImage($_item, $image)->toHtml() ?>
                                 </a>
                                 <div class="product-item-details">
                                     <strong class="product-item-name">
-                                        <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                           href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
-                                            <?php echo $block->escapeHtml($_item->getName()) ?>
+                                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                           href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-link">
+                                            <?= $block->escapeHtml($_item->getName()) ?>
                                         </a>
                                     </strong>
                                     <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
@@ -61,7 +61,7 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                         ]
                                     ) ?>
                                     <?php if ($rating): ?>
-                                        <?php echo $block->getReviewsSummaryHtml($_item, $rating) ?>
+                                        <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
                                     <?php endif; ?>
                                     <?php if ($showWishlist || $showCompare || $showCart): ?>
                                         <div class="product-item-actions">
@@ -70,9 +70,9 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                                     <?php if ($_item->isSaleable()): ?>
                                                         <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
                                                             <button class="action tocart primary"
-                                                                    data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                    data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
+                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                             </button>
                                                         <?php else: ?>
                                                             <?php
@@ -80,16 +80,16 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                                                 $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
                                                             ?>
                                                             <button class="action tocart primary"
-                                                                    data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                    data-post='<?= /* @escapeNotVerified */ $postData ?>'
+                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                             </button>
                                                         <?php endif; ?>
                                                     <?php else: ?>
                                                         <?php if ($_item->getIsSalable()): ?>
-                                                            <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                                            <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                                         <?php else: ?>
-                                                            <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                            <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                                         <?php endif; ?>
                                                     <?php endif; ?>
                                                 </div>
@@ -99,17 +99,17 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                                     <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
                                                         <a href="#"
                                                            class="action towishlist" data-action="add-to-wishlist"
-                                                           data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
-                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                                                           data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
+                                                           title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
                                                         </a>
                                                     <?php endif; ?>
                                                     <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
                                                         <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
                                                         <a href="#" class="action tocompare"
-                                                           data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
-                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+                                                           data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
+                                                           title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
                                                         </a>
                                                     <?php endif; ?>
                                                 </div>
@@ -122,7 +122,7 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                     <?php endforeach ?>
                 </ol>
             </div>
-            <?php echo $block->getPagerHtml() ?>
+            <?= $block->getPagerHtml() ?>
         </div>
     </div>
 <?php endif;?>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
index 2a2700886a9d9..4ed0f8c47b8e7 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
@@ -33,25 +33,25 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
 ?>
 
 <?php if ($exist):?>
-    <div class="block widget block-viewed-products-<?php /* @escapeNotVerified */ echo $mode; ?>">
+    <div class="block widget block-viewed-products-<?= /* @escapeNotVerified */ $mode ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
+            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
         </div>
         <div class="block-content">
-            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
-                <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
+            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
+            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
+                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
                     <?php foreach ($items as $_item): ?>
                         <li class="product-item">
                             <div class="product-item-info">
-                                <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                    <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                                <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
+                                    <?= $block->getImage($_item, $image)->toHtml() ?>
                                 </a>
                                 <div class="product-item-details">
                                     <strong class="product-item-name">
-                                        <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                           href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
-                                            <?php echo $block->escapeHtml($_item->getName()) ?>
+                                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                           href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-link">
+                                            <?= $block->escapeHtml($_item->getName()) ?>
                                         </a>
                                     </strong>
                                     <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
@@ -63,7 +63,7 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                         ]
                                     ) ?>
                                     <?php if ($rating): ?>
-                                        <?php echo $block->getReviewsSummaryHtml($_item, $rating) ?>
+                                        <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
                                     <?php endif; ?>
                                     <?php if ($showWishlist || $showCompare || $showCart): ?>
                                         <div class="product-item-actions">
@@ -72,9 +72,9 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                                     <?php if ($_item->isSaleable()): ?>
                                                         <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
                                                             <button class="action tocart primary"
-                                                                    data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                    data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
+                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                             </button>
                                                         <?php else: ?>
                                                             <?php
@@ -82,16 +82,16 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                                                 $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()]);
                                                             ?>
                                                             <button class="action tocart primary"
-                                                                    data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                                    type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                    data-post='<?= /* @escapeNotVerified */ $postData ?>'
+                                                                    type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                             </button>
                                                             <?php endif; ?>
                                                     <?php else: ?>
                                                         <?php if ($_item->getIsSalable()): ?>
-                                                            <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                                            <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                                         <?php else: ?>
-                                                            <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                            <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                                         <?php endif; ?>
                                                     <?php endif; ?>
                                                 </div>
@@ -102,17 +102,17 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                                     <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
                                                         <a href="#"
                                                            class="action towishlist" data-action="add-to-wishlist"
-                                                           data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
-                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                                                           data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
+                                                           title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
                                                         </a>
                                                     <?php endif; ?>
                                                     <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
                                                         <?php  $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
                                                         <a href="#" class="action tocompare"
-                                                           data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
-                                                           title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+                                                           data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
+                                                           title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
                                                         </a>
                                                     <?php endif; ?>
                                                 </div>
@@ -121,10 +121,10 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                     <?php endif; ?>
                                     <?php if ($description):?>
                                         <div class="product-item-description">
-                                            <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
-                                            <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                               href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
-                                               class="action more"><?php /* @escapeNotVerified */ echo __('Learn More') ?></a>
+                                            <?= /* @escapeNotVerified */ $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
+                                            <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                               href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
+                                               class="action more"><?= /* @escapeNotVerified */ __('Learn More') ?></a>
                                         </div>
                                     <?php endif; ?>
                                 </div>
@@ -133,7 +133,7 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                     <?php endforeach ?>
                 </ol>
             </div>
-            <?php echo $block->getPagerHtml() ?>
+            <?= $block->getPagerHtml() ?>
         </div>
     </div>
 <?php endif;?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
index 38cda03093018..721a494770e38 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
@@ -16,7 +16,7 @@ $columns = $block->getColumns();
     <?php if (count($block->getItems())): ?>
     <ol class="product-items">
         <?php foreach ($block->getItems() as $item): ?>
-            <li data-row="product-item" class="product-item" id="item_<?php echo $block->escapeHtmlAttr($item->getId()) ?>">
+            <li data-row="product-item" class="product-item" id="item_<?= $block->escapeHtmlAttr($item->getId()) ?>">
                 <div class="product-item-info">
                     <?php foreach ($columns as $column): ?>
                         <?php $column->setItem($item); echo $column->toHtml($item);?>
@@ -27,11 +27,11 @@ $columns = $block->getColumns();
     </ol>
     <?php else: ?>
         <div class="message info empty">
-            <span><?php echo $block->escapeHtml(__('This Wish List has no Items'));?></span>
+            <span><?= $block->escapeHtml(__('This Wish List has no Items')) ?></span>
         </div>
     <?php endif; ?>
 </div>
 
 <?php foreach ($columns as $column): ?>
-    <?php echo $column->getAdditionalHtml();?>
+    <?= $column->getAdditionalHtml() ?>
 <?php endforeach; ?>