Merge branch '2.3-develop' of github.com:magento/magento2ce into 2.3.5-develop

Author: nathanjosiah

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js

@@ -269,6 +269,7 @@ define([
                  */
                 onError: function () {
                     self.showError($t('Payment ' + self.getTitle() + ' can\'t be initialized'));
+                    self.reInitPayPal();
                 }
             }, self.paypalButtonSelector);
         },

app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php

@@ -6,15 +6,17 @@
 namespace Magento\Catalog\Block\Ui;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ProductRenderFactory;
+use Magento\Catalog\Model\ProductRepository;
 use Magento\Catalog\Ui\DataProvider\Product\ProductRenderCollectorComposite;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\Hydrator;
 use Magento\Framework\Registry;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Url;
 use Magento\Framework\View\Element\Template;
 use Magento\Store\Model\Store;
-use Magento\Catalog\Model\ProductRenderFactory;
-use Magento\Catalog\Model\ProductRepository;
-use Magento\Framework\EntityManager\Hydrator;
 use Magento\Store\Model\StoreManager;
 
 /**
@@ -25,6 +27,7 @@
  *
  * @api
  * @since 101.1.0
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ProductViewCounter extends Template
 {
@@ -68,6 +71,13 @@ class ProductViewCounter extends Template
      */
     private $registry;
 
+    /**
+     * Core store config
+     *
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * @param Template\Context $context
      * @param ProductRepository $productRepository
@@ -78,6 +88,8 @@ class ProductViewCounter extends Template
      * @param SerializerInterface $serialize
      * @param Url $url
      * @param Registry $registry
+     * @param ScopeConfigInterface|null $scopeConfig
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         Template\Context $context,
@@ -88,7 +100,8 @@ public function __construct(
         Hydrator $hydrator,
         SerializerInterface $serialize,
         Url $url,
-        Registry $registry
+        Registry $registry,
+        ?ScopeConfigInterface $scopeConfig = null
     ) {
         parent::__construct($context);
         $this->productRepository = $productRepository;
@@ -99,6 +112,7 @@ public function __construct(
         $this->serialize = $serialize;
         $this->url = $url;
         $this->registry = $registry;
+        $this->scopeConfig = $scopeConfig ?? ObjectManager::getInstance()->get(ScopeConfigInterface::class);
     }
 
     /**
@@ -116,14 +130,19 @@ public function getCurrentProductData()
     {
         /** @var ProductInterface $product */
         $product = $this->registry->registry('product');
+        $productsScope = $this->scopeConfig->getValue(
+            'catalog/recently_products/scope',
+            \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE
+        );
         /** @var Store $store */
         $store = $this->storeManager->getStore();
 
         if (!$product || !$product->getId()) {
             return $this->serialize->serialize([
                 'items' => [],
                 'store' => $store->getId(),
-                'currency' => $store->getCurrentCurrency()->getCode()
+                'currency' => $store->getCurrentCurrency()->getCode(),
+                'productCurrentScope' => $productsScope
             ]);
         }
 
@@ -140,7 +159,8 @@ public function getCurrentProductData()
                 $product->getId() => $data
             ],
             'store' => $store->getId(),
-            'currency' => $store->getCurrentCurrency()->getCode()
+            'currency' => $store->getCurrentCurrency()->getCode(),
+            'productCurrentScope' => $productsScope
         ];
 
         return $this->serialize->serialize($currentProductData);

app/code/Magento/Catalog/Controller/Product/Compare/Index.php

@@ -12,6 +12,8 @@
 use Magento\Framework\View\Result\PageFactory;
 
 /**
+ * View products compare in frontend
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Index extends \Magento\Catalog\Controller\Product\Compare implements HttpGetActionInterface
@@ -74,23 +76,12 @@ public function __construct(
      */
     public function execute()
     {
-        $items = $this->getRequest()->getParam('items');
-
         $beforeUrl = $this->getRequest()->getParam(self::PARAM_NAME_URL_ENCODED);
         if ($beforeUrl) {
             $this->_catalogSession->setBeforeCompareUrl(
                 $this->urlDecoder->decode($beforeUrl)
             );
         }
-
-        if ($items) {
-            $items = explode(',', $items);
-            /** @var \Magento\Catalog\Model\Product\Compare\ListCompare $list */
-            $list = $this->_catalogProductCompareList;
-            $list->addProducts($items);
-            $resultRedirect = $this->resultRedirectFactory->create();
-            return $resultRedirect->setPath('*/*/*');
-        }
         return $this->resultPageFactory->create();
     }
 }

app/code/Magento/Catalog/CustomerData/CompareProducts.php

@@ -6,7 +6,13 @@
 namespace Magento\Catalog\CustomerData;
 
 use Magento\Customer\CustomerData\SectionSourceInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
 
+/**
+ * Catalog Product Compare Widget
+ */
 class CompareProducts implements SectionSourceInterface
 {
     /**
@@ -24,23 +30,33 @@ class CompareProducts implements SectionSourceInterface
      */
     private $outputHelper;
 
+    /**
+     * Core store config
+     *
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * @param \Magento\Catalog\Helper\Product\Compare $helper
      * @param \Magento\Catalog\Model\Product\Url $productUrl
      * @param \Magento\Catalog\Helper\Output $outputHelper
+     * @param ScopeConfigInterface|null $scopeConfig
      */
     public function __construct(
         \Magento\Catalog\Helper\Product\Compare $helper,
         \Magento\Catalog\Model\Product\Url $productUrl,
-        \Magento\Catalog\Helper\Output $outputHelper
+        \Magento\Catalog\Helper\Output $outputHelper,
+        ?ScopeConfigInterface $scopeConfig = null
     ) {
         $this->helper = $helper;
         $this->productUrl = $productUrl;
         $this->outputHelper = $outputHelper;
+        $this->scopeConfig = $scopeConfig ?? ObjectManager::getInstance()->get(ScopeConfigInterface::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSectionData()
     {
@@ -54,18 +70,26 @@ public function getSectionData()
     }
 
     /**
+     * Get the list of compared product items
+     *
      * @return array
+     * @throws LocalizedException
      */
     protected function getItems()
     {
         $items = [];
+        $productsScope = $this->scopeConfig->getValue(
+            'catalog/recently_products/scope',
+            \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE
+        );
         /** @var \Magento\Catalog\Model\Product $item */
         foreach ($this->helper->getItemCollection() as $item) {
             $items[] = [
                 'id' => $item->getId(),
                 'product_url' => $this->productUrl->getUrl($item),
                 'name' => $this->outputHelper->productAttribute($item, $item->getName(), 'name'),
                 'remove_url' => $this->helper->getPostDataRemove($item),
+                'productScope' => $productsScope
             ];
         }
         return $items;

app/code/Magento/Catalog/Helper/Product/Compare.php

@@ -14,6 +14,7 @@
  * @api
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @since 100.0.2
  */
 class Compare extends \Magento\Framework\Url\Helper\Data
@@ -145,16 +146,9 @@ public function __construct(
      */
     public function getListUrl()
     {
-        $itemIds = [];
-        foreach ($this->getItemCollection() as $item) {
-            $itemIds[] = $item->getId();
-        }
-
         $params = [
-            'items' => implode(',', $itemIds),
             \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED => $this->getEncodedUrl()
         ];
-
         return $this->_getUrl('catalog/product_compare', $params);
     }
 

app/code/Magento/Catalog/Test/Mftf/Data/ConstData.xml

@@ -16,5 +16,7 @@
     <entity name="prodNameWithSpecChars">
         <data key="trademark">"Pursuit Lumaflex™ Tone Band"</data>
         <data key="skumark">"x™"</data>
+        <data key="trademark_without_quotes">Pursuit Lumaflex™ Tone Band</data>
+        <data key="skumark_without_quotes">x™</data>
     </entity>
 </entities>

app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsSection.xml

@@ -12,5 +12,7 @@
         <element name="sectionHeader" type="button" selector="div[data-index='assign_products']" timeout="30"/>
         <element name="addProducts" type="button" selector="#catalog_category_add_product_tabs" timeout="30"/>
         <element name="addProductsDisabled" type="button" selector="#catalog_category_add_product_tabs[disabled]" timeout="30"/>
+        <element name="productsInCategorySectionTitle" type="text" selector="div[data-index='assign_products'] .fieldset-wrapper-title" timeout="10"/>
+        <element name="productsInCategorySectionBody" type="text" selector="div[data-index='assign_products'] .admin__fieldset-wrapper-content"/>
     </section>
-</sections>
+</sections>

app/code/Magento/Catalog/Test/Unit/Block/Ui/ProductViewCounterTest.php

@@ -6,19 +6,20 @@
 
 namespace Magento\Catalog\Test\Unit\Block\Ui;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductRenderInterface;
+use Magento\Catalog\Block\Ui\ProductViewCounter;
+use Magento\Catalog\Model\ProductRenderFactory;
 use Magento\Catalog\Model\ProductRepository;
 use Magento\Catalog\Ui\DataProvider\Product\ProductRenderCollectorComposite;
-use Magento\Catalog\Model\ProductRenderFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\EntityManager\Hydrator;
+use Magento\Framework\Registry;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Url;
 use Magento\Framework\View\Element\Template\Context;
-use Magento\Store\Model\StoreManager;
 use Magento\Store\Model\Store;
-use Magento\Framework\Registry;
-use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Catalog\Api\Data\ProductRenderInterface;
-use Magento\Catalog\Block\Ui\ProductViewCounter;
+use Magento\Store\Model\StoreManager;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -70,6 +71,11 @@ class ProductViewCounterTest extends \PHPUnit\Framework\TestCase
      */
     private $storeManagerMock;
 
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
     /**
      * @var ProductRenderFactory|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -104,6 +110,9 @@ protected function setUp()
         $this->storeManagerMock = $this->getMockBuilder(StoreManager::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->productViewCounter = new ProductViewCounter(
             $this->contextMock,
@@ -114,7 +123,8 @@ protected function setUp()
             $this->hydratorMock,
             $this->serializeMock,
             $this->urlMock,
-            $this->registryMock
+            $this->registryMock,
+            $this->scopeConfigMock
         );
     }
 

app/code/Magento/Catalog/Test/Unit/Controller/Product/Compare/IndexTest.php

@@ -129,7 +129,6 @@ public function testExecute()
             ->method('getParam')
             ->willReturnMap(
                 [
-                    ['items', null, null],
                     ['uenc', null, $beforeUrl],
                 ]
             );
@@ -141,34 +140,7 @@ public function testExecute()
             ->method('setBeforeCompareUrl')
             ->with($beforeUrl . '1')
             ->willReturnSelf();
-        $this->listCompareMock->expects($this->never())->method('addProducts');
         $this->redirectFactoryMock->expects($this->never())->method('create');
         $this->index->execute();
     }
-
-    public function testExecuteWithItems()
-    {
-        $this->request->expects($this->any())
-            ->method('getParam')
-            ->willReturnMap(
-                [
-                    ['items', null, '1,2,3'],
-                    ['uenc', null, null],
-                ]
-            );
-        $this->decoderMock->expects($this->never())->method('decode');
-        $this->catalogSession->expects($this->never())->method('setBeforeCompareUrl');
-
-        $this->listCompareMock->expects($this->once())
-            ->method('addProducts')
-            ->with([1, 2, 3]);
-        $redirect = $this->createPartialMock(\Magento\Framework\Controller\Result\Redirect::class, ['setPath']);
-        $redirect->expects($this->once())
-            ->method('setPath')
-            ->with('*/*/*');
-        $this->redirectFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($redirect);
-        $this->index->execute();
-    }
 }