symfony · fabpot · Feb 4, 2020 · Jan 2, 2020 · fancyweb · Jan 2, 2020
diff --git a/UPGRADE-5.1.md b/UPGRADE-5.1.md
@@ -18,6 +18,14 @@ HttpFoundation
   `RedirectResponse::create()`, and `StreamedResponse::create()` methods (use
   `__construct()` instead)

+Notifier
+--------
+
+ * [BC BREAK] The `ChatMessage::fromNotification()` method's `$recipient` and `$transport`
+   arguments were removed.
+ * [BC BREAK] The `EmailMessage::fromNotification()` and `SmsMessage::fromNotification()`
+   methods' `$transport` argument was removed.
+
 Routing
 -------


diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php
@@ -21,7 +21,6 @@
 use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Message\MessageOptionsInterface;
 use Symfony\Component\Notifier\Notification\Notification;
-use Symfony\Component\Notifier\Recipient\Recipient;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;

@@ -145,7 +144,7 @@ public function testSendWithNotification(): void
            ->willReturn(json_encode(['ok' => true]));

        $notification = new Notification($message);
-        $chatMessage = ChatMessage::fromNotification($notification, new Recipient('test-email@example.com'));
+        $chatMessage = ChatMessage::fromNotification($notification);
        $options = SlackOptions::fromNotification($notification);

        $expectedBody = http_build_query([

diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/composer.json b/src/Symfony/Component/Notifier/Bridge/Slack/composer.json
@@ -18,7 +18,7 @@
    "require": {
        "php": "^7.2.5",
        "symfony/http-client": "^4.3|^5.0",
-        "symfony/notifier": "^5.0"
+        "symfony/notifier": "^5.1"
    },
    "require-dev": {
        "symfony/event-dispatcher": "^4.3|^5.0"

diff --git a/src/Symfony/Component/Notifier/CHANGELOG.md b/src/Symfony/Component/Notifier/CHANGELOG.md
@@ -1,6 +1,14 @@
 CHANGELOG
 =========

+5.1.0
+-----
+
+* [BC BREAK] The `ChatMessage::fromNotification()` method's `$recipient` and `$transport`
+  arguments were removed.
+* [BC BREAK] The `EmailMessage::fromNotification()` and `SmsMessage::fromNotification()`
+  methods' `$transport` argument was removed.
+
 5.0.0
 -----


diff --git a/src/Symfony/Component/Notifier/Channel/ChatChannel.php b/src/Symfony/Component/Notifier/Channel/ChatChannel.php
@@ -36,7 +36,7 @@ public function notify(Notification $notification, Recipient $recipient, string
        }

        if (null === $message) {
-            $message = ChatMessage::fromNotification($notification, $recipient, $transportName);
+            $message = ChatMessage::fromNotification($notification);
        }

        $message->transport($transportName);

diff --git a/src/Symfony/Component/Notifier/Channel/SmsChannel.php b/src/Symfony/Component/Notifier/Channel/SmsChannel.php
@@ -32,7 +32,7 @@ public function notify(Notification $notification, Recipient $recipient, string
        }

        if (null === $message) {
-            $message = SmsMessage::fromNotification($notification, $recipient, $transportName);
+            $message = SmsMessage::fromNotification($notification, $recipient);
        }

        if (null !== $transportName) {

diff --git a/src/Symfony/Component/Notifier/Message/ChatMessage.php b/src/Symfony/Component/Notifier/Message/ChatMessage.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Notifier\Message;

 use Symfony\Component\Notifier\Notification\Notification;
-use Symfony\Component\Notifier\Recipient\Recipient;

 /**
 * @author Fabien Potencier <fabien@symfony.com>
@@ -32,7 +31,7 @@ public function __construct(string $subject, MessageOptionsInterface $options =
        $this->options = $options;
    }

-    public static function fromNotification(Notification $notification, Recipient $recipient, string $transport = null): self
+    public static function fromNotification(Notification $notification): self
    {
        $message = new self($notification->getSubject());
        $message->notification = $notification;

diff --git a/src/Symfony/Component/Notifier/Message/EmailMessage.php b/src/Symfony/Component/Notifier/Message/EmailMessage.php
@@ -35,7 +35,7 @@ public function __construct(RawMessage $message, Envelope $envelope = null)
        $this->envelope = $envelope;
    }

-    public static function fromNotification(Notification $notification, Recipient $recipient, string $transport = null): self
+    public static function fromNotification(Notification $notification, Recipient $recipient): self
    {
        if (!class_exists(NotificationEmail::class)) {
            $email = (new Email())

diff --git a/src/Symfony/Component/Notifier/Message/SmsMessage.php b/src/Symfony/Component/Notifier/Message/SmsMessage.php
@@ -34,10 +34,10 @@ public function __construct(string $phone, string $subject)
        $this->phone = $phone;
    }

-    public static function fromNotification(Notification $notification, Recipient $recipient, string $transport = null): self
+    public static function fromNotification(Notification $notification, Recipient $recipient): self
    {
        if (!$recipient instanceof SmsRecipientInterface) {
-            throw new LogicException(sprintf('To send a SMS message, "%s" should implement "%s" or the recipient should implement "%s".', get_class($notification), SmsNotificationInterface::class, SmsRecipientInterface::class));
+            throw new LogicException(sprintf('To send a SMS message, "%s" should implement "%s" or the recipient should implement "%s".', \get_class($notification), SmsNotificationInterface::class, SmsRecipientInterface::class));
        }

        return new self($recipient->getPhone(), $notification->getSubject());
-Original file line number
+Diff line change
@@ -12,7 +12,6 @@
     namespace Symfony\Component\Notifier\Message;
     use Symfony\Component\Notifier\Notification\Notification;
-    use Symfony\Component\Notifier\Recipient\Recipient;
     /**
      * @author Fabien Potencier <fabien@symfony.com>
@@ -32,7 +31,7 @@ public function __construct(string $subject, MessageOptionsInterface $options =
             $this->options = $options;
         }
-        public static function fromNotification(Notification $notification, Recipient $recipient, string $transport = null): self
+        public static function fromNotification(Notification $notification): self
             Copy link

  
      
    
  

  
      

  
    Contributor


      

  Author


  

  
    
      

      
            fancyweb
  

      

      

      


        Jan 2, 2020


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Maybe we need $recipient here in the future? But being forced to pass an useless argument is worse in practice for me.
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
         {
             $message = new self($notification->getSubject());
             $message->notification = $notification;
-          Expand Down