From f56b4ca1ea1b32c8e12cf4a9d293e726ec2fa981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Wed, 13 Nov 2019 15:36:28 +0100
Subject: [PATCH 01/19] M2C-22090 Translate wishlist and counter label in
 template

---
 .../Catalog/CustomerData/CompareProducts.php   |  1 -
 .../templates/product/compare/link.phtml       | 12 +++++++++++-
 .../templates/product/compare/sidebar.phtml    | 12 +++++++++++-
 .../Magento/Wishlist/CustomerData/Wishlist.php | 18 +-----------------
 .../view/frontend/templates/link.phtml         | 10 +++++++++-
 .../view/frontend/templates/sidebar.phtml      | 10 +++++++++-
 6 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/app/code/Magento/Catalog/CustomerData/CompareProducts.php b/app/code/Magento/Catalog/CustomerData/CompareProducts.php
index afbeab8c9070e..2c2715d46559e 100644
--- a/app/code/Magento/Catalog/CustomerData/CompareProducts.php
+++ b/app/code/Magento/Catalog/CustomerData/CompareProducts.php
@@ -47,7 +47,6 @@ public function getSectionData()
         $count = $this->helper->getItemCount();
         return [
             'count' => $count,
-            'countCaption' => $count == 1 ? __('1 item') : __('%1 items', $count),
             'listUrl' => $this->helper->getListUrl(),
             'items' => $count ? $this->getItems() : [],
         ];
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml
index 05a5649135ef5..5c0267bd339ca 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml
@@ -11,7 +11,17 @@
        data-bind="attr: {'href': compareProducts().listUrl}, css: {'no-display': !compareProducts().count}"
     >
         <?= $block->escapeHtml(__('Compare Products')) ?>
-        <span class="counter qty" data-bind="text: compareProducts().countCaption"></span>
+        <!-- ko if: compareProducts().count -->
+        <span class="counter qty">
+            <span data-bind="text: compareProducts().count"></span>
+            <!-- ko if: (compareProducts().count === 1) -->
+                <?= $block->escapeHtmlAttr(__(' item')) ?>
+            <!--/ko-->
+            <!-- ko if: (compareProducts().count > 1) -->
+                <?= $block->escapeHtmlAttr(__(' items')) ?>
+            <!--/ko-->
+        </span>
+        <!-- /ko -->
     </a>
 </li>
 <script type="text/x-magento-init">
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
index 809ddc5c61701..4979620c121b8 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
@@ -11,7 +11,17 @@
 <div class="block block-compare" data-bind="scope: 'compareProducts'" data-role="compare-products-sidebar">
     <div class="block-title">
         <strong id="block-compare-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Compare Products')) ?></strong>
-        <span class="counter qty no-display" data-bind="text: compareProducts().countCaption, css: {'no-display': !compareProducts().count}"></span>
+        <!-- ko if: compareProducts().count -->
+        <span class="counter qty no-display" data-bind="css: {'no-display': !compareProducts().count}">
+            <span data-bind="text: compareProducts().count"></span>
+            <!-- ko if: (compareProducts().count === 1) -->
+                <?= $block->escapeHtmlAttr(__(' item')) ?>
+            <!--/ko-->
+            <!-- ko if: (compareProducts().count > 1) -->
+                <?= $block->escapeHtmlAttr(__(' items')) ?>
+            <!--/ko-->
+        </span>
+        <!-- /ko -->
     </div>
     <!-- ko if: compareProducts().count -->
     <div class="block-content no-display" aria-labelledby="block-compare-heading" data-bind="css: {'no-display': !compareProducts().count}">
diff --git a/app/code/Magento/Wishlist/CustomerData/Wishlist.php b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
index ae54289d4b1c9..e16c4fbcfca7b 100644
--- a/app/code/Magento/Wishlist/CustomerData/Wishlist.php
+++ b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
@@ -84,23 +84,7 @@ public function getSectionData()
      */
     protected function getCounter()
     {
-        return $this->createCounter($this->wishlistHelper->getItemCount());
-    }
-
-    /**
-     * Create button label based on wishlist item quantity
-     *
-     * @param int $count
-     * @return \Magento\Framework\Phrase|null
-     */
-    protected function createCounter($count)
-    {
-        if ($count > 1) {
-            return __('%1 items', $count);
-        } elseif ($count == 1) {
-            return __('1 item');
-        }
-        return null;
+        return $this->wishlistHelper->getItemCount();
     }
 
     /**
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/link.phtml b/app/code/Magento/Wishlist/view/frontend/templates/link.phtml
index e3ef3cf4f009b..6c9b3a0b1ef81 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/link.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/link.phtml
@@ -9,7 +9,15 @@
 <li class="link wishlist" data-bind="scope: 'wishlist'">
     <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><?= $block->escapeHtml($block->getLabel()) ?>
         <!-- ko if: wishlist().counter -->
-        <span data-bind="text: wishlist().counter" class="counter qty"></span>
+        <span class="counter qty">
+            <span data-bind="text: wishlist().counter"></span>
+            <!-- ko if: (wishlist().counter === 1) -->
+                <?= $block->escapeHtmlAttr(__(' item')) ?>
+            <!--/ko-->
+            <!-- ko if: (wishlist().counter > 1) -->
+                <?= $block->escapeHtmlAttr(__(' items')) ?>
+            <!--/ko-->
+        </span>
         <!-- /ko -->
     </a>
 </li>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
index 6e678a8916372..d8189a712be7c 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
@@ -14,7 +14,15 @@ $wishlistHelper = $this->helper(\Magento\Wishlist\Helper\Data::class);
         <div class="block-title">
             <strong role="heading" aria-level="2"><?= $block->escapeHtml($block->getTitle()) ?></strong>
             <!-- ko if: wishlist().counter -->
-            <span data-bind="text: wishlist().counter" class="counter"></span>
+            <span class="counter no-display" data-bind="css: {'no-display': !wishlist().counter}">
+                <span data-bind="text: wishlist().counter"></span>
+                <!-- ko if: (wishlist().counter === 1) -->
+                    <?= $block->escapeHtmlAttr(__(' item')) ?>
+                <!--/ko-->
+                <!-- ko if: (wishlist().counter > 1) -->
+                    <?= $block->escapeHtmlAttr(__(' items')) ?>
+                <!--/ko-->
+            </span>
             <!-- /ko -->
         </div>
         <div class="block-content">

From 75784515b4f25cd14251bb7c6e541ee007e49c01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Thu, 14 Nov 2019 09:39:46 +0100
Subject: [PATCH 02/19] M2C-22090 Fix tests

---
 app/code/Magento/Catalog/CustomerData/CompareProducts.php  | 7 ++++++-
 .../Catalog/Test/Unit/CustomerData/CompareProductsTest.php | 3 ---
 app/code/Magento/Wishlist/CustomerData/Wishlist.php        | 4 +++-
 .../Wishlist/Test/Unit/CustomerData/WishlistTest.php       | 4 ++--
 .../Magento/Wishlist/view/frontend/templates/sidebar.phtml | 4 ++--
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Catalog/CustomerData/CompareProducts.php b/app/code/Magento/Catalog/CustomerData/CompareProducts.php
index 2c2715d46559e..ae2247a83292c 100644
--- a/app/code/Magento/Catalog/CustomerData/CompareProducts.php
+++ b/app/code/Magento/Catalog/CustomerData/CompareProducts.php
@@ -7,6 +7,9 @@
 
 use Magento\Customer\CustomerData\SectionSourceInterface;
 
+/**
+ * CompareProducts section
+ */
 class CompareProducts implements SectionSourceInterface
 {
     /**
@@ -40,7 +43,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSectionData()
     {
@@ -53,6 +56,8 @@ public function getSectionData()
     }
 
     /**
+     * Get items in Compare List
+     *
      * @return array
      */
     protected function getItems()
diff --git a/app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php b/app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php
index e30ddda0b70b9..a56ca89b1114b 100644
--- a/app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php
@@ -186,7 +186,6 @@ public function testGetSectionData()
         $this->assertEquals(
             [
                 'count' => $count,
-                'countCaption' =>  __('%1 items', $count),
                 'listUrl' => 'http://list.url',
                 'items' => [
                     [
@@ -231,7 +230,6 @@ public function testGetSectionDataNoItems()
         $this->assertEquals(
             [
                 'count' => $count,
-                'countCaption' =>  __('%1 items', $count),
                 'listUrl' => 'http://list.url',
                 'items' => []
             ],
@@ -269,7 +267,6 @@ public function testGetSectionDataSingleItem()
         $this->assertEquals(
             [
                 'count' => 1,
-                'countCaption' =>  __('1 item'),
                 'listUrl' => 'http://list.url',
                 'items' => [
                     [
diff --git a/app/code/Magento/Wishlist/CustomerData/Wishlist.php b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
index e16c4fbcfca7b..77f6907f39726 100644
--- a/app/code/Magento/Wishlist/CustomerData/Wishlist.php
+++ b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
@@ -68,7 +68,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSectionData()
     {
@@ -80,6 +80,8 @@ public function getSectionData()
     }
 
     /**
+     * Get number of wishlist items
+     *
      * @return string
      */
     protected function getCounter()
diff --git a/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php b/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php
index 4954712e5ff3b..b682c7946b556 100644
--- a/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php
@@ -97,7 +97,7 @@ public function testGetSectionData()
         $itemRemoveParams = ['remove_params'];
 
         $result = [
-            'counter' => __('1 item'),
+            'counter' => 1,
             'items' => [
                 [
                     'image' => [
@@ -286,7 +286,7 @@ public function testGetSectionDataWithTwoItems()
         $items = [$itemMock, $itemMock];
 
         $result = [
-            'counter' =>  __('%1 items', count($items)),
+            'counter' =>  2,
             'items' => [
                 [
                     'image' => [
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
index d8189a712be7c..98b16f11ddc83 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
@@ -7,7 +7,7 @@
 /** @var \Magento\Wishlist\Block\Customer\Sidebar $block */
 ?>
 <?php
-$wishlistHelper = $this->helper(\Magento\Wishlist\Helper\Data::class);
+$wishlistHelper = $block->helper(\Magento\Wishlist\Helper\Data::class);
 ?>
 <?php if ($wishlistHelper->isAllow()) : ?>
     <div class="block block-wishlist" data-bind="scope: 'wishlist'">
@@ -67,7 +67,7 @@ $wishlistHelper = $this->helper(\Magento\Wishlist\Helper\Data::class);
                 <div class="actions-toolbar no-display" data-bind="css: {'no-display': null}">
                     <div class="primary">
                         <a class="action details"
-                           href="<?= $block->escapeUrl($this->helper(\Magento\Wishlist\Helper\Data::class)->getListUrl()) ?>"
+                           href="<?= $block->escapeUrl($block->helper(\Magento\Wishlist\Helper\Data::class)->getListUrl()) ?>"
                            title="<?= $block->escapeHtmlAttr(__('Go to Wish List')) ?>"><span><?= $block->escapeHtml(__('Go to Wish List')) ?></span></a>
                     </div>
                 </div>

From dfd123dcc26f198d127d8db9d57ffbb26c417c9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Fri, 15 Nov 2019 11:31:11 +0100
Subject: [PATCH 03/19] M2C-22090 Fix tests

---
 .../Magento/Wishlist/view/frontend/templates/sidebar.phtml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
index 98b16f11ddc83..d8189a712be7c 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
@@ -7,7 +7,7 @@
 /** @var \Magento\Wishlist\Block\Customer\Sidebar $block */
 ?>
 <?php
-$wishlistHelper = $block->helper(\Magento\Wishlist\Helper\Data::class);
+$wishlistHelper = $this->helper(\Magento\Wishlist\Helper\Data::class);
 ?>
 <?php if ($wishlistHelper->isAllow()) : ?>
     <div class="block block-wishlist" data-bind="scope: 'wishlist'">
@@ -67,7 +67,7 @@ $wishlistHelper = $block->helper(\Magento\Wishlist\Helper\Data::class);
                 <div class="actions-toolbar no-display" data-bind="css: {'no-display': null}">
                     <div class="primary">
                         <a class="action details"
-                           href="<?= $block->escapeUrl($block->helper(\Magento\Wishlist\Helper\Data::class)->getListUrl()) ?>"
+                           href="<?= $block->escapeUrl($this->helper(\Magento\Wishlist\Helper\Data::class)->getListUrl()) ?>"
                            title="<?= $block->escapeHtmlAttr(__('Go to Wish List')) ?>"><span><?= $block->escapeHtml(__('Go to Wish List')) ?></span></a>
                     </div>
                 </div>

From 031353112347c5fa295cb4981d9eff393ae93516 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Fri, 15 Nov 2019 14:07:04 +0100
Subject: [PATCH 04/19] M2C-22090 Refactor $this->helper into $block functions

---
 .../Wishlist/Block/Customer/Sidebar.php       | 20 +++++++++++++++++++
 .../view/frontend/templates/sidebar.phtml     |  7 ++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Wishlist/Block/Customer/Sidebar.php b/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
index b260b8cc947f7..a526e20d8a03b 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
@@ -80,4 +80,24 @@ private function getPriceRender()
         }
         return $priceRender;
     }
+
+    /**
+     * Get Wishlist URL
+     *
+     * @return string
+     */
+    public function getWishlistUrl()
+    {
+        return $this->_getHelper()->getListUrl();
+    }
+
+    /**
+     * Check whether the Wishlist is allowed
+     *
+     * @return bool
+     */
+    public function isWishlistAllowed()
+    {
+        return $this->_getHelper()->isAllow();
+    }
 }
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
index d8189a712be7c..17e5b353db809 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
@@ -6,10 +6,7 @@
 
 /** @var \Magento\Wishlist\Block\Customer\Sidebar $block */
 ?>
-<?php
-$wishlistHelper = $this->helper(\Magento\Wishlist\Helper\Data::class);
-?>
-<?php if ($wishlistHelper->isAllow()) : ?>
+<?php if ($block->isWishlistAllowed()) : ?>
     <div class="block block-wishlist" data-bind="scope: 'wishlist'">
         <div class="block-title">
             <strong role="heading" aria-level="2"><?= $block->escapeHtml($block->getTitle()) ?></strong>
@@ -67,7 +64,7 @@ $wishlistHelper = $this->helper(\Magento\Wishlist\Helper\Data::class);
                 <div class="actions-toolbar no-display" data-bind="css: {'no-display': null}">
                     <div class="primary">
                         <a class="action details"
-                           href="<?= $block->escapeUrl($this->helper(\Magento\Wishlist\Helper\Data::class)->getListUrl()) ?>"
+                           href="<?= $block->escapeUrl($block->getWishlistUrl()) ?>"
                            title="<?= $block->escapeHtmlAttr(__('Go to Wish List')) ?>"><span><?= $block->escapeHtml(__('Go to Wish List')) ?></span></a>
                     </div>
                 </div>

From b2cc15f7add8b8e4845bdeec738b53071c469880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Fri, 15 Nov 2019 14:38:59 +0100
Subject: [PATCH 05/19] M2C-22090 Add short description to Sidebar Class

---
 app/code/Magento/Wishlist/Block/Customer/Sidebar.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Wishlist/Block/Customer/Sidebar.php b/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
index a526e20d8a03b..7237418047921 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
@@ -4,15 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Wishlist sidebar block
- */
 namespace Magento\Wishlist\Block\Customer;
 
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Pricing\Render;
 
 /**
+ * Wishlist Sidebar block
+ *
  * @api
  * @since 100.0.2
  */

From 6aa7ae7fa07893d8bc80494a19c80f71fa85d8b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Tue, 7 Jan 2020 11:33:17 +0100
Subject: [PATCH 06/19] M2C-22090 Add Sidebar ViewModel

---
 .../Wishlist/Block/Customer/Sidebar.php       | 20 --------
 .../Magento/Wishlist/ViewModel/Sidebar.php    | 48 +++++++++++++++++++
 .../Wishlist/view/frontend/layout/default.xml |  6 ++-
 .../view/frontend/templates/sidebar.phtml     |  9 ++--
 4 files changed, 59 insertions(+), 24 deletions(-)
 create mode 100644 app/code/Magento/Wishlist/ViewModel/Sidebar.php

diff --git a/app/code/Magento/Wishlist/Block/Customer/Sidebar.php b/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
index 7237418047921..f90039f2b99a0 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
@@ -79,24 +79,4 @@ private function getPriceRender()
         }
         return $priceRender;
     }
-
-    /**
-     * Get Wishlist URL
-     *
-     * @return string
-     */
-    public function getWishlistUrl()
-    {
-        return $this->_getHelper()->getListUrl();
-    }
-
-    /**
-     * Check whether the Wishlist is allowed
-     *
-     * @return bool
-     */
-    public function isWishlistAllowed()
-    {
-        return $this->_getHelper()->isAllow();
-    }
 }
diff --git a/app/code/Magento/Wishlist/ViewModel/Sidebar.php b/app/code/Magento/Wishlist/ViewModel/Sidebar.php
new file mode 100644
index 0000000000000..c7a4bfd9bb03b
--- /dev/null
+++ b/app/code/Magento/Wishlist/ViewModel/Sidebar.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Wishlist\ViewModel;
+
+use Magento\Wishlist\Helper\Data as WishlistHelper;
+
+/**
+ * ViewModel for Wishlist Url
+ */
+class Sidebar implements \Magento\Framework\View\Element\Block\ArgumentInterface
+{
+    /**
+     * @var WishlistHelper
+     */
+    protected $wishlistHelper;
+
+    /**
+     * @param WishlistHelper $wishlistHelper
+     */
+    public function __construct(WishlistHelper $wishlistHelper)
+    {
+        $this->wishlistHelper = $wishlistHelper;
+    }
+
+    /**
+     * Get Wishlist URL
+     *
+     * @return string
+     */
+    public function getWishlistUrl()
+    {
+        return $this->wishlistHelper->getListUrl();
+    }
+
+    /**
+     * Check whether the Wishlist is allowed
+     *
+     * @return bool
+     */
+    public function isWishlistAllowed()
+    {
+        return $this->wishlistHelper->isAllow();
+    }
+}
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/default.xml b/app/code/Magento/Wishlist/view/frontend/layout/default.xml
index c4f0d01707b20..da427ab014714 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/default.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/default.xml
@@ -18,7 +18,11 @@
             </block>
         </referenceBlock>
         <referenceContainer name="sidebar.additional">
-            <block class="Magento\Wishlist\Block\Customer\Sidebar" name="wishlist_sidebar" as="wishlist" template="Magento_Wishlist::sidebar.phtml" ifconfig="wishlist/general/show_in_sidebar"/>
+            <block class="Magento\Wishlist\Block\Customer\Sidebar" name="wishlist_sidebar" as="wishlist" template="Magento_Wishlist::sidebar.phtml" ifconfig="wishlist/general/show_in_sidebar">
+                <arguments>
+                    <argument name="sidebar_view_model" xsi:type="object">Magento\Wishlist\ViewModel\Sidebar</argument>
+                </arguments>
+            </block>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
index 17e5b353db809..c960ff661326e 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
@@ -3,10 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
+?>
+<?php
 /** @var \Magento\Wishlist\Block\Customer\Sidebar $block */
+/** @var \Magento\Wishlist\ViewModel\Sidebar $viewModel */
+$viewModel = $block->getData('sidebar_view_model');
 ?>
-<?php if ($block->isWishlistAllowed()) : ?>
+<?php if ($viewModel->isWishlistAllowed()) : ?>
     <div class="block block-wishlist" data-bind="scope: 'wishlist'">
         <div class="block-title">
             <strong role="heading" aria-level="2"><?= $block->escapeHtml($block->getTitle()) ?></strong>
@@ -64,7 +67,7 @@
                 <div class="actions-toolbar no-display" data-bind="css: {'no-display': null}">
                     <div class="primary">
                         <a class="action details"
-                           href="<?= $block->escapeUrl($block->getWishlistUrl()) ?>"
+                           href="<?= $block->escapeUrl($viewModel->getWishlistUrl()) ?>"
                            title="<?= $block->escapeHtmlAttr(__('Go to Wish List')) ?>"><span><?= $block->escapeHtml(__('Go to Wish List')) ?></span></a>
                     </div>
                 </div>

From 5f398d08167dcb4f7a15c5bce582ab116444fdc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Tue, 7 Jan 2020 13:54:54 +0100
Subject: [PATCH 07/19] M2C-22090 Add compare viewModel

---
 .../ViewModel/Product/Compare/Sidebar.php     | 39 +++++++++++++++++++
 .../Catalog/view/frontend/layout/default.xml  |  1 +
 .../templates/product/compare/sidebar.phtml   | 27 +++++++++----
 .../Magento/Wishlist/ViewModel/Sidebar.php    |  3 +-
 .../view/frontend/templates/sidebar.phtml     | 22 ++++++++---
 5 files changed, 78 insertions(+), 14 deletions(-)
 create mode 100644 app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php

diff --git a/app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php b/app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php
new file mode 100644
index 0000000000000..33e8e29a924ad
--- /dev/null
+++ b/app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Compare\ViewModel;
+
+use Magento\Catalog\Helper\Product\Compare as CompareHelper;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * ViewModel for Compare Product List
+ */
+class Sidebar implements ArgumentInterface
+{
+    /**
+     * @var CompareHelper
+     */
+    protected $compareHelper;
+
+    /**
+     * @param CompareHelper $compareHelper
+     */
+    public function __construct(CompareHelper $compareHelper)
+    {
+        $this->compareHelper = $compareHelper;
+    }
+
+    /**
+     * Get parameters to clear compare list
+     *
+     * @return string
+     */
+    public function getClearCompareListParameters()
+    {
+        return $this->compareHelper->getPostDataClearList();
+    }
+}
diff --git a/app/code/Magento/Catalog/view/frontend/layout/default.xml b/app/code/Magento/Catalog/view/frontend/layout/default.xml
index 3dff3e9b3c1f8..690310b4c1856 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/default.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/default.xml
@@ -56,6 +56,7 @@
                             </item>
                         </item>
                     </argument>
+                    <argument name="compare_view_model" xsi:type="object">Magento\Catalog\ViewModel\Product\Compare\Sidebar</argument>
                 </arguments>
             </block>
         </referenceContainer>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
index 4979620c121b8..cc95ae9168558 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
@@ -5,12 +5,17 @@
  */
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-
-/* @var $block \Magento\Framework\View\Element\Template */
+?>
+<?php
+/** @var \Magento\Framework\View\Element\Template $block */
+/** @var \Magento\Catalog\ViewModel\Product\Compare\Sidebar $viewModel */
+$viewModel = $block->getData('compare_view_model');
 ?>
 <div class="block block-compare" data-bind="scope: 'compareProducts'" data-role="compare-products-sidebar">
     <div class="block-title">
-        <strong id="block-compare-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Compare Products')) ?></strong>
+        <strong id="block-compare-heading" role="heading" aria-level="2">
+            <?= $block->escapeHtml(__('Compare Products')) ?>
+        </strong>
         <!-- ko if: compareProducts().count -->
         <span class="counter qty no-display" data-bind="css: {'no-display': !compareProducts().count}">
             <span data-bind="text: compareProducts().count"></span>
@@ -24,7 +29,9 @@
         <!-- /ko -->
     </div>
     <!-- ko if: compareProducts().count -->
-    <div class="block-content no-display" aria-labelledby="block-compare-heading" data-bind="css: {'no-display': !compareProducts().count}">
+    <div class="block-content no-display"
+         aria-labelledby="block-compare-heading"
+         data-bind="css: {'no-display': !compareProducts().count}">
         <ol id="compare-items" class="product-items product-items-names" data-bind="foreach: compareProducts().items">
                 <li class="product-item">
                     <input type="hidden" class="compare-item-id" data-bind="value: id"/>
@@ -41,12 +48,16 @@
         </ol>
         <div class="actions-toolbar">
             <div class="primary">
-                <a data-bind="attr: {'href': compareProducts().listUrl}" class="action compare primary"><span><?= $block->escapeHtml(__('Compare')) ?></span></a>
+                <a data-bind="attr: {'href': compareProducts().listUrl}"
+                   class="action compare primary">
+                   <span><?= $block->escapeHtml(__('Compare')) ?></span>
+                </a>
             </div>
             <div class="secondary">
-                <a id="compare-clear-all" href="#" class="action clear" data-post="<?=$block->escapeHtml(
-                    $this->helper(Magento\Catalog\Helper\Product\Compare::class)->getPostDataClearList()
-                ) ?>">
+                <a id="compare-clear-all"
+                   href="#"
+                   class="action clear"
+                   data-post="<?=$block->escapeHtml($viewModel->getClearCompareListParameters()) ?>">
                     <span><?= $block->escapeHtml(__('Clear All')) ?></span>
                 </a>
             </div>
diff --git a/app/code/Magento/Wishlist/ViewModel/Sidebar.php b/app/code/Magento/Wishlist/ViewModel/Sidebar.php
index c7a4bfd9bb03b..569ea18619997 100644
--- a/app/code/Magento/Wishlist/ViewModel/Sidebar.php
+++ b/app/code/Magento/Wishlist/ViewModel/Sidebar.php
@@ -7,11 +7,12 @@
 namespace Magento\Wishlist\ViewModel;
 
 use Magento\Wishlist\Helper\Data as WishlistHelper;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
 
 /**
  * ViewModel for Wishlist Url
  */
-class Sidebar implements \Magento\Framework\View\Element\Block\ArgumentInterface
+class Sidebar implements ArgumentInterface
 {
     /**
      * @var WishlistHelper
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
index c960ff661326e..bd7b0157832ab 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
@@ -9,7 +9,7 @@
 /** @var \Magento\Wishlist\ViewModel\Sidebar $viewModel */
 $viewModel = $block->getData('sidebar_view_model');
 ?>
-<?php if ($viewModel->isWishlistAllowed()) : ?>
+<?php if ($viewModel->isWishlistAllowed()): ?>
     <div class="block block-wishlist" data-bind="scope: 'wishlist'">
         <div class="block-title">
             <strong role="heading" aria-level="2"><?= $block->escapeHtml($block->getTitle()) ?></strong>
@@ -28,7 +28,9 @@ $viewModel = $block->getData('sidebar_view_model');
         <div class="block-content">
             <strong class="subtitle"><?= $block->escapeHtml(__('Last Added Items')) ?></strong>
             <!-- ko if: wishlist().counter -->
-                <ol class="product-items no-display" id="wishlist-sidebar" data-bind="foreach: wishlist().items, css: {'no-display': null}">
+                <ol class="product-items no-display"
+                    id="wishlist-sidebar"
+                    data-bind="foreach: wishlist().items, css: {'no-display': null}">
                     <li class="product-item">
                         <div class="product-item-info">
                             <a class="product-item-photo" data-bind="attr: { href: product_url, title: product_name }">
@@ -45,10 +47,18 @@ $viewModel = $block->getData('sidebar_view_model');
                                     <!-- ko if: product_is_saleable_and_visible -->
                                     <div class="actions-primary">
                                         <!-- ko if: product_has_required_options -->
-                                        <a href="#" data-bind="attr: {'data-post': add_to_cart_params}" class="action tocart primary"><span><?= $block->escapeHtml(__('Add to Cart')) ?></span></a>
+                                        <a href="#"
+                                           data-bind="attr: {'data-post': add_to_cart_params}"
+                                           class="action tocart primary">
+                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                        </a>
                                         <!-- /ko -->
                                         <!-- ko ifnot: product_has_required_options -->
-                                            <button type="button" class="action tocart primary" data-bind="attr: {'data-post': add_to_cart_params}"><span><?= $block->escapeHtml(__('Add to Cart')) ?></span></button>
+                                            <button type="button"
+                                                    class="action tocart primary"
+                                                    data-bind="attr: {'data-post': add_to_cart_params}">
+                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                            </button>
                                         <!-- /ko -->
                                     </div>
                                     <!-- /ko -->
@@ -68,7 +78,9 @@ $viewModel = $block->getData('sidebar_view_model');
                     <div class="primary">
                         <a class="action details"
                            href="<?= $block->escapeUrl($viewModel->getWishlistUrl()) ?>"
-                           title="<?= $block->escapeHtmlAttr(__('Go to Wish List')) ?>"><span><?= $block->escapeHtml(__('Go to Wish List')) ?></span></a>
+                           title="<?= $block->escapeHtmlAttr(__('Go to Wish List')) ?>">
+                           <span><?= $block->escapeHtml(__('Go to Wish List')) ?></span>
+                        </a>
                     </div>
                 </div>
             <!-- /ko -->

From a6f39798a79200235f1b0bd36a0b3f400e57face Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Tue, 7 Jan 2020 15:19:49 +0100
Subject: [PATCH 08/19] M2C-22090 Fix namespace

---
 app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php b/app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php
index 33e8e29a924ad..2e15875d0ff45 100644
--- a/app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php
+++ b/app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Compare\ViewModel;
+namespace Magento\Catalog\ViewModel;
 
 use Magento\Catalog\Helper\Product\Compare as CompareHelper;
 use Magento\Framework\View\Element\Block\ArgumentInterface;

From 94e66d97d4f794fba5b50b71caa0d92f4629cfd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Tue, 7 Jan 2020 15:21:28 +0100
Subject: [PATCH 09/19] M2C-22090 Fix namespace

---
 app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php b/app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php
index 2e15875d0ff45..9f95000d44f99 100644
--- a/app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php
+++ b/app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Catalog\ViewModel;
+namespace Magento\Catalog\ViewModel\Product\Compare;
 
 use Magento\Catalog\Helper\Product\Compare as CompareHelper;
 use Magento\Framework\View\Element\Block\ArgumentInterface;

From 75f14873c8216478a1890e8585bce0bddbb206b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Wed, 8 Jan 2020 11:02:21 +0100
Subject: [PATCH 10/19] M2C-22090 Use private modifier

---
 app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php | 2 +-
 app/code/Magento/Wishlist/ViewModel/Sidebar.php                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php b/app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php
index 9f95000d44f99..0815803a694f0 100644
--- a/app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php
+++ b/app/code/Magento/Catalog/ViewModel/Product/Compare/Sidebar.php
@@ -17,7 +17,7 @@ class Sidebar implements ArgumentInterface
     /**
      * @var CompareHelper
      */
-    protected $compareHelper;
+    private $compareHelper;
 
     /**
      * @param CompareHelper $compareHelper
diff --git a/app/code/Magento/Wishlist/ViewModel/Sidebar.php b/app/code/Magento/Wishlist/ViewModel/Sidebar.php
index 569ea18619997..e9ffbfb8a8356 100644
--- a/app/code/Magento/Wishlist/ViewModel/Sidebar.php
+++ b/app/code/Magento/Wishlist/ViewModel/Sidebar.php
@@ -17,7 +17,7 @@ class Sidebar implements ArgumentInterface
     /**
      * @var WishlistHelper
      */
-    protected $wishlistHelper;
+    private $wishlistHelper;
 
     /**
      * @param WishlistHelper $wishlistHelper

From 9e684f92c40aaf585e7c06ebd0c67b2b8e3c21ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?=
 <34317830+ptylek@users.noreply.github.com>
Date: Sat, 4 Apr 2020 16:06:15 +0200
Subject: [PATCH 11/19] Update Wishlist.php

Fix static test
---
 app/code/Magento/Wishlist/CustomerData/Wishlist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/CustomerData/Wishlist.php b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
index 088617c864773..4bb78b95c0898 100644
--- a/app/code/Magento/Wishlist/CustomerData/Wishlist.php
+++ b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
@@ -68,7 +68,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSectionData()
     {

From 5bb3c23c19b3846756ea5e53af24fe77a3aaca85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Sat, 4 Apr 2020 20:10:52 +0200
Subject: [PATCH 12/19] Fix integration test for WishList as counter now only
 returns a number

---
 .../Magento/Customer/Controller/Section/LoadTest.php          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php
index 0869832091fec..1c78b3395876d 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php
@@ -75,7 +75,7 @@ public function testWishListCounterUseQty(): void
     {
         $this->customerSession->setCustomerId(1);
         $response = $this->performWishListSectionRequest();
-        $this->assertEquals('3 items', $response['wishlist']['counter']);
+        $this->assertEquals('3', $response['wishlist']['counter']);
     }
 
     /**
@@ -88,7 +88,7 @@ public function testWishListCounterNotUseQty(): void
     {
         $this->customerSession->setCustomerId(1);
         $response = $this->performWishListSectionRequest();
-        $this->assertEquals('1 item', $response['wishlist']['counter']);
+        $this->assertEquals('1', $response['wishlist']['counter']);
     }
 
     /**

From baf5d263f3c7b430990512148a111eacf9b6cd84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Sat, 4 Apr 2020 20:13:24 +0200
Subject: [PATCH 13/19] Change counter to number in integration tests

---
 .../Magento/Customer/Controller/Section/LoadTest.php          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php
index 1c78b3395876d..19e7c0f5bc72c 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php
@@ -75,7 +75,7 @@ public function testWishListCounterUseQty(): void
     {
         $this->customerSession->setCustomerId(1);
         $response = $this->performWishListSectionRequest();
-        $this->assertEquals('3', $response['wishlist']['counter']);
+        $this->assertEquals(3, $response['wishlist']['counter']);
     }
 
     /**
@@ -88,7 +88,7 @@ public function testWishListCounterNotUseQty(): void
     {
         $this->customerSession->setCustomerId(1);
         $response = $this->performWishListSectionRequest();
-        $this->assertEquals('1', $response['wishlist']['counter']);
+        $this->assertEquals(1, $response['wishlist']['counter']);
     }
 
     /**

From 5e9f5aa659b25de1072dddb201fb7ef158dc94e0 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Fri, 10 Apr 2020 17:01:23 +0300
Subject: [PATCH 14/19] Fix static test

---
 .../Unit/CustomerData/CompareProductsTest.php | 51 ++++++++++++-------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php b/app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php
index c5825b2e4458b..f2926d7ae179b 100644
--- a/app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/CustomerData/CompareProductsTest.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Catalog\Test\Unit\CustomerData;
@@ -17,8 +16,10 @@
 use Magento\Catalog\Model\ResourceModel\Product\Compare\Item\Collection;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
-class CompareProductsTest extends \PHPUnit\Framework\TestCase
+class CompareProductsTest extends TestCase
 {
     /**
      * @var CompareProducts
@@ -26,27 +27,27 @@ class CompareProductsTest extends \PHPUnit\Framework\TestCase
     private $model;
 
     /**
-     * @var Compare|\PHPUnit_Framework_MockObject_MockObject
+     * @var ObjectManagerHelper
      */
-    private $helperMock;
+    private $objectManagerHelper;
 
     /**
-     * @var Url|\PHPUnit_Framework_MockObject_MockObject
+     * @var Compare|MockObject
      */
-    private $productUrlMock;
+    private $helperMock;
 
     /**
-     * @var Output|\PHPUnit_Framework_MockObject_MockObject
+     * @var Url|MockObject
      */
-    private $outputHelperMock;
+    private $productUrlMock;
 
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var Output|MockObject
      */
-    private $objectManagerHelper;
+    private $outputHelperMock;
 
     /**
-     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ScopeConfigInterface|MockObject
      */
     private $scopeConfigMock;
 
@@ -58,6 +59,9 @@ class CompareProductsTest extends \PHPUnit\Framework\TestCase
         ProductInterface::NAME => 'getName'
     ];
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -92,9 +96,9 @@ protected function setUp()
      * Prepare compare items collection.
      *
      * @param array $items
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return MockObject
      */
-    private function getItemCollectionMock(array $items) : \PHPUnit_Framework_MockObject_MockObject
+    private function getItemCollectionMock(array $items):MockObject
     {
         $itemCollectionMock = $this->getMockBuilder(Collection::class)
             ->disableOriginalConstructor()
@@ -113,7 +117,7 @@ private function getItemCollectionMock(array $items) : \PHPUnit_Framework_MockOb
      * @param array $dataSet
      * @return array
      */
-    private function prepareProductsWithCorrespondingMocks(array $dataSet) : array
+    private function prepareProductsWithCorrespondingMocks(array $dataSet):array
     {
         $items = [];
         $urlMap = [];
@@ -152,9 +156,9 @@ private function prepareProductsWithCorrespondingMocks(array $dataSet) : array
      * Prepare mock of product object.
      *
      * @param array $data
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return MockObject
      */
-    private function getProductMock(array $data) : \PHPUnit_Framework_MockObject_MockObject
+    private function getProductMock(array $data):MockObject
     {
         $product = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
@@ -169,7 +173,10 @@ private function getProductMock(array $data) : \PHPUnit_Framework_MockObject_Moc
         return $product;
     }
 
-    public function testGetSectionData()
+    /**
+     * @return void
+     */
+    public function testGetSectionData():void
     {
         $dataSet = [
             ['id' => 1, 'name' => 'product#1'],
@@ -227,7 +234,10 @@ public function testGetSectionData()
         );
     }
 
-    public function testGetSectionDataNoItems()
+    /**
+     * @return void
+     */
+    public function testGetSectionDataNoItems():void
     {
         $count = 0;
 
@@ -252,7 +262,10 @@ public function testGetSectionDataNoItems()
         );
     }
 
-    public function testGetSectionDataSingleItem()
+    /**
+     * @return void
+     */
+    public function testGetSectionDataSingleItem():void
     {
         $count = 1;
 

From f925a4d91dac4523c0095aea3f524727574c4713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Mon, 22 Jun 2020 14:35:23 +0200
Subject: [PATCH 15/19] M2C-22090 Move logic to js

---
 .../templates/product/compare/link.phtml         | 14 ++++++--------
 .../templates/product/compare/sidebar.phtml      | 10 ++--------
 .../frontend/web/js/view/compare-products.js     | 14 ++++++++++++--
 .../Wishlist/view/frontend/templates/link.phtml  | 14 ++++----------
 .../view/frontend/templates/sidebar.phtml        |  8 +-------
 .../view/frontend/web/js/view/wishlist.js        | 16 +++++++++++++---
 6 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml
index 5c0267bd339ca..a935c1148c708 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/link.phtml
@@ -13,17 +13,15 @@
         <?= $block->escapeHtml(__('Compare Products')) ?>
         <!-- ko if: compareProducts().count -->
         <span class="counter qty">
-            <span data-bind="text: compareProducts().count"></span>
-            <!-- ko if: (compareProducts().count === 1) -->
-                <?= $block->escapeHtmlAttr(__(' item')) ?>
-            <!--/ko-->
-            <!-- ko if: (compareProducts().count > 1) -->
-                <?= $block->escapeHtmlAttr(__(' items')) ?>
-            <!--/ko-->
+            <span data-bind="text: getCounterLabel()"></span>
         </span>
         <!-- /ko -->
     </a>
 </li>
 <script type="text/x-magento-init">
-{"[data-role=compare-products-link]": {"Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>}}
+{
+    "[data-role=compare-products-link]": {
+        "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
+    }
+}
 </script>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
index cc95ae9168558..10bd94dcbc824 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/sidebar.phtml
@@ -17,14 +17,8 @@ $viewModel = $block->getData('compare_view_model');
             <?= $block->escapeHtml(__('Compare Products')) ?>
         </strong>
         <!-- ko if: compareProducts().count -->
-        <span class="counter qty no-display" data-bind="css: {'no-display': !compareProducts().count}">
-            <span data-bind="text: compareProducts().count"></span>
-            <!-- ko if: (compareProducts().count === 1) -->
-                <?= $block->escapeHtmlAttr(__(' item')) ?>
-            <!--/ko-->
-            <!-- ko if: (compareProducts().count > 1) -->
-                <?= $block->escapeHtmlAttr(__(' items')) ?>
-            <!--/ko-->
+        <span class="counter no-display" data-bind="css: {'no-display': !compareProducts().count}">
+            <span data-bind="text: getCounterLabel()"></span>
         </span>
         <!-- /ko -->
     </div>
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/view/compare-products.js b/app/code/Magento/Catalog/view/frontend/web/js/view/compare-products.js
index 5b73f477dea63..5c333deee91ea 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/view/compare-products.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/view/compare-products.js
@@ -7,9 +7,10 @@ define([
     'uiComponent',
     'Magento_Customer/js/customer-data',
     'jquery',
+    'mage/translate',
     'mage/mage',
     'mage/decorate'
-], function (Component, customerData, $) {
+], function (Component, customerData, $, $t) {
     'use strict';
 
     var sidebarInitialized = false;
@@ -33,6 +34,15 @@ define([
             this.compareProducts = customerData.get('compare-products');
 
             initSidebar();
-        }
+        },
+        getCounterLabel: function () {
+            var counter = this.compareProducts().count;
+
+            if (counter === 1) {
+                return counter + ' ' + $t('item');
+            } else {
+                return $t('%1 items').replace('%1', counter);
+            }
+        },
     });
 });
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/link.phtml b/app/code/Magento/Wishlist/view/frontend/templates/link.phtml
index 6c9b3a0b1ef81..6adab82260ab8 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/link.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/link.phtml
@@ -9,21 +9,15 @@
 <li class="link wishlist" data-bind="scope: 'wishlist'">
     <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><?= $block->escapeHtml($block->getLabel()) ?>
         <!-- ko if: wishlist().counter -->
-        <span class="counter qty">
-            <span data-bind="text: wishlist().counter"></span>
-            <!-- ko if: (wishlist().counter === 1) -->
-                <?= $block->escapeHtmlAttr(__(' item')) ?>
-            <!--/ko-->
-            <!-- ko if: (wishlist().counter > 1) -->
-                <?= $block->escapeHtmlAttr(__(' items')) ?>
-            <!--/ko-->
-        </span>
+            <span class="counter qty">
+                <span data-bind="text: getCounterLabel()"></span>
+            </span>
         <!-- /ko -->
     </a>
 </li>
 <script type="text/x-magento-init">
     {
-        "*": {
+        ".wishlist.link": {
             "Magento_Ui/js/core/app": {
                 "components": {
                     "wishlist": {
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
index bd7b0157832ab..17d054c1946bd 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
@@ -15,13 +15,7 @@ $viewModel = $block->getData('sidebar_view_model');
             <strong role="heading" aria-level="2"><?= $block->escapeHtml($block->getTitle()) ?></strong>
             <!-- ko if: wishlist().counter -->
             <span class="counter no-display" data-bind="css: {'no-display': !wishlist().counter}">
-                <span data-bind="text: wishlist().counter"></span>
-                <!-- ko if: (wishlist().counter === 1) -->
-                    <?= $block->escapeHtmlAttr(__(' item')) ?>
-                <!--/ko-->
-                <!-- ko if: (wishlist().counter > 1) -->
-                    <?= $block->escapeHtmlAttr(__(' items')) ?>
-                <!--/ko-->
+                <span data-bind="text: getCounterLabel()"></span>
             </span>
             <!-- /ko -->
         </div>
diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/view/wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/view/wishlist.js
index 4e43591bd74a5..ffd5e68af28bd 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/js/view/wishlist.js
+++ b/app/code/Magento/Wishlist/view/frontend/web/js/view/wishlist.js
@@ -5,8 +5,9 @@
 
 define([
     'uiComponent',
-    'Magento_Customer/js/customer-data'
-], function (Component, customerData) {
+    'Magento_Customer/js/customer-data',
+    'mage/translate'
+], function (Component, customerData, $t) {
     'use strict';
 
     return Component.extend({
@@ -15,6 +16,15 @@ define([
             this._super();
 
             this.wishlist = customerData.get('wishlist');
-        }
+        },
+        getCounterLabel: function () {
+            var counter = this.wishlist().counter;
+
+            if (counter === 1) {
+                return counter + ' ' + $t('item');
+            } else {
+                return $t('%1 items').replace('%1', counter);
+            }
+        },
     });
 });

From 4ba36df529aa5e528130221f890abfd28b5b6958 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Thu, 9 Jul 2020 12:57:32 +0200
Subject: [PATCH 16/19] Fix static tests

---
 .../view/frontend/web/js/view/compare-products.js    | 12 +++++++++---
 .../Wishlist/view/frontend/web/js/view/wishlist.js   | 12 +++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/web/js/view/compare-products.js b/app/code/Magento/Catalog/view/frontend/web/js/view/compare-products.js
index 5c333deee91ea..50abdedcf8088 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/view/compare-products.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/view/compare-products.js
@@ -35,14 +35,20 @@ define([
 
             initSidebar();
         },
+
+        /**
+         * Get counter label
+         *
+         * @returns {String}
+         */
         getCounterLabel: function () {
             var counter = this.compareProducts().count;
 
             if (counter === 1) {
                 return counter + ' ' + $t('item');
-            } else {
-                return $t('%1 items').replace('%1', counter);
             }
-        },
+
+            return $t('%1 items').replace('%1', counter);
+        }
     });
 });
diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/view/wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/view/wishlist.js
index ffd5e68af28bd..f79e0fcc86a7b 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/js/view/wishlist.js
+++ b/app/code/Magento/Wishlist/view/frontend/web/js/view/wishlist.js
@@ -17,14 +17,20 @@ define([
 
             this.wishlist = customerData.get('wishlist');
         },
+
+        /**
+         * Get counter label
+         *
+         * @returns {String}
+         */
         getCounterLabel: function () {
             var counter = this.wishlist().counter;
 
             if (counter === 1) {
                 return counter + ' ' + $t('item');
-            } else {
-                return $t('%1 items').replace('%1', counter);
             }
-        },
+
+            return $t('%1 items').replace('%1', counter);
+        }
     });
 });

From 1d98cae2274deec7f80ad35cb7c18c183da89454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?=
 <34317830+ptylek@users.noreply.github.com>
Date: Mon, 12 Oct 2020 22:21:21 +0200
Subject: [PATCH 17/19] Update
 app/code/Magento/Wishlist/CustomerData/Wishlist.php

fix PAT scenario

Co-authored-by: Slava Mankivski <mankivsk@adobe.com>
---
 app/code/Magento/Wishlist/CustomerData/Wishlist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/CustomerData/Wishlist.php b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
index 4bb78b95c0898..93da206b9b2e6 100644
--- a/app/code/Magento/Wishlist/CustomerData/Wishlist.php
+++ b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
@@ -86,7 +86,7 @@ public function getSectionData()
      */
     protected function getCounter()
     {
-        return $this->wishlistHelper->getItemCount();
+        return (string) $this->wishlistHelper->getItemCount();
     }
 
     /**

From ed824ce203dab4afa4618e9bfacb9c4b60baf8ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Wed, 14 Oct 2020 08:42:38 +0200
Subject: [PATCH 18/19] M2C-22090 Fix Unit test

---
 .../Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php b/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php
index bd09e45402ce2..f4b249d04f6c2 100644
--- a/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php
@@ -472,7 +472,7 @@ public function testGetSectionDataWithoutItems()
         $items = [];
 
         $result = [
-            'counter' =>  null,
+            'counter' =>  0,
             'items' => [],
         ];
 

From 85549f9922ae2947dd5a64a09318afa67e0edafd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?=
 <34317830+ptylek@users.noreply.github.com>
Date: Wed, 30 Jun 2021 21:19:23 +0200
Subject: [PATCH 19/19] Remove wishlist ViewModel becasue it already exists

---
 .../Magento/Wishlist/ViewModel/Sidebar.php    | 49 -------------------
 1 file changed, 49 deletions(-)
 delete mode 100644 app/code/Magento/Wishlist/ViewModel/Sidebar.php

diff --git a/app/code/Magento/Wishlist/ViewModel/Sidebar.php b/app/code/Magento/Wishlist/ViewModel/Sidebar.php
deleted file mode 100644
index e9ffbfb8a8356..0000000000000
--- a/app/code/Magento/Wishlist/ViewModel/Sidebar.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Wishlist\ViewModel;
-
-use Magento\Wishlist\Helper\Data as WishlistHelper;
-use Magento\Framework\View\Element\Block\ArgumentInterface;
-
-/**
- * ViewModel for Wishlist Url
- */
-class Sidebar implements ArgumentInterface
-{
-    /**
-     * @var WishlistHelper
-     */
-    private $wishlistHelper;
-
-    /**
-     * @param WishlistHelper $wishlistHelper
-     */
-    public function __construct(WishlistHelper $wishlistHelper)
-    {
-        $this->wishlistHelper = $wishlistHelper;
-    }
-
-    /**
-     * Get Wishlist URL
-     *
-     * @return string
-     */
-    public function getWishlistUrl()
-    {
-        return $this->wishlistHelper->getListUrl();
-    }
-
-    /**
-     * Check whether the Wishlist is allowed
-     *
-     * @return bool
-     */
-    public function isWishlistAllowed()
-    {
-        return $this->wishlistHelper->isAllow();
-    }
-}