Merge remote-tracking branch 'karyna/php8-compatibility/fix-newsletter-queue-integration-test' into platform-health

Author: xmav

app/code/Magento/Newsletter/Model/Queue.php

@@ -202,11 +202,14 @@ public function isNew()
      */
     public function setQueueStartAtByString($startAt)
     {
-        if ($startAt === null || $startAt == '') {
-            $this->setQueueStartAt(null);
-        } else {
-            $this->setQueueStartAt($this->utcConverter->convertLocalizedDateToUtc($startAt));
-        }
+        // Cast start_at value to null if value is incorrect ("0", "" must be casted to null)
+        $startAt = (string) $startAt ?: null;
+        // Convert start_at value using UTC converter if start_at value is not null
+        $startAt = $startAt === null
+            ? $startAt
+            : $this->utcConverter->convertLocalizedDateToUtc($startAt);
+        $this->setQueueStartAt($startAt);
+
         return $this;
     }
 

dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php

@@ -46,15 +46,10 @@ protected function tearDown(): void
 
     /**
      * @magentoDataFixture Magento/Newsletter/_files/newsletter_sample.php
+     * @dataProvider postValuesForRequest
      */
-    public function testSaveActionQueueTemplateAndVerifySuccessMessage()
+    public function testSaveActionQueueTemplateAndVerifySuccessMessage(array $postForQueue)
     {
-        $postForQueue = [
-            'sender_email' => 'johndoe_gieee@unknown-domain.com',
-            'sender_name' => 'john doe',
-            'subject' => 'test subject',
-            'text' => 'newsletter text',
-        ];
         $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($postForQueue);
 
@@ -81,4 +76,59 @@ public function testSaveActionQueueTemplateAndVerifySuccessMessage()
             \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
         );
     }
+
+    /**
+     * The data provider for possible request values of the start_at.
+     *
+     * @return array
+     */
+    public function postValuesForRequest(): array
+    {
+        return [
+            'start_at_value_is_integer_zero' => [
+                [
+                    'sender_email' => 'johndoe_gieee@unknown-domain.com',
+                    'sender_name' => 'john doe',
+                    'subject' => 'test subject',
+                    'text' => 'newsletter text',
+                    'start_at' => 0
+                ]
+            ],
+            'start_at_value_is_string_zero' => [
+                [
+                    'sender_email' => 'johndoe_gieee@unknown-domain.com',
+                    'sender_name' => 'john doe',
+                    'subject' => 'test subject',
+                    'text' => 'newsletter text',
+                    'start_at' => '0'
+                ]
+            ],
+            'start_at_value_is_empty_string' => [
+                [
+                    'sender_email' => 'johndoe_gieee@unknown-domain.com',
+                    'sender_name' => 'john doe',
+                    'subject' => 'test subject',
+                    'text' => 'newsletter text',
+                    'start_at' => ''
+                ]
+            ],
+            'start_at_value_not_provided' => [
+                [
+                    'sender_email' => 'johndoe_gieee@unknown-domain.com',
+                    'sender_name' => 'john doe',
+                    'subject' => 'test subject',
+                    'text' => 'newsletter text'
+                ]
+            ],
+            'start_at_value_is_date_time_string' => [
+                [
+                    'sender_email' => 'johndoe_gieee@unknown-domain.com',
+                    'sender_name' => 'john doe',
+                    'subject' => 'test subject',
+                    'text' => 'newsletter text',
+                    'start_at' => date('Y-m-d H:i:s')
+                ]
+            ]
+        ];
+    }
 }

dev/tests/integration/testsuite/Magento/Newsletter/_files/queue.php

@@ -33,7 +33,7 @@
 )->setQueueStatus(
     \Magento\Newsletter\Model\Queue::STATUS_NEVER
 )->setQueueStartAtByString(
-    0
+    null
 )->setStores(
     [$currentStore, $otherStore]
 )->save();