MC-34039: Merge 2.4-develop into 2.4-develop-php74

-- fix merge conflict

Author: fascinosum

app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/Grouped/LinksTest.php

@@ -108,16 +108,24 @@ public function testSaveLinksDataWithProductsAttrs($linksData)
         $linksData['attr_product_ids'] = [12 => true, 16 => true];
         $linksData['position'] = [4 => 6];
         $linksData['qty'] = [9 => 3];
+        $attributes = [
+            ['id' => 1, 'code' => 'position', 'type' => 'int'],
+            ['id' => 2, 'code' => 'qty', 'type' => 'decimal'],
+        ];
         $this->processBehaviorGetter('append');
         $select = $this->createMock(Select::class);
         $this->connection->expects($this->any())->method('select')->willReturn($select);
         $select->expects($this->any())->method('from')->willReturnSelf();
         $select->expects($this->any())->method('where')->willReturnSelf();
-        $this->connection->expects($this->once())->method('fetchAll')->with($select)->willReturn([]);
+        $this->connection->expects($this->once())->method('fetchAll')->with($select)->willReturn($attributes);
         $this->connection->expects($this->once())->method('fetchPairs')->with($select)->willReturn(
             []
         );
         $this->connection->expects($this->exactly(4))->method('insertOnDuplicate');
+        $this->link->expects($this->exactly(2))->method('getAttributeTypeTable')->willReturn(
+            'table_name'
+        );
+
         $this->links->saveLinksData($linksData);
     }
 

dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php

@@ -8,6 +8,8 @@
 namespace Magento\Newsletter\Model;
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Mail\Template\TransportBuilderMock;
@@ -89,18 +91,27 @@ public function testUnsubscribeSubscribe(): void
         $this->assertEquals($subscriber, $subscriber->unsubscribe());
         $this->assertStringContainsString(
             'You have been unsubscribed from the newsletter.',
-            $this->transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
+            $this->getFilteredRawMessage($this->transportBuilder)
         );
         $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $subscriber->getSubscriberStatus());
         // Subscribe and verify
         $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->subscribe('customer@example.com'));
         $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->getSubscriberStatus());
         $this->assertStringContainsString(
             'You have been successfully subscribed to our newsletter.',
-            $this->transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
+            $this->getFilteredRawMessage($this->transportBuilder)
         );
     }
 
+    /**
+     * @param TransportBuilderMock $transportBuilderMock
+     * @return string
+     */
+    private function getFilteredRawMessage(TransportBuilderMock $transportBuilderMock): string
+    {
+        return $transportBuilderMock->getSentMessage()->getBody()->getParts()[0]->getRawContent();
+    }
+
     /**
      * @magentoDataFixture Magento/Newsletter/_files/subscribers.php
      *
@@ -116,14 +127,14 @@ public function testUnsubscribeSubscribeByCustomerId(): void
         $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $subscriber->getSubscriberStatus());
         $this->assertStringContainsString(
             'You have been unsubscribed from the newsletter.',
-            $this->transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
+            $this->getFilteredRawMessage($this->transportBuilder)
         );
         // Subscribe and verify
         $this->assertSame($subscriber, $subscriber->subscribeCustomerById(1));
         $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->getSubscriberStatus());
         $this->assertStringContainsString(
             'You have been successfully subscribed to our newsletter.',
-            $this->transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
+            $this->getFilteredRawMessage($this->transportBuilder)
         );
     }
 
@@ -143,7 +154,7 @@ public function testConfirm(): void
         $subscriber->confirm($subscriber->getSubscriberConfirmCode());
         $this->assertStringContainsString(
             'You have been successfully subscribed to our newsletter.',
-            $this->transportBuilder->getSentMessage()->getBody()->getParts()[0]->getRawContent()
+            $this->getFilteredRawMessage($this->transportBuilder)
         );
     }
 
@@ -152,6 +163,8 @@ public function testConfirm(): void
      * @magentoDataFixture Magento/Newsletter/_files/newsletter_unconfirmed_customer.php
      *
      * @return void
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     public function testSubscribeUnconfirmedCustomerWithSubscription(): void
     {
@@ -166,6 +179,8 @@ public function testSubscribeUnconfirmedCustomerWithSubscription(): void
      * @magentoDataFixture Magento/Customer/_files/unconfirmed_customer.php
      *
      * @return void
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     public function testSubscribeUnconfirmedCustomerWithoutSubscription(): void
     {