Merge pull request #151 from fballiano/cp_pr_134

Fix integration tests for Magento_Backend and Magento_Bundle (Cherry-picked PR #134 into `release/1.x`)

Author: rhoerr

app/code/Magento/Bundle/Model/ResourceModel/Option/AreBundleOptionsSalable.php

@@ -72,6 +72,10 @@ public function execute(int $entityId, int $storeId): bool
                 ['child_products' => $this->resourceConnection->getTableName('catalog_product_entity')],
                 'child_products.entity_id = bundle_selections.product_id',
                 []
+            )->joinInner(
+                ['child_stock_item' => $this->resourceConnection->getTableName('cataloginventory_stock_item')],
+                'child_stock_item.product_id = child_products.entity_id',
+                []
             )->group(
                 ['bundle_options.parent_id', 'bundle_options.option_id']
             )->where(
@@ -103,18 +107,36 @@ public function execute(int $entityId, int $storeId): bool
             '1',
             '0'
         );
+
+        $hasMinRequiredQuantity = $connection->getCheckSql(
+            'required = 1 AND manage_stock = 1 AND selection_can_change_qty = 0',
+            '(qty >= bundle_selections.selection_qty OR backorders > 0) AND is_in_stock = 1',
+            '1'
+        );
+
+        $requiredInStock = $connection->getCheckSql(
+            'required = 1 AND manage_stock = 1 AND selection_can_change_qty = 1',
+            '(qty >= 0 OR backorders > 0) AND is_in_stock = 1',
+            '1'
+        );
+
         $optionsSaleabilitySelect->columns([
             'required' => 'bundle_options.required',
             'is_salable' => $isOptionSalableExpr,
             'is_required_and_unsalable' => $isRequiredOptionUnsalable,
+            'has_min_required_quantity' => $hasMinRequiredQuantity,
+            'required_in_stock' => $requiredInStock
         ]);
 
         $select = $connection->select()->from(
             $optionsSaleabilitySelect,
-            [new \Zend_Db_Expr('(MAX(is_salable) = 1 AND MAX(is_required_and_unsalable) = 0)')]
+            [new \Zend_Db_Expr(
+                '(MAX(is_salable) = 1 AND MAX(is_required_and_unsalable) = 0)' .
+                'AND MIN(required_in_stock) = 1 AND MIN(has_min_required_quantity) = 1'
+            )]
         );
-        $isSalable = $connection->fetchOne($select);
 
+        $isSalable = $connection->fetchOne($select);
         return (bool) $isSalable;
     }
 }

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

@@ -10,7 +10,7 @@
 use Magento\CatalogInventory\Model\ResourceModel\Stock\Item\StockItemCriteriaMapper;
 
 /**
- * Class StockItemCriteria
+ * Build criteria to filter products on catalog_stockinventory table
  */
 class StockItemCriteria extends AbstractCriteria implements \Magento\CatalogInventory\Api\StockItemCriteriaInterface
 {
@@ -55,7 +55,11 @@ public function setScopeFilter($scope)
      */
     public function setProductsFilter($products)
     {
-        $this->data['products_filter'] = [$products];
+        if (is_array($products)) {
+            $this->data['products_filter'] = $products;
+        } else {
+            $this->data['products_filter'] = [$products];
+        }
         return true;
     }
 

app/code/Magento/ConfigurableProduct/Model/Inventory/ChangeParentStockStatus.php

@@ -59,7 +59,7 @@ public function __construct(
     /**
      * Update stock status of configurable products based on children products stock status
      *
-     * @param array $childrenIds
+     * @param array<string|int> $childrenIds
      * @return void
      */
     public function execute(array $childrenIds): void
@@ -70,6 +70,17 @@ public function execute(array $childrenIds): void
         }
     }
 
+    /**
+     * Updates the parent stock status based on children statuses
+     *
+     * @param int $parentId
+     * @return void
+     */
+    public function executeFromParent(int $parentId): void
+    {
+        $this->processStockForParent($parentId);
+    }
+
     /**
      * Update stock status of configurable product based on children products stock status
      *
@@ -106,6 +117,7 @@ private function processStockForParent(int $productId): void
         if ($this->isNeedToUpdateParent($parentStockItem, $childrenIsInStock)) {
             $parentStockItem->setIsInStock($childrenIsInStock);
             $parentStockItem->setStockStatusChangedAuto(1);
+            // @phpstan-ignore method.notFound
             $parentStockItem->setStockStatusChangedAutomaticallyFlag(true);
             $this->stockItemRepository->save($parentStockItem);
         }

app/code/Magento/ConfigurableProduct/Model/Inventory/ParentItemProcessor.php

@@ -7,6 +7,7 @@
 
 namespace Magento\ConfigurableProduct\Model\Inventory;
 
+use Magento\Catalog\Model\Product\Type;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Catalog\Api\Data\ProductInterface as Product;
 use Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory;
@@ -20,10 +21,7 @@
  */
 class ParentItemProcessor implements ParentItemProcessorInterface
 {
-    /**
-     * @var ChangeParentStockStatus
-     */
-    private $changeParentStockStatus;
+    private ChangeParentStockStatus $changeParentStockStatus;
 
     /**
      * @param Configurable $configurableType
@@ -50,8 +48,12 @@ public function __construct(
      * @param Product $product
      * @return void
      */
-    public function process(Product $product)
+    public function process(Product $product): void
     {
-        $this->changeParentStockStatus->execute([$product->getId()]);
+        if ($product->getTypeId() === Type::TYPE_SIMPLE) {
+            $this->changeParentStockStatus->execute([$product->getId()]);
+        } elseif ($product->getTypeId() === Configurable::TYPE_CODE) {
+            $this->changeParentStockStatus->executeFromParent((int)$product->getId());
+        }
     }
 }

app/code/Magento/Customer/Helper/Address.php

@@ -330,7 +330,7 @@ public function convertStreetLines($origStreets, $toCount)
             }
         }
 
-        return $lines;
+        return array_filter($lines);
     }
 
     /**

app/code/Magento/Customer/Model/Metadata/Form/Multiline.php

@@ -116,7 +116,7 @@ public function outputValue($format = ElementFactory::OUTPUT_FORMAT_TEXT)
                 $output = implode("<br />", $values);
                 break;
             case ElementFactory::OUTPUT_FORMAT_ONELINE:
-                $output = implode(" ", $values);
+                $output = trim(implode(" ", $values), ' ');
                 break;
             default:
                 $output = implode("\n", $values);

app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php

@@ -74,7 +74,6 @@ protected function _initSelect()
     {
         parent::_initSelect();
         $this->joinRegionNameTable();
-
         return $this;
     }
 

app/code/Magento/Customer/Test/Unit/Helper/AddressTest.php

@@ -242,6 +242,7 @@ public static function getConvertStreetLinesDataProvider()
         return [
             [['street1', 'street2', 'street3', 'street4'], 3, ['street1 street2', 'street3', 'street4']],
             [['street1', 'street2', 'street3', 'street4'], 2, ['street1 street2', 'street3 street4']],
+            [['street1', ''], 2, ['street1']]
         ];
     }
 

dev/tests/integration/testsuite/Magento/Backend/Block/Page/FooterTest.php

@@ -6,6 +6,10 @@
 
 namespace Magento\Backend\Block\Page;
 
+use Magento\Framework\App\CacheInterface;
+use Magento\Framework\App\ProductMetadata;
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * Test \Magento\Backend\Block\Page\Footer
  *
@@ -16,7 +20,7 @@ class FooterTest extends \PHPUnit\Framework\TestCase
     /**
      * Test Product Version Value
      */
-    const TEST_PRODUCT_VERSION = '222.333.444';
+    private const TEST_PRODUCT_VERSION = '222.333.444';
 
     /**
      * @var \Magento\Backend\Block\Page\Footer
@@ -33,6 +37,7 @@ protected function setUp(): void
         $productMetadataMock->expects($this->once())
             ->method('getDistributionVersion')
             ->willReturn($this::TEST_PRODUCT_VERSION);
+
         $this->block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             \Magento\Framework\View\LayoutInterface::class
         )->createBlock(
@@ -44,6 +49,8 @@ protected function setUp(): void
 
     public function testToHtml()
     {
+        /** @var \Magento\Framework\App\CacheInterface $cacheManager */
+        Bootstrap::getObjectManager()->create(CacheInterface::class);
         $footerContent = $this->block->toHtml();
         $this->assertStringContainsString(
             'ver. ' . $this::TEST_PRODUCT_VERSION,

dev/tests/integration/testsuite/Magento/Bundle/Model/Product/IsSaleableTest.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Bundle\Model\Product;
 
+use Magento\Framework\Exception\NoSuchEntityException;
+
 /**
  * Test class for \Magento\Bundle\Model\Product\Type (bundle product type)
  *
@@ -216,6 +218,7 @@ public function testIsSaleableOnBundleWithoutSaleableSelectionsOnRequiredOption(
     /**
      * Check bundle product is NOT saleable if
      * there are not enough qty of selection on required option
+     * when user cannot define own quantities
      *
      * @magentoAppIsolation enabled
      * @covers \Magento\Bundle\Model\Product\Type::isSalable
@@ -224,9 +227,7 @@ public function testIsSaleableOnBundleWithoutSaleableSelectionsOnRequiredOption(
     public function testIsSaleableOnBundleWithNotEnoughQtyOfSelection()
     {
         $this->setQtyForSelections(['simple1', 'simple2', 'simple3'], 1);
-
         $bundleProduct = $this->productRepository->get('bundle-product');
-
         $this->assertFalse(
             $bundleProduct->isSalable(),
             'Bundle product supposed to be non saleable'
@@ -354,4 +355,22 @@ private function setQtyForSelections($productsSku, $qty)
             $this->productRepository->save($product);
         }
     }
+
+    /**
+     * Check bundle product is not salable if required option where user can
+     * set own quantity is not in stock
+     *
+     * @return void
+     * @magentoAppIsolation enabled
+     * @throws NoSuchEntityException
+     */
+    public function testIsSalableOnBundleWithRequiredOptionUserCanChangeQtyWithoutStock()
+    {
+        $product = $this->productRepository->get('bundle-product-checkbox-required-option');
+        $this->setQtyForSelections(['simple1'], 0);
+        $this->assertFalse(
+            $product->isSalable(),
+            'Bundle product with required option that has 0 stock should not be salable'
+        );
+    }
 }