[Mime] Allow array as input for RawMessage

derrabus · nicolas-grekas · commit 10effd71930d · 2021-09-10T12:18:20.000+02:00
Signed-off-by: Alexander M. Turek &lt;me@derrabus.de&gt;
diff --git a/src/Symfony/Component/Mime/RawMessage.php b/src/Symfony/Component/Mime/RawMessage.php
@@ -33,8 +33,11 @@ public function toString(): string
         if (\is_string($this->message)) {
             return $this->message;
         }
+        if ($this->message instanceof \Traversable) {
+            $this->message = iterator_to_array($this->message, false);
+        }
 
-        return $this->message = implode('', iterator_to_array($this->message, false));
+        return $this->message = implode('', $this->message);
     }
 
     public function toIterable(): iterable
diff --git a/src/Symfony/Component/Mime/Tests/RawMessageTest.php b/src/Symfony/Component/Mime/Tests/RawMessageTest.php
@@ -16,23 +16,28 @@
 
 class RawMessageTest extends TestCase
 {
-    public function testToString()
+    /**
+     * @dataProvider provideMessages
+     */
+    public function testToString($messageParameter)
     {
-        $message = new RawMessage('string');
-        $this->assertEquals('string', $message->toString());
-        $this->assertEquals('string', implode('', iterator_to_array($message->toIterable())));
-        // calling methods more than once work
-        $this->assertEquals('string', $message->toString());
-        $this->assertEquals('string', implode('', iterator_to_array($message->toIterable())));
-
-        $message = new RawMessage(new \ArrayObject(['some', ' ', 'string']));
+        $message = new RawMessage($messageParameter);
         $this->assertEquals('some string', $message->toString());
         $this->assertEquals('some string', implode('', iterator_to_array($message->toIterable())));
         // calling methods more than once work
         $this->assertEquals('some string', $message->toString());
         $this->assertEquals('some string', implode('', iterator_to_array($message->toIterable())));
     }
 
+    public function provideMessages(): array
+    {
+        return [
+            'string' => ['some string'],
+            'traversable' => [new \ArrayObject(['some', ' ', 'string'])],
+            'array' => [['some', ' ', 'string']],
+        ];
+    }
+
     public function testSerialization()
     {
         $message = new RawMessage('string');

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,11 @@ public function toString(): string`
`33`	`33`	`if (\is_string($this->message)) {`
`34`	`34`	`return $this->message;`
`35`	`35`	`}`
	`36`	`+ if ($this->message instanceof \Traversable) {`
	`37`	`+ $this->message = iterator_to_array($this->message, false);`
	`38`	`+ }`
`36`	`39`
`37`		`- return $this->message = implode('', iterator_to_array($this->message, false));`
	`40`	`+ return $this->message = implode('', $this->message);`
`38`	`41`	`}`
`39`	`42`
`40`	`43`	`public function toIterable(): iterable`