Merge pull request #5045 from magento-arcticfoxes/MC-22813

[arcticfoxes] MC-22813: Changing Quantity and Adding to cart throws exception

Author: danmooney2

app/code/Magento/ConfigurableProduct/Plugin/SalesRule/Model/Rule/Condition/Product.php

@@ -56,7 +56,10 @@ private function getProductToValidate(
         $attrCode = $subject->getAttribute();
 
         /* Check for attributes which are not available for configurable products */
-        if ($product->getTypeId() == Configurable::TYPE_CODE && !$product->hasData($attrCode)) {
+        if ($product->getTypeId() == Configurable::TYPE_CODE &&
+            !$product->hasData($attrCode) &&
+            count($model->getChildren())
+        ) {
             /** @var \Magento\Catalog\Model\AbstractModel $childProduct */
             $childProduct = current($model->getChildren())->getProduct();
             if ($childProduct->hasData($attrCode)) {

app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php

@@ -176,14 +176,16 @@ private function createProductMock(): \PHPUnit_Framework_MockObject_MockObject
     {
         $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
             ->disableOriginalConstructor()
-            ->setMethods([
-                'getAttribute',
-                'getId',
-                'setQuoteItemQty',
-                'setQuoteItemPrice',
-                'getTypeId',
-                'hasData',
-            ])
+            ->setMethods(
+                [
+                    'getAttribute',
+                    'getId',
+                    'setQuoteItemQty',
+                    'setQuoteItemPrice',
+                    'getTypeId',
+                    'hasData',
+                ]
+            )
             ->getMock();
         $productMock
             ->expects($this->any())
@@ -223,4 +225,38 @@ public function testChildIsNotUsedForValidation()
 
         $this->validatorPlugin->beforeValidate($this->validator, $item);
     }
+
+    /**
+     * Test for Configurable product in invalid state with no children does not raise error
+     */
+    public function testChildIsNotUsedForValidationWhenConfigurableProductIsMissingChildren()
+    {
+        $configurableProductMock = $this->createProductMock();
+        $configurableProductMock
+            ->expects($this->any())
+            ->method('getTypeId')
+            ->willReturn(Configurable::TYPE_CODE);
+
+        $configurableProductMock
+            ->expects($this->any())
+            ->method('hasData')
+            ->with($this->equalTo('special_price'))
+            ->willReturn(false);
+
+        /* @var AbstractItem|\PHPUnit_Framework_MockObject_MockObject $item */
+        $item = $this->getMockBuilder(AbstractItem::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setProduct', 'getProduct', 'getChildren'])
+            ->getMockForAbstractClass();
+        $item->expects($this->any())
+            ->method('getProduct')
+            ->willReturn($configurableProductMock);
+        $item->expects($this->any())
+            ->method('getChildren')
+            ->willReturn([]);
+
+        $this->validator->setAttribute('special_price');
+
+        $this->validatorPlugin->beforeValidate($this->validator, $item);
+    }
 }