MAGETWO-93286: [2.3] Gift Message lost at Checkout when logging in

Author: yelahin-serhiy

dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php

@@ -8,11 +8,11 @@
 use Magento\Catalog\Model\ProductRepository;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Quote\Api\Data\CartInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Framework\Api\ExtensibleDataInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -32,7 +32,11 @@ protected function setUp()
         $this->objectManager = Bootstrap::getObjectManager();
     }
 
-    private function convertToArray($entity)
+    /**
+     * @param ExtensibleDataInterface $entity
+     * @return array
+     */
+    private function convertToArray(ExtensibleDataInterface $entity): array
     {
         return $this->objectManager
             ->create(\Magento\Framework\Api\ExtensibleDataObjectConverter::class)
@@ -42,8 +46,9 @@ private function convertToArray($entity)
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_virtual.php
      * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @return void
      */
-    public function testCollectTotalsWithVirtual()
+    public function testCollectTotalsWithVirtual(): void
     {
         $quote = $this->objectManager->create(Quote::class);
         $quote->load('test01', 'reserved_order_id');
@@ -61,7 +66,10 @@ public function testCollectTotalsWithVirtual()
         $this->assertEquals(20, $quote->getBaseGrandTotal());
     }
 
-    public function testSetCustomerData()
+    /**
+     * @return void
+     */
+    public function testSetCustomerData(): void
     {
         /** @var Quote $quote */
         $quote = $this->objectManager->create(Quote::class);
@@ -87,7 +95,10 @@ public function testSetCustomerData()
         $this->assertEquals('qa@example.com', $quote->getCustomerEmail());
     }
 
-    public function testUpdateCustomerData()
+    /**
+     * @return void
+     */
+    public function testUpdateCustomerData(): void
     {
         /** @var Quote $quote */
         $quote = $this->objectManager->create(Quote::class);
@@ -133,8 +144,10 @@ public function testUpdateCustomerData()
 
     /**
      * Customer data is set to quote (which contains valid group ID).
+     *
+     * @return void
      */
-    public function testGetCustomerGroupFromCustomer()
+    public function testGetCustomerGroupFromCustomer(): void
     {
         /** Preconditions */
         /** @var CustomerInterfaceFactory $customerFactory */
@@ -154,8 +167,9 @@ public function testGetCustomerGroupFromCustomer()
 
     /**
      * @magentoDataFixture Magento/Customer/_files/customer_group.php
+     * @return void
      */
-    public function testGetCustomerTaxClassId()
+    public function testGetCustomerTaxClassId(): void
     {
         /**
          * Preconditions: create quote and assign ID of customer group created in fixture to it.
@@ -179,8 +193,9 @@ public function testGetCustomerTaxClassId()
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_address.php
      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @return void
      */
-    public function testAssignCustomerWithAddressChangeAddressesNotSpecified()
+    public function testAssignCustomerWithAddressChangeAddressesNotSpecified(): void
     {
         /** Preconditions:
          * Customer with two addresses created
@@ -244,8 +259,9 @@ public function testAssignCustomerWithAddressChangeAddressesNotSpecified()
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_address.php
      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @return void
      */
-    public function testAssignCustomerWithAddressChange()
+    public function testAssignCustomerWithAddressChange(): void
     {
         /** Preconditions:
          * Customer with two addresses created
@@ -308,8 +324,9 @@ public function testAssignCustomerWithAddressChange()
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+     * @return void
      */
-    public function testAddProductUpdateItem()
+    public function testAddProductUpdateItem(): void
     {
         /** @var Quote $quote */
         $quote = $this->objectManager->create(Quote::class);
@@ -353,10 +370,13 @@ public function testAddProductUpdateItem()
      * @param Quote $quote
      * @return \Magento\Customer\Api\Data\CustomerInterface
      */
-    protected function _prepareQuoteForTestAssignCustomerWithAddressChange($quote)
-    {
+    protected function _prepareQuoteForTestAssignCustomerWithAddressChange(
+        Quote $quote
+    ): \Magento\Customer\Api\Data\CustomerInterface {
         /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
-        $customerRepository = $this->objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+        $customerRepository = $this->objectManager->create(
+            \Magento\Customer\Api\CustomerRepositoryInterface::class
+        );
         $fixtureCustomerId = 1;
         /** @var \Magento\Customer\Model\Customer $customer */
         $customer = $this->objectManager->create(\Magento\Customer\Model\Customer::class);
@@ -375,11 +395,11 @@ protected function _prepareQuoteForTestAssignCustomerWithAddressChange($quote)
     }
 
     /**
-     * @param $email
+     * @param string $email
      * @param array $customerData
      * @return array
      */
-    protected function changeEmailInCustomerData($email, array $customerData)
+    protected function changeEmailInCustomerData(string $email, array $customerData): array
     {
         $customerData[\Magento\Customer\Model\Data\Customer::EMAIL] = $email;
         return $customerData;
@@ -389,13 +409,16 @@ protected function changeEmailInCustomerData($email, array $customerData)
      * @param array $customerData
      * @return array
      */
-    protected function removeIdFromCustomerData(array $customerData)
+    protected function removeIdFromCustomerData(array $customerData): array
     {
         unset($customerData[\Magento\Customer\Model\Data\Customer::ID]);
         return $customerData;
     }
 
-    protected function _getCustomerDataArray()
+    /**
+     * @return array
+     */
+    protected function _getCustomerDataArray(): array
     {
         return [
             \Magento\Customer\Model\Data\Customer::CONFIRMATION => 'test',
@@ -425,8 +448,9 @@ protected function _getCustomerDataArray()
      *
      * @magentoDataFixture Magento/Sales/_files/order.php
      * @magentoDataFixture Magento/Quote/_files/empty_quote.php
+     * @return void
      */
-    public function testReserveOrderId()
+    public function testReserveOrderId(): void
     {
         /** @var Quote  $quote */
         $quote = $this->objectManager->create(Quote::class);
@@ -441,8 +465,9 @@ public function testReserveOrderId()
     /**
      * Test to verify that disabled product cannot be added to cart
      * @magentoDataFixture Magento/Quote/_files/is_not_salable_product.php
+     * @return void
      */
-    public function testAddedProductToQuoteIsSalable()
+    public function testAddedProductToQuoteIsSalable(): void
     {
         $productId = 99;
 
@@ -462,8 +487,9 @@ public function testAddedProductToQuoteIsSalable()
     /**
      * @magentoDataFixture Magento/Sales/_files/quote.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @return void
      */
-    public function testGetItemById()
+    public function testGetItemById(): void
     {
         $quote = $this->objectManager->create(Quote::class);
         $quote->load('test01', 'reserved_order_id');
@@ -485,8 +511,9 @@ public function testGetItemById()
      * Tests of quotes merging.
      *
      * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @return void
      */
-    public function testMerge()
+    public function testMerge(): void
     {
         $giftMessageId = 1;
 
@@ -507,7 +534,7 @@ public function testMerge()
      * @param string $reservedOrderId
      * @return Quote
      */
-    private function getQuote($reservedOrderId)
+    private function getQuote(string $reservedOrderId): Quote
     {
         /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
         $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);