Merge remote-tracking branch 'trigger/MC-33908' into MC-33909

Author: xmav

dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/MixSyncAndAsyncSingleQueueTest.php

@@ -42,7 +42,7 @@ public function testMixSyncAndAsyncSingleQueue()
 
         // Publish synchronous message to the same queue
         $input = 'Input value';
-        $response = $this->publisher->publish('sync.topic.for.mixed.sync.and.async.queue', [$input]);
+        $response = $this->publisher->publish('sync.topic.for.mixed.sync.and.async.queue', $input);
         $this->assertEquals($input . ' processed by RPC handler', $response);
 
         $this->waitForAsynchronousResult(count($this->messages), $this->logFilePath);

dev/tests/integration/testsuite/Magento/Framework/Mview/View/ChangelogTest.php

@@ -18,7 +18,7 @@ class ChangelogTest extends \PHPUnit\Framework\TestCase
     protected $objectManager;
 
     /**
-     * @var \Magento\Framework\App\ResourceConnection
+     * @var ResourceConnection
      */
     protected $resource;
 
@@ -30,7 +30,7 @@ class ChangelogTest extends \PHPUnit\Framework\TestCase
     protected $connection;
 
     /**
-     * @var \Magento\Framework\Mview\View\Changelog
+     * @var Changelog
      */
     protected $model;
 
@@ -40,11 +40,11 @@ class ChangelogTest extends \PHPUnit\Framework\TestCase
     protected function setUp(): void
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->resource = $this->objectManager->get(\Magento\Framework\App\ResourceConnection::class);
+        $this->resource = $this->objectManager->get(ResourceConnection::class);
         $this->connection = $this->resource->getConnection();
 
         $this->model = $this->objectManager->create(
-            \Magento\Framework\Mview\View\Changelog::class,
+            Changelog::class,
             ['resource' => $this->resource]
         );
         $this->model->setViewId('test_view_id_1');
@@ -53,6 +53,7 @@ protected function setUp(): void
 
     /**
      * @return void
+     * @throws ChangelogTableNotExistsException
      */
     protected function tearDown(): void
     {
@@ -63,12 +64,13 @@ protected function tearDown(): void
      * Test for create() and drop() methods
      *
      * @return void
+     * @throws ChangelogTableNotExistsException
      */
     public function testCreateAndDrop()
     {
-        /** @var \Magento\Framework\Mview\View\Changelog $model */
+        /** @var Changelog $model */
         $model = $this->objectManager->create(
-            \Magento\Framework\Mview\View\Changelog::class,
+            Changelog::class,
             ['resource' => $this->resource]
         );
         $model->setViewId('test_view_id_2');
@@ -84,11 +86,12 @@ public function testCreateAndDrop()
      * Test for getVersion() method
      *
      * @return void
+     * @throws \Exception
      */
     public function testGetVersion()
     {
         $model = $this->objectManager->create(
-            \Magento\Framework\Mview\View\Changelog::class,
+            Changelog::class,
             ['resource' => $this->resource]
         );
         $model->setViewId('test_view_id_2');
@@ -104,6 +107,8 @@ public function testGetVersion()
      * Test for clear() method
      *
      * @return void
+     * @throws ChangelogTableNotExistsException
+     * @throws \Magento\Framework\Exception\RuntimeException
      */
     public function testClear()
     {
@@ -120,6 +125,8 @@ public function testClear()
      * Test for getList() method
      *
      * @return void
+     * @throws ChangelogTableNotExistsException
+     * @throws \Magento\Framework\Exception\RuntimeException
      */
     public function testGetList()
     {

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

@@ -7,6 +7,7 @@
 
 namespace Magento\Newsletter\Model;
 
+use Laminas\Mail\Headers;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -89,18 +90,27 @@ public function testUnsubscribeSubscribe(): void
         $this->assertEquals($subscriber, $subscriber->unsubscribe());
         $this->assertStringContainsString(
             'You have been unsubscribed from the newsletter.',
-            $this->transportBuilder->getSentMessage()->getRawMessage()
+            $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()->getRawMessage()
+            $this->getFilteredRawMessage($this->transportBuilder)
         );
     }
 
+    /**
+     * @param TransportBuilderMock $transportBuilderMock
+     * @return string
+     */
+    private function getFilteredRawMessage(TransportBuilderMock $transportBuilderMock): string
+    {
+        return str_replace('=' . Headers::EOL, '', $transportBuilderMock->getSentMessage()->getRawMessage());
+    }
+
     /**
      * @magentoDataFixture Magento/Newsletter/_files/subscribers.php
      *
@@ -116,14 +126,14 @@ public function testUnsubscribeSubscribeByCustomerId(): void
         $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $subscriber->getSubscriberStatus());
         $this->assertStringContainsString(
             'You have been unsubscribed from the newsletter.',
-            $this->transportBuilder->getSentMessage()->getRawMessage()
+            $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()->getRawMessage()
+            $this->getFilteredRawMessage($this->transportBuilder)
         );
     }
 
@@ -143,7 +153,7 @@ public function testConfirm(): void
         $subscriber->confirm($subscriber->getSubscriberConfirmCode());
         $this->assertStringContainsString(
             'You have been successfully subscribed to our newsletter.',
-            $this->transportBuilder->getSentMessage()->getRawMessage()
+            $this->getFilteredRawMessage($this->transportBuilder)
         );
     }
 
@@ -152,6 +162,8 @@ public function testConfirm(): void
      * @magentoDataFixture Magento/Newsletter/_files/newsletter_unconfirmed_customer.php
      *
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSubscribeUnconfirmedCustomerWithSubscription(): void
     {

dev/tests/integration/testsuite/Magento/Store/App/FrontController/Plugin/RequestPreprocessorTest.php

@@ -90,6 +90,7 @@ public function testHttpsPassSecureLoginPost()
      * @param array $config
      * @param string $requestUrl
      * @param string $redirectUrl
+     * @magentoAppArea frontend
      * @dataProvider autoRedirectToBaseURLDataProvider
      */
     public function testAutoRedirectToBaseURL(array $config, string $requestUrl, string $redirectUrl)

lib/internal/Magento/Framework/Mview/View/Changelog.php

@@ -180,7 +180,7 @@ public function getVersion()
         }
         $select = $this->connection->select()->from($changelogTableName)->order('version_id DESC')->limit(1);
         $row = $this->connection->fetchRow($select);
-        if ($row === false) {
+        if (!$row) {
             return 0;
         } else {
             if (is_array($row) && array_key_exists('version_id', $row)) {