merge magento/2.3.3-develop into magento-obsessive-owls/MC-17700-squashed

Author: magento-cicd2

app/code/Magento/Catalog/Model/Product/Compare/ListCompare.php

@@ -5,7 +5,10 @@
  */
 namespace Magento\Catalog\Model\Product\Compare;
 
+use Magento\Catalog\Model\ProductRepository;
 use Magento\Catalog\Model\ResourceModel\Product\Compare\Item\Collection;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Product Compare List Model
@@ -51,6 +54,11 @@ class ListCompare extends \Magento\Framework\DataObject
      */
     protected $_compareItemFactory;
 
+    /**
+     * @var ProductRepository
+     */
+    private $productRepository;
+
     /**
      * Constructor
      *
@@ -60,20 +68,23 @@ class ListCompare extends \Magento\Framework\DataObject
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\Visitor $customerVisitor
      * @param array $data
+     * @param ProductRepository|null $productRepository
      */
     public function __construct(
         \Magento\Catalog\Model\Product\Compare\ItemFactory $compareItemFactory,
         \Magento\Catalog\Model\ResourceModel\Product\Compare\Item\CollectionFactory $itemCollectionFactory,
         \Magento\Catalog\Model\ResourceModel\Product\Compare\Item $catalogProductCompareItem,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Customer\Model\Visitor $customerVisitor,
-        array $data = []
+        array $data = [],
+        ProductRepository $productRepository = null
     ) {
         $this->_compareItemFactory = $compareItemFactory;
         $this->_itemCollectionFactory = $itemCollectionFactory;
         $this->_catalogProductCompareItem = $catalogProductCompareItem;
         $this->_customerSession = $customerSession;
         $this->_customerVisitor = $customerVisitor;
+        $this->productRepository = $productRepository ?: ObjectManager::getInstance()->create(ProductRepository::class);
         parent::__construct($data);
     }
 
@@ -82,6 +93,7 @@ public function __construct(
      *
      * @param int|\Magento\Catalog\Model\Product $product
      * @return $this
+     * @throws \Exception
      */
     public function addProduct($product)
     {
@@ -90,14 +102,33 @@ public function addProduct($product)
         $this->_addVisitorToItem($item);
         $item->loadByProduct($product);
 
-        if (!$item->getId()) {
+        if (!$item->getId() && $this->productExists($product)) {
             $item->addProductData($product);
             $item->save();
         }
 
         return $this;
     }
 
+    /**
+     * Check product exists.
+     *
+     * @param int|\Magento\Catalog\Model\Product $product
+     * @return bool
+     */
+    private function productExists($product)
+    {
+        if ($product instanceof \Magento\Catalog\Model\Product && $product->getId()) {
+            return true;
+        }
+        try {
+            $product = $this->productRepository->getById((int)$product);
+            return !empty($product->getId());
+        } catch (NoSuchEntityException $e) {
+            return false;
+        }
+    }
+
     /**
      * Add products to compare list
      *

app/code/Magento/Email/Block/Adminhtml/Template/Preview.php

@@ -3,12 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/**
- * Adminhtml system template preview block
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Email\Block\Adminhtml\Template;
 
 /**
@@ -55,16 +51,12 @@ public function __construct(
      * Prepare html output
      *
      * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Exception
      */
     protected function _toHtml()
     {
         $request = $this->getRequest();
 
-        if (!$request instanceof \Magento\Framework\App\RequestSafetyInterface || !$request->isSafeMethod()) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Wrong request.'));
-        }
-
         $storeId = $this->getAnyStoreView()->getId();
         /** @var $template \Magento\Email\Model\Template */
         $template = $this->_emailFactory->create();

app/code/Magento/Email/Controller/Adminhtml/Email/Template/Popup.php

@@ -7,12 +7,12 @@
 
 namespace Magento\Email\Controller\Adminhtml\Email\Template;
 
-use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
 /**
  * Rendering popup email template.
  */
-class Popup extends \Magento\Backend\App\Action implements HttpGetActionInterface
+class Popup extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\View\Result\PageFactory

app/code/Magento/Email/Controller/Adminhtml/Email/Template/Preview.php

@@ -4,27 +4,28 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Email\Controller\Adminhtml\Email\Template;
 
+use Magento\Email\Controller\Adminhtml\Email\Template;
 use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
 /**
  * Rendering email template preview.
  */
-class Preview extends \Magento\Email\Controller\Adminhtml\Email\Template implements HttpGetActionInterface
+class Preview extends Template implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * Preview transactional email action.
-     *
-     * @return void
      */
     public function execute()
     {
         try {
             $this->_view->loadLayout();
             $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Email Preview'));
             $this->_view->renderLayout();
-            $this->getResponse()->setHeader('Content-Security-Policy', "script-src 'self'");
         } catch (\Exception $e) {
             $this->messageManager->addErrorMessage(
                 __('An error occurred. The email template can not be opened for preview.')

app/code/Magento/Email/Test/Unit/Block/Adminhtml/Template/PreviewTest.php

@@ -152,9 +152,6 @@ protected function setUp()
      */
     public function testToHtml($requestParamMap)
     {
-        $this->request->expects($this->atLeastOnce())
-            ->method('isSafeMethod')
-            ->willReturn(true);
         $this->request->expects($this->any())
             ->method('getParam')
             ->willReturnMap($requestParamMap);
@@ -171,24 +168,6 @@ public function testToHtml($requestParamMap)
         $this->assertEquals(self::MALICIOUS_TEXT, $this->preview->toHtml());
     }
 
-    /**
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     */
-    public function testToHtmlWithException()
-    {
-        $this->request->expects($this->atLeastOnce())
-            ->method('isSafeMethod')
-            ->willReturn(false);
-        $this->template
-            ->expects($this->never())
-            ->method('getDesignConfig');
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
-        $this->expectExceptionMessage(
-            (string)__('Wrong request.')
-        );
-        $this->preview->toHtml();
-    }
-
     /**
      * Data provider
      *

app/code/Magento/Email/Test/Unit/Controller/Adminhtml/Email/Template/PreviewTest.php

@@ -54,11 +54,6 @@ class PreviewTest extends \PHPUnit\Framework\TestCase
      */
     protected $pageTitleMock;
 
-    /**
-     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $responseMock;
-
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
@@ -84,16 +79,11 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->responseMock = $this->getMockBuilder(\Magento\Framework\App\ResponseInterface::class)
-            ->setMethods(['setHeader'])
-            ->getMockForAbstractClass();
-
         $this->context = $objectManager->getObject(
             \Magento\Backend\App\Action\Context::class,
             [
                 'request' => $this->requestMock,
-                'view' => $this->viewMock,
-                'response' => $this->responseMock
+                'view' => $this->viewMock
             ]
         );
         $this->object = $objectManager->getObject(
@@ -118,9 +108,6 @@ public function testExecute()
         $this->pageTitleMock->expects($this->once())
             ->method('prepend')
             ->willReturnSelf();
-        $this->responseMock->expects($this->once())
-            ->method('setHeader')
-            ->with('Content-Security-Policy', "script-src 'self'");
 
         $this->assertNull($this->object->execute());
     }