Merge branch '2.3-develop-main' into team3-delivery

Author: irenelagno

README.md

@@ -6,13 +6,12 @@
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
 
 ## Magento system requirements
-[Magento system requirements](http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements2.html)
+[Magento system requirements](http://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html)
 
 ## Install Magento
 To install Magento, see either:
 
-*	[Magento DevBox](https://magento.com/tech-resources/download), the easiest way to get started with Magento.
-*	[Installation guide](http://devdocs.magento.com/guides/v2.2/install-gde/bk-install-guide.html)
+*	[Installation guide](http://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html)
 
 <h2>Contributing to the Magento 2 code base</h2>
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
@@ -23,11 +22,24 @@ To learn about issues, click [here][2]. To open an issue, click [here][3].
 
 To suggest documentation improvements, click [here][4].
 
-[1]: <http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html>
-[2]: <http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#report>
+[1]: <http://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html>
+[2]: <http://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report>
 [3]: <https://github.com/magento/magento2/issues>
 [4]: <http://devdocs.magento.com>
 
+<h3>Community Maintainers</h3>
+The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.
+
+<a href="https://magento.com/magento-contributors#maintainers">
+    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png"/>
+</a>
+
+<h3>Top Contributors</h3>
+Magento team thanks for any contribution that can improve our code base, documentation or increase test coverage. We always recognize our most active members, your contributions are the foundation of the Magento open source platform.
+<a href="https://magento.com/magento-contributors">
+    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
+</a>
+
 <h3>Labels applied by the Magento team</h3>
 
 | Label        | Description           | 

app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml

@@ -22,6 +22,7 @@
         <input type="hidden" name="product" value="<?= /* @escapeNotVerified */ $_product->getId() ?>" />
         <input type="hidden" name="selected_configurable_option" value="" />
         <input type="hidden" name="related_product" id="related-products-field" value="" />
+        <input type="hidden" name="item"  value="<?= /* @noEscape */ $block->getRequest()->getParam('id') ?>" />
         <?= $block->getBlockHtml('formkey') ?>
         <?= $block->getChildHtml('form_top') ?>
         <?php if (!$block->hasOptions()):?>

app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php

@@ -113,20 +113,20 @@ protected function _construct()
     }
 
     /**
-     * Lock Stock Item records
+     * Lock Stock Item records.
      *
      * @param int[] $productIds
      * @param int $websiteId
      * @return array
      */
-    public function lockProductsStock($productIds, $websiteId)
+    public function lockProductsStock(array $productIds, int $websiteId)
     {
         if (empty($productIds)) {
             return [];
         }
         $itemTable = $this->getTable('cataloginventory_stock_item');
         $select = $this->getConnection()->select()->from(['si' => $itemTable])
-            ->where('website_id=?', $websiteId)
+            ->where('website_id = ?', $websiteId)
             ->where('product_id IN(?)', $productIds)
             ->forUpdate(true);
 
@@ -136,12 +136,19 @@ public function lockProductsStock($productIds, $websiteId)
             ->columns(
                 [
                     'product_id' => 'entity_id',
-                    'type_id' => 'type_id'
+                    'type_id' => 'type_id',
                 ]
             );
-        $this->getConnection()->query($select);
+        $items = [];
 
-        return $this->getConnection()->fetchAll($selectProducts);
+        foreach ($this->getConnection()->query($select)->fetchAll() as $si) {
+            $items[$si['product_id']] = $si;
+        }
+        foreach ($this->getConnection()->fetchAll($selectProducts) as $p) {
+            $items[$p['product_id']]['type_id'] = $p['type_id'];
+        }
+        
+        return $items;
     }
 
     /**

app/code/Magento/CatalogInventory/Model/StockManagement.php

@@ -50,33 +50,42 @@ class StockManagement implements StockManagementInterface, RegisterProductSaleIn
      */
     private $qtyCounter;
 
+    /**
+     * @var StockRegistryStorage
+     */
+    private $stockRegistryStorage;
+
     /**
      * @param ResourceStock $stockResource
      * @param StockRegistryProviderInterface $stockRegistryProvider
      * @param StockState $stockState
      * @param StockConfigurationInterface $stockConfiguration
      * @param ProductRepositoryInterface $productRepository
      * @param QtyCounterInterface $qtyCounter
+     * @param StockRegistryStorage|null $stockRegistryStorage
      */
     public function __construct(
         ResourceStock $stockResource,
         StockRegistryProviderInterface $stockRegistryProvider,
         StockState $stockState,
         StockConfigurationInterface $stockConfiguration,
         ProductRepositoryInterface $productRepository,
-        QtyCounterInterface $qtyCounter
+        QtyCounterInterface $qtyCounter,
+        StockRegistryStorage $stockRegistryStorage = null
     ) {
         $this->stockRegistryProvider = $stockRegistryProvider;
         $this->stockState = $stockState;
         $this->stockConfiguration = $stockConfiguration;
         $this->productRepository = $productRepository;
         $this->qtyCounter = $qtyCounter;
         $this->resource = $stockResource;
+        $this->stockRegistryStorage = $stockRegistryStorage ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(StockRegistryStorage::class);
     }
 
     /**
      * Subtract product qtys from stock.
-     * Return array of items that require full save
+     * Return array of items that require full save.
      *
      * @param string[] $items
      * @param int $websiteId
@@ -94,17 +103,20 @@ public function registerProductsSale($items, $websiteId = null)
         $fullSaveItems = $registeredItems = [];
         foreach ($lockedItems as $lockedItemRecord) {
             $productId = $lockedItemRecord['product_id'];
+            $this->stockRegistryStorage->removeStockItem($productId, $websiteId);
+
             /** @var StockItemInterface $stockItem */
             $orderedQty = $items[$productId];
             $stockItem = $this->stockRegistryProvider->getStockItem($productId, $websiteId);
+            $stockItem->setQty($lockedItemRecord['qty']); // update data from locked item
             $canSubtractQty = $stockItem->getItemId() && $this->canSubtractQty($stockItem);
             if (!$canSubtractQty || !$this->stockConfiguration->isQty($lockedItemRecord['type_id'])) {
                 continue;
             }
             if (!$stockItem->hasAdminArea()
                 && !$this->stockState->checkQty($productId, $orderedQty, $stockItem->getWebsiteId())
             ) {
-                $this->getResource()->rollBack();
+                $this->getResource()->commit();
                 throw new \Magento\Framework\Exception\LocalizedException(
                     __('Not all of your products are available in the requested quantity.')
                 );
@@ -124,6 +136,7 @@ public function registerProductsSale($items, $websiteId = null)
         }
         $this->qtyCounter->correctItemsQty($registeredItems, $websiteId, '-');
         $this->getResource()->commit();
+        
         return $fullSaveItems;
     }
 

app/code/Magento/CatalogInventory/Test/Unit/Model/ResourceModel/StockTest.php

@@ -0,0 +1,209 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Test\Unit\Model\ResourceModel;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\CatalogInventory\Model\Configuration as StockConfiguration;
+use Magento\CatalogInventory\Model\ResourceModel\Stock;
+use Magento\Framework\App\Config;
+use Magento\Framework\DB\Adapter\Pdo\Mysql;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Test for \Magento\CatalogInventory\Model\ResourceModel\Stock
+ */
+class StockTest extends \PHPUnit\Framework\TestCase
+{
+    const PRODUCT_TABLE = 'testProductTable';
+    const ITEM_TABLE = 'testItemTableName';
+
+    /**
+     * @var Stock|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stock;
+
+    /**
+     * @var Mysql|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @var DateTime|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dateTimeMock;
+
+    /**
+     * @var StockConfiguration|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stockConfigurationMock;
+
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+
+    /**
+     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var \Magento\Framework\DB\Select|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $selectMock;
+
+    /**
+     * @var \Zend_Db_Statement_Interface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $statementMock;
+    
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->selectMock = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->contextMock = $objectManager->getObject(Context::class);
+        $this->scopeConfigMock = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->dateTimeMock = $this->getMockBuilder(DateTime::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->stockConfigurationMock = $this->getMockBuilder(StockConfiguration::class)
+            ->setMethods(['getIsQtyTypeIds', 'getDefaultScopeId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->connectionMock = $this->getMockBuilder(Mysql::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->statementMock = $this->getMockForAbstractClass(\Zend_Db_Statement_Interface::class);
+        $this->stock = $this->getMockBuilder(Stock::class)
+            ->setMethods(['getTable', 'getConnection'])
+            ->setConstructorArgs(
+                [
+                    'context' => $this->contextMock,
+                    'scopeConfig' => $this->scopeConfigMock,
+                    'dateTime' => $this->dateTimeMock,
+                    'stockConfiguration' => $this->stockConfigurationMock,
+                    'storeManager' => $this->storeManagerMock,
+                ]
+            )->getMock();
+    }
+
+    /**
+     * Test Save Product Status per website with product ids.
+     *
+     * @dataProvider productsDataProvider
+     * @param int $websiteId
+     * @param array $productIds
+     * @param array $products
+     * @param array $result
+     *
+     * @return void
+     */
+    public function testLockProductsStock(int $websiteId, array $productIds, array $products, array $result)
+    {
+        $this->selectMock->expects($this->exactly(2))
+            ->method('from')
+            ->withConsecutive(
+                [$this->identicalTo(['si' => self::ITEM_TABLE])],
+                [$this->identicalTo(['p' => self::PRODUCT_TABLE]), $this->identicalTo([])]
+            )
+            ->willReturnSelf();
+        $this->selectMock->expects($this->exactly(3))
+            ->method('where')
+            ->withConsecutive(
+                [$this->identicalTo('website_id = ?'), $this->identicalTo($websiteId)],
+                [$this->identicalTo('product_id IN(?)'), $this->identicalTo($productIds)],
+                [$this->identicalTo('entity_id IN (?)'), $this->identicalTo($productIds)]
+            )
+            ->willReturnSelf();
+        $this->selectMock->expects($this->once())
+            ->method('forUpdate')
+            ->with($this->identicalTo(true))
+            ->willReturnSelf();
+        $this->selectMock->expects($this->once())
+            ->method('columns')
+            ->with($this->identicalTo(['product_id' => 'entity_id', 'type_id' => 'type_id']))
+            ->willReturnSelf();
+        $this->connectionMock->expects($this->exactly(2))
+            ->method('select')
+            ->willReturn($this->selectMock);
+        $this->connectionMock->expects($this->once())
+            ->method('query')
+            ->with($this->identicalTo($this->selectMock))
+            ->willReturn($this->statementMock);
+        $this->statementMock->expects($this->once())
+            ->method('fetchAll')
+            ->willReturn($products);
+        $this->connectionMock->expects($this->once())
+            ->method('fetchAll')
+            ->with($this->identicalTo($this->selectMock))
+            ->willReturn($result);
+        $this->stock->expects($this->exactly(2))
+            ->method('getTable')
+            ->withConsecutive(
+                [$this->identicalTo('cataloginventory_stock_item')],
+                [$this->identicalTo('catalog_product_entity')]
+            )->will($this->onConsecutiveCalls(
+                self::ITEM_TABLE,
+                self::PRODUCT_TABLE
+            ));
+        $this->stock->expects($this->exactly(4))
+            ->method('getConnection')
+            ->willReturn($this->connectionMock);
+
+        $lockResult = $this->stock->lockProductsStock($productIds, $websiteId);
+
+        $this->assertEquals($result, $lockResult);
+    }
+
+    /**
+     * @return array
+     */
+    public function productsDataProvider(): array
+    {
+        return [
+            [
+                0,
+                [1, 2, 3],
+                [
+                    1 => ['product_id' => 1],
+                    2 => ['product_id' => 2],
+                    3 => ['product_id' => 3],
+                ],
+                [
+                    1 => [
+                        'product_id' => 1,
+                        'type_id' => 'simple',
+                    ],
+                    2 => [
+                        'product_id' => 2,
+                        'type_id' => 'simple',
+                    ],
+                    3 => [
+                        'product_id' => 3,
+                        'type_id' => 'simple',
+                    ],
+                ],
+            ],
+        ];
+    }
+}