bug #39812 Make EmailMessage & SmsMessage transport nullable (odolbeau)

fabpot · fabpot · commit 41697467bc22 · 2021-01-14T08:17:33.000+01:00
This PR was merged into the 5.1 branch. Discussion ---------- Make EmailMessage & SmsMessage transport nullable | Q | A | ------------- | --- | Branch? | 5.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | License | MIT Ideally, this should have been done in #38361 as it's exactly the same problem: the `transport` method can be called with `null` with deserializing a message from json (for example). Commits ------- d98aca0 Make EmailMessage & SmsMessage transport nullable
diff --git a/src/Symfony/Component/Notifier/Message/EmailMessage.php b/src/Symfony/Component/Notifier/Message/EmailMessage.php
@@ -97,11 +97,14 @@ public function getOptions(): ?MessageOptionsInterface
     /**
      * @return $this
      */
-    public function transport(string $transport): self
+    public function transport(?string $transport): self
     {
         if (!$this->message instanceof Email) {
             throw new LogicException('Cannot set a Transport on a RawMessage instance.');
         }
+        if (null === $transport) {
+            return $this;
+        }
 
         $this->message->getHeaders()->addTextHeader('X-Transport', $transport);
 
diff --git a/src/Symfony/Component/Notifier/Message/SmsMessage.php b/src/Symfony/Component/Notifier/Message/SmsMessage.php
@@ -81,7 +81,7 @@ public function getSubject(): string
     /**
      * @return $this
      */
-    public function transport(string $transport): self
+    public function transport(?string $transport): self
     {
         $this->transport = $transport;
 

Original file line number	Diff line number	Diff line change
`@@ -97,11 +97,14 @@ public function getOptions(): ?MessageOptionsInterface`
`97`	`97`	`/**`
`98`	`98`	`* @return $this`
`99`	`99`	`*/`
`100`		`- public function transport(string $transport): self`
	`100`	`+ public function transport(?string $transport): self`
`101`	`101`	`{`
`102`	`102`	`if (!$this->message instanceof Email) {`
`103`	`103`	`throw new LogicException('Cannot set a Transport on a RawMessage instance.');`
`104`	`104`	`}`
	`105`	`+ if (null === $transport) {`
	`106`	`+ return $this;`
	`107`	`+ }`
`105`	`108`
`106`	`109`	`$this->message->getHeaders()->addTextHeader('X-Transport', $transport);`
`107`	`110`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function getSubject(): string`
`81`	`81`	`/**`
`82`	`82`	`* @return $this`
`83`	`83`	`*/`
`84`		`- public function transport(string $transport): self`
	`84`	`+ public function transport(?string $transport): self`
`85`	`85`	`{`
`86`	`86`	`$this->transport = $transport;`
`87`	`87`