changed type hints

fabpot · fabpot · commit d56ae06ca3d2 · 2019-06-04T11:22:54.000+02:00
diff --git a/src/Symfony/Component/Mailer/DelayedSmtpEnvelope.php b/src/Symfony/Component/Mailer/DelayedSmtpEnvelope.php
@@ -11,12 +11,10 @@
 
 namespace Symfony\Component\Mailer;
 
-use Symfony\Component\Mailer\Exception\InvalidArgumentException;
 use Symfony\Component\Mailer\Exception\LogicException;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Header\Headers;
 use Symfony\Component\Mime\Message;
-use Symfony\Component\Mime\RawMessage;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
@@ -31,13 +29,8 @@ final class DelayedSmtpEnvelope extends SmtpEnvelope
     private $recipientsSet = false;
     private $message;
 
-    public function __construct(RawMessage $message)
+    public function __construct(Message $message)
     {
-        if (!$message instanceof Message) {
-            // FIXME: parse the raw message to create the envelope?
-            throw new InvalidArgumentException(sprintf('Unable to create an SmtpEnvelope from a "%s" message.', RawMessage::class));
-        }
-
         $this->message = $message;
     }
 
diff --git a/src/Symfony/Component/Mailer/Tests/SmtpEnvelopeTest.php b/src/Symfony/Component/Mailer/Tests/SmtpEnvelopeTest.php
@@ -91,10 +91,4 @@ public function testRecipientsFromHeaders()
         $e = SmtpEnvelope::create(new Message($headers));
         $this->assertEquals([new Address('to@symfony.com'), new Address('cc@symfony.com'), new Address('bcc@symfony.com')], $e->getRecipients());
     }
-
-    public function testCreateWithRawMessage()
-    {
-        $this->expectException(\InvalidArgumentException::class);
-        SmtpEnvelope::create(new RawMessage(''));
-    }
 }
diff --git a/src/Symfony/Component/Mime/MessageConverter.php b/src/Symfony/Component/Mime/MessageConverter.php
@@ -28,17 +28,12 @@ final class MessageConverter
     /**
      * @throws RuntimeException when unable to convert the message to an email
      */
-    public static function toEmail(RawMessage $message): Email
+    public static function toEmail(Message $message): Email
     {
         if ($message instanceof Email) {
             return $message;
         }
 
-        if (RawMessage::class === \get_class($message)) {
-            // FIXME: parse the raw message to create the envelope?
-            throw new RuntimeException(sprintf('Unable to create an Email from an instance of "%s" as it is not supported yet.', RawMessage::class));
-        }
-
         // try to convert to a "simple" Email instance
         $body = $message->getBody();
         if ($body instanceof TextPart) {

Original file line number	Diff line number	Diff line change
`@@ -91,10 +91,4 @@ public function testRecipientsFromHeaders()`
`91`	`91`	`$e = SmtpEnvelope::create(new Message($headers));`
`92`	`92`	`$this->assertEquals([new Address('to@symfony.com'), new Address('cc@symfony.com'), new Address('bcc@symfony.com')], $e->getRecipients());`
`93`	`93`	`}`
`94`		`-`
`95`		`- public function testCreateWithRawMessage()`
`96`		`- {`
`97`		`- $this->expectException(\InvalidArgumentException::class);`
`98`		`- SmtpEnvelope::create(new RawMessage(''));`
`99`		`- }`
`100`	`94`	`}`