Merge pull request #7221 from magento-performance/MCP-792

[PerfPack] [BUG] Wrong error message is sent in email if order is rejected because of disabled product

Author: adifucan

app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php

@@ -176,6 +176,10 @@ public function savePaymentInformation(
         }
         $this->limitShippingCarrier($quote);
 
+        if (!(int)$quote->getItemsQty()) {
+            throw new CouldNotSaveException(__('Some of the products are disabled.'));
+        }
+
         $this->paymentMethodManagement->set($cartId, $paymentMethod);
         return true;
     }

app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php

@@ -180,6 +180,7 @@ public function testSavePaymentInformationWithoutBillingAddress()
         $paymentMock = $this->getMockForAbstractClass(PaymentInterface::class);
         $billingAddressMock = $this->getMockForAbstractClass(AddressInterface::class);
         $quoteMock = $this->createMock(Quote::class);
+        $quoteMock->expects($this->any())->method('getItemsQty')->willReturn(1);
 
         $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf();
 
@@ -210,6 +211,7 @@ public function testSavePaymentInformationAndPlaceOrderWithLocalizedException()
 
         $quoteMock = $this->createMock(Quote::class);
         $quoteMock->method('getBillingAddress')->willReturn($billingAddressMock);
+        $quoteMock->expects($this->any())->method('getItemsQty')->willReturn(1);
         $this->cartRepositoryMock->method('getActive')->with($cartId)->willReturn($quoteMock);
 
         $quoteIdMask = $this->getMockBuilder(QuoteIdMask::class)
@@ -231,6 +233,35 @@ public function testSavePaymentInformationAndPlaceOrderWithLocalizedException()
         $this->model->savePaymentInformationAndPlaceOrder($cartId, $email, $paymentMock, $billingAddressMock);
     }
 
+    public function testSavePaymentInformationAndPlaceOrderWithDisabledProduct()
+    {
+        $this->expectException('Magento\Framework\Exception\CouldNotSaveException');
+        $this->expectExceptionMessage('Some of the products are disabled.');
+        $cartId = 100;
+        $email = 'email@magento.com';
+        $paymentMock = $this->getMockForAbstractClass(PaymentInterface::class);
+        $billingAddressMock = $this->getMockForAbstractClass(AddressInterface::class);
+
+        $quoteMock = $this->createMock(Quote::class);
+        $quoteMock->method('getBillingAddress')->willReturn($billingAddressMock);
+        $quoteMock->expects($this->any())->method('getItemsQty')->willReturn(0);
+        $this->cartRepositoryMock->method('getActive')->with($cartId)->willReturn($quoteMock);
+
+        $quoteIdMask = $this->getMockBuilder(QuoteIdMask::class)
+            ->addMethods(['getQuoteId'])
+            ->onlyMethods(['load'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->quoteIdMaskFactoryMock->method('create')->willReturn($quoteIdMask);
+        $quoteIdMask->method('load')->with($cartId, 'masked_id')->willReturnSelf();
+        $quoteIdMask->method('getQuoteId')->willReturn($cartId);
+
+        $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf();
+
+        $this->paymentMethodManagementMock->expects($this->never())->method('set')->with($cartId, $paymentMock);
+        $this->model->savePaymentInformationAndPlaceOrder($cartId, $email, $paymentMock, $billingAddressMock);
+    }
+
     /**
      * @param int $cartId
      * @param MockObject $billingAddressMock
@@ -266,6 +297,9 @@ private function getMockForAssignBillingAddress(
         $this->cartRepositoryMock->method('getActive')
             ->with($cartId)
             ->willReturn($quote);
+        $quote->expects($this->any())
+            ->method('getItemsQty')
+            ->willReturn(1);
         $quote->expects($this->any())
             ->method('getBillingAddress')
             ->willReturn($quoteBillingAddress);

setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php

@@ -62,7 +62,7 @@ private function findMissingFactories($file, $classReflection, $methodName, $ent
         $parameters = $constructor->getParameters();
         /** @var $parameter \ReflectionParameter */
         foreach ($parameters as $parameter) {
-            preg_match('/\[\s\<\w+?>\s([\w\\\\]+)/s', $parameter->__toString(), $matches);
+            preg_match('/\[\s\<\w+?>\s\??([\w\\\\]+)/s', $parameter->__toString(), $matches);
             if (isset($matches[1]) && substr($matches[1], -strlen($entityType)) == $entityType) {
                 $missingClassName = $matches[1];
                 if ($this->shouldGenerateClass($missingClassName, $entityType, $file)) {