Replace serialize/unserialize with json encode/decode

Author: ajibarra

src/Job/SendMailJob.php

@@ -37,14 +37,19 @@ public function execute(Message $message): ?string
             /** @var \Cake\Mailer\AbstractTransport $transport */
             $transport = $this->getTransport($transportClassName, $config);
 
-            $emailMessage = unserialize($message->getArgument('emailMessage'));
+            $emailMessage = new \Cake\Mailer\Message();
+            $data = json_decode($message->getArgument('emailMessage'), true);
+            if (!is_array($data)) {
+                throw new \InvalidArgumentException('Email Message cannot be decoded.');
+            }
+            $emailMessage->createFromArray($data);
             $result = $transport->send($emailMessage);
         } catch (\Exception $e) {
             Log::error(sprintf('An error has occurred processing message: %s', $e->getMessage()));
-        } finally {
-            if (!$result) {
-                return Processor::REJECT;
-            }
+        }
+
+        if (!$result) {
+            return Processor::REJECT;
         }
 
         return Processor::ACK;

src/Mailer/Transport/QueueTransport.php

@@ -86,7 +86,7 @@ protected function prepareData(Message $message): array
         return [
             'transport' => $this->getConfig('transport'),
             'config' => $this->getConfig(),
-            'emailMessage' => serialize($message),
+            'emailMessage' => json_encode($message),
         ];
     }
 }

tests/TestCase/Job/SendMailJobTest.php

@@ -16,6 +16,7 @@
  */
 namespace Cake\Queue\Test\TestCase\Job;
 
+use Cake\Mailer\Mailer;
 use Cake\Mailer\Transport\DebugTransport;
 use Cake\Queue\Job\Message;
 use Cake\Queue\Job\SendMailJob;
@@ -62,6 +63,20 @@ public function testExecute()
         $this->assertSame(Processor::ACK, $actual);
     }
 
+    /**
+     * Test execute with attachments method
+     *
+     * @return void
+     */
+    public function testExecuteWithAttachments()
+    {
+        $emailMessage = clone $this->message;
+        $emailMessage->addAttachments(['test.txt' => ROOT . 'files' . DS . 'test.txt']);
+        $message = $this->createMessage(DebugTransport::class, [], $emailMessage);
+        $actual = $this->job->execute($message);
+        $this->assertSame(Processor::ACK, $actual);
+    }
+
     /**
      * Test execute method with invalid transport
      *
@@ -86,6 +101,13 @@ public function testExecuteUnserializableMessage()
         $this->assertSame(Processor::REJECT, $actual);
     }
 
+    public function testExecuteNoAbstractTransport()
+    {
+        $message = $this->createMessage(Mailer::class, [], $this->message);
+        $actual = $this->job->execute($message);
+        $this->assertSame(Processor::REJECT, $actual);
+    }
+
     /**
      * Create a simple message for testing.
      *
@@ -98,7 +120,7 @@ protected function createMessage($transport, $config, $emailMessage): Message
             'data' => [
                 'transport' => $transport,
                 'config' => $config,
-                'emailMessage' => serialize($emailMessage),
+                'emailMessage' => json_encode($emailMessage),
 
             ],
         ];

tests/TestCase/Mailer/Transport/QueueTransportTest.php

@@ -17,6 +17,7 @@
 namespace Cake\Queue\Test\TestCase\Job;
 
 use Cake\Queue\Mailer\Transport\QueueTransport;
+use Cake\Queue\QueueManager;
 use Cake\TestSuite\TestCase;
 
 class QueueTransportTest extends TestCase
@@ -28,26 +29,17 @@ class QueueTransportTest extends TestCase
      */
     public function testSend()
     {
+        QueueManager::setConfig('default', [
+            'queue' => 'default',
+            'url' => 'null:',
+        ]);
         $message = (new \Cake\Mailer\Message())
             ->setFrom('[email protected]')
             ->setTo('[email protected]')
             ->setSubject('Sample Subject');
 
-        $transport = $this
-            ->getMockBuilder(QueueTransport::class)->onlyMethods(['enqueueJob'])
-            ->getMock();
-        $expectedData = [
-            'transport' => 'Cake\Mailer\Transport\MailTransport',
-            'config' => [
-                'options' => [],
-                'transport' => 'Cake\Mailer\Transport\MailTransport',
-            ],
-            'emailMessage' => serialize($message),
-        ];
-        $expectedOptions = [];
-        $transport->expects($this->once())
-            ->method('enqueueJob')
-            ->with($expectedData, $expectedOptions);
+        $transport = new QueueTransport();
+
         $result = $transport->send($message);
 
         $headers = $message->getHeadersString(
@@ -66,5 +58,6 @@ public function testSend()
 
         $expected = ['headers' => $headers, 'message' => 'Message has been enqueued'];
         $this->assertEquals($expected, $result);
+        QueueManager::drop('default');
     }
 }

tests/test_app/files/test.txt

@@ -0,0 +1 @@
+TEST CONTENT