🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - #13933: Configurable product price options by store (by @simpleadm)
 - #14496: [forwardport] fix for button color in email template (by @Karlasa)
 - #13394: #12705: Integrity constraint violation error after re� (by @vinayshah)
 - #14461: [Forwardport] precision for price overriding by js (by @mastiuhin-olexandr)
 - #14540: Align else statements at app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php (by @nuzil)
 - #14536: [Forwardport] Check if store id is not null instead of empty (by @mastiuhin-olexandr)
 - #14532: [Forwardport] [Bug] Correctly construct Magento\Framework\Phrase (by @mastiuhin-olexandr)
 - #14528: [Forwardport] Fix issue #13010. Check if product is assigned to current website. (by @mastiuhin-olexandr)
 - #14525: [forwardport] fix translation issue with rating stars  (by @Karlasa)
 - #14508: [Forwardport] Issue #13582 show message for qty minAllowed, maxAllowed, qtyIncremen� (by @mastiuhin-olexandr)
 - #14502: [Forwardport] Check if store id is not null instead of empty (by @quisse)
 - #14438: Remove json helper data usage in AdminNotification (by @dmanners)
 - #14169: Add json and xml support to the post method in socket client (by @simpleadm)


Fixed GitHub Issues:
 - #12705: Integrity constraint violation error after reordering product with custom options (reported by @alena-marchenko) has been fixed in #13394 by @vinayshah in 2.3-develop branch
   Related commits:
     1. b5b4530

 - #14249: Priduct page price is using the hardcoded digits in js (reported by @cdiacon) has been fixed in #14461 by @mastiuhin-olexandr in 2.3-develop branch
   Related commits:
     1. bbf8b9c

 - #13010: Write a Review page works on multistore for products that are not assigned to that store (reported by @nuethicadam) has been fixed in #14528 by @mastiuhin-olexandr in 2.3-develop branch
   Related commits:
     1. 189f36d

 - #13582: Magento 2.1.11 minimum quantity validation message not showing (reported by @jayanta88) has been fixed in #14508 by @mastiuhin-olexandr in 2.3-develop branch
   Related commits:
     1. a2c1a64
     2. 2596ad5
     3. 2be7da9
     4. eae1c03

 - #9236: Upgrade ZF components. Zend_Json (reported by @okorshenko) has been fixed in #14438 by @dmanners in 2.3-develop branch
   Related commits:
     1. cdca73b
     2. 6561541

 - #3489: CURL Json POST (reported by @Grohotun) has been fixed in #14169 by @simpleadm in 2.3-develop branch
   Related commits:
     1. 03bbca6

Author: Stanislav Idolov

app/code/Magento/AdminNotification/Block/System/Messages.php

@@ -16,24 +16,34 @@ class Messages extends \Magento\Backend\Block\Template
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
+     * @deprecated
      */
     protected $jsonHelper;
 
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Json
+     */
+    private $serializer;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param array $data
+     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages,
         \Magento\Framework\Json\Helper\Data $jsonHelper,
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
     ) {
         $this->jsonHelper = $jsonHelper;
         parent::__construct($context, $data);
         $this->_messages = $messages;
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
     /**
@@ -117,7 +127,7 @@ protected function _getMessagesUrl()
      */
     public function getSystemMessageDialogJson()
     {
-        return $this->jsonHelper->jsonEncode(
+        return $this->serializer->serialize(
             [
                 'systemMessageDialog' => [
                     'buttons' => [],

app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php

@@ -6,6 +6,8 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml\System\Message;
 
+use Magento\Framework\Controller\ResultFactory;
+
 class ListAction extends \Magento\Backend\App\AbstractAction
 {
     /**
@@ -15,6 +17,7 @@ class ListAction extends \Magento\Backend\App\AbstractAction
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
+     * @deprecated
      */
     protected $jsonHelper;
 
@@ -41,7 +44,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Json
      */
     public function execute()
     {
@@ -63,6 +66,9 @@ public function execute()
                     . 'Please refresh the web page to clear the notice alert.',
             ];
         }
-        $this->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
+        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        $resultJson->setData($result);
+        return $resultJson;
     }
 }

app/code/Magento/Catalog/view/base/web/js/price-utils.js

@@ -79,7 +79,7 @@ define([
         am = Number(Math.round(Math.abs(amount - i) + 'e+' + precision) + ('e-' + precision));
         r = (j ? i.substr(0, j) + groupSymbol : '') +
             i.substr(j).replace(re, '$1' + groupSymbol) +
-            (precision ? decimalSymbol + am.toFixed(2).replace(/-/, 0).slice(2) : '');
+            (precision ? decimalSymbol + am.toFixed(precision).replace(/-/, 0).slice(2) : '');
 
         return pattern.replace('%s', r).replace(/^\s\s*/, '').replace(/\s\s*$/, '');
     }

app/code/Magento/CatalogInventory/Block/Plugin/ProductView.php

@@ -39,8 +39,8 @@ public function afterGetQuantityValidators(
 
         $params = [];
         $params['minAllowed']  = (float)$stockItem->getMinSaleQty();
-        if ($stockItem->getQtyMaxAllowed()) {
-            $params['maxAllowed'] = $stockItem->getQtyMaxAllowed();
+        if ($stockItem->getMaxSaleQty()) {
+            $params['maxAllowed'] = (float)$stockItem->getMaxSaleQty();
         }
         if ($stockItem->getQtyIncrements() > 0) {
             $params['qtyIncrements'] = (float)$stockItem->getQtyIncrements();

app/code/Magento/CatalogInventory/Test/Unit/Block/Plugin/ProductViewTest.php

@@ -28,7 +28,7 @@ protected function setUp()
 
         $this->stockItem = $this->getMockBuilder(\Magento\CatalogInventory\Model\Stock\Item::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getMinSaleQty', 'getQtyMaxAllowed', 'getQtyIncrements'])
+            ->setMethods(['getMinSaleQty', 'getMaxSaleQty', 'getQtyIncrements'])
             ->getMock();
 
         $this->stockRegistry = $this->getMockBuilder(\Magento\CatalogInventory\Api\StockRegistryInterface::class)
@@ -48,8 +48,8 @@ public function testAfterGetQuantityValidators()
             'validate-item-quantity' =>
                 [
                     'minAllowed' => 0.5,
-                    'maxAllowed' => 5,
-                    'qtyIncrements' => 3
+                    'maxAllowed' => 5.0,
+                    'qtyIncrements' => 3.0
                 ]
         ];
         $validators = [];
@@ -74,7 +74,7 @@ public function testAfterGetQuantityValidators()
             ->with('productId', 'websiteId')
             ->willReturn($this->stockItem);
         $this->stockItem->expects($this->once())->method('getMinSaleQty')->willReturn(0.5);
-        $this->stockItem->expects($this->any())->method('getQtyMaxAllowed')->willReturn(5);
+        $this->stockItem->expects($this->any())->method('getMaxSaleQty')->willReturn(5);
         $this->stockItem->expects($this->any())->method('getQtyIncrements')->willReturn(3);
 
         $this->assertEquals($result, $this->block->afterGetQuantityValidators($productViewBlock, $validators));

app/code/Magento/Cms/Model/PageRepository.php

@@ -111,7 +111,7 @@ public function __construct(
      */
     public function save(\Magento\Cms\Api\Data\PageInterface $page)
     {
-        if (empty($page->getStoreId())) {
+        if ($page->getStoreId() === null) {
             $storeId = $this->storeManager->getStore()->getId();
             $page->setStoreId($storeId);
         }

app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php

@@ -247,9 +247,8 @@ protected function _getSuperAttributeId($productId, $attributeId)
     {
         if (isset($this->_productSuperAttrs["{$productId}_{$attributeId}"])) {
             return $this->_productSuperAttrs["{$productId}_{$attributeId}"];
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**

app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProvider.php

@@ -9,6 +9,7 @@
 use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Retrieve list of products where each product contains lower price than others at least for one possible price type
@@ -31,7 +32,12 @@ class LowestPriceOptionsProvider implements LowestPriceOptionsProviderInterface
     private $collectionFactory;
 
     /**
-     * Key is product id. Value is array of prepared linked products
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * Key is product id and store id. Value is array of prepared linked products
      *
      * @var array
      */
@@ -41,34 +47,38 @@ class LowestPriceOptionsProvider implements LowestPriceOptionsProviderInterface
      * @param ResourceConnection $resourceConnection
      * @param LinkedProductSelectBuilderInterface $linkedProductSelectBuilder
      * @param CollectionFactory $collectionFactory
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         ResourceConnection $resourceConnection,
         LinkedProductSelectBuilderInterface $linkedProductSelectBuilder,
-        CollectionFactory $collectionFactory
+        CollectionFactory $collectionFactory,
+        StoreManagerInterface $storeManager
     ) {
         $this->resource = $resourceConnection;
         $this->linkedProductSelectBuilder = $linkedProductSelectBuilder;
         $this->collectionFactory = $collectionFactory;
+        $this->storeManager = $storeManager;
     }
 
     /**
      * {@inheritdoc}
      */
     public function getProducts(ProductInterface $product)
     {
-        if (!isset($this->linkedProductMap[$product->getId()])) {
+        $key = $this->storeManager->getStore()->getId() . '-' . $product->getId();
+        if (!isset($this->linkedProductMap[$key])) {
             $productIds = $this->resource->getConnection()->fetchCol(
                 '(' . implode(') UNION (', $this->linkedProductSelectBuilder->build($product->getId())) . ')'
             );
 
-            $this->linkedProductMap[$product->getId()] = $this->collectionFactory->create()
+            $this->linkedProductMap[$key] = $this->collectionFactory->create()
                 ->addAttributeToSelect(
                     ['price', 'special_price', 'special_from_date', 'special_to_date', 'tax_class_id']
                 )
                 ->addIdFilter($productIds)
                 ->getItems();
         }
-        return $this->linkedProductMap[$product->getId()];
+        return $this->linkedProductMap[$key];
     }
 }

app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/LowestPriceOptionsProviderTest.php

@@ -9,6 +9,9 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\Store;
 
 class LowestPriceOptionsProviderTest extends \PHPUnit\Framework\TestCase
 {
@@ -42,6 +45,16 @@ class LowestPriceOptionsProviderTest extends \PHPUnit\Framework\TestCase
      */
     private $productCollection;
 
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+
+    /**
+     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeMock;
+
     protected function setUp()
     {
         $this->connection = $this
@@ -68,6 +81,11 @@ protected function setUp()
             ->setMethods(['create'])
             ->getMock();
         $this->collectionFactory->expects($this->once())->method('create')->willReturn($this->productCollection);
+        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
+            ->getMockForAbstractClass();
+        $this->storeMock = $this->getMockBuilder(StoreInterface::class)
+            ->setMethods(['getId'])
+            ->getMockForAbstractClass();
 
         $objectManager = new ObjectManager($this);
         $this->model = $objectManager->getObject(
@@ -76,6 +94,7 @@ protected function setUp()
                 'resourceConnection' => $this->resourceConnection,
                 'linkedProductSelectBuilder' => $this->linkedProductSelectBuilder,
                 'collectionFactory' => $this->collectionFactory,
+                'storeManager' => $this->storeManagerMock,
             ]
         );
     }
@@ -94,6 +113,13 @@ public function testGetProducts()
             ->willReturnSelf();
         $this->productCollection->expects($this->once())->method('addIdFilter')->willReturnSelf();
         $this->productCollection->expects($this->once())->method('getItems')->willReturn($linkedProducts);
+        $this->storeManagerMock->expects($this->any())
+            ->method('getStore')
+            ->with(Store::DEFAULT_STORE_ID)
+            ->willReturn($this->storeMock);
+        $this->storeMock->expects($this->any())
+            ->method('getId')
+            ->willReturn(Store::DEFAULT_STORE_ID);
 
         $this->assertEquals($linkedProducts, $this->model->getProducts($product));
     }

app/code/Magento/Review/Controller/Product.php

@@ -219,6 +219,11 @@ protected function loadProduct($productId)
 
         try {
             $product = $this->productRepository->getById($productId);
+
+            if (!in_array($this->storeManager->getStore()->getWebsiteId(), $product->getWebsiteIds())) {
+                throw new NoSuchEntityException();
+            }
+
             if (!$product->isVisibleInCatalog() || !$product->isVisibleInSiteVisibility()) {
                 throw new NoSuchEntityException();
             }