[Mime] Throw exception when body in Email attach method is not ok

alamirault · alamirault · commit 30f7dc87f0af · 2022-05-17T00:04:09.000+02:00
diff --git a/src/Symfony/Component/Mime/Email.php b/src/Symfony/Component/Mime/Email.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Mime;
 
 use Symfony\Component\Mime\Exception\LogicException;
+use Symfony\Component\Mime\Exception\UnexpectedTypeException;
 use Symfony\Component\Mime\Part\AbstractPart;
 use Symfony\Component\Mime\Part\DataPart;
 use Symfony\Component\Mime\Part\Multipart\AlternativePart;
@@ -330,6 +331,10 @@ public function getHtmlCharset(): ?string
      */
     public function attach($body, string $name = null, string $contentType = null)
     {
+        if (!\is_string($body) && !\is_resource($body)) {
+            throw new UnexpectedTypeException($body, 'resource or string');
+        }
+
         $this->attachments[] = ['body' => $body, 'name' => $name, 'content-type' => $contentType, 'inline' => false];
 
         return $this;
diff --git a/src/Symfony/Component/Mime/Exception/UnexpectedTypeException.php b/src/Symfony/Component/Mime/Exception/UnexpectedTypeException.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Mime\Exception;
+
+class UnexpectedTypeException extends InvalidArgumentException
+{
+    public function __construct($value, string $expectedType)
+    {
+        parent::__construct(sprintf('Expected argument of type "%s", "%s" given', $expectedType, \is_object($value) ? \get_class($value) : \gettype($value)));
+    }
+}
diff --git a/src/Symfony/Component/Mime/Tests/EmailTest.php b/src/Symfony/Component/Mime/Tests/EmailTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Email;
+use Symfony\Component\Mime\Exception\UnexpectedTypeException;
 use Symfony\Component\Mime\Part\DataPart;
 use Symfony\Component\Mime\Part\Multipart\AlternativePart;
 use Symfony\Component\Mime\Part\Multipart\MixedPart;
@@ -384,4 +385,12 @@ public function testSerialize()
         $this->assertEquals($expected->getHeaders(), $n->getHeaders());
         $this->assertEquals($e->getBody(), $n->getBody());
     }
+
+    public function testAttachBodyExpectStringOrResource()
+    {
+        $this->expectException(UnexpectedTypeException::class);
+        $this->expectExceptionMessage('Expected argument of type "resource or string", "boolean" given');
+
+        (new Email())->attach(false);
+    }
 }
