From d4f001afec98f005a5836e17bf15a29ab29009b3 Mon Sep 17 00:00:00 2001 From: Oskar Stark Date: Fri, 18 Dec 2020 09:57:00 +0100 Subject: [PATCH] [Notifier] Change return type --- UPGRADE-5.3.md | 5 +++++ .../Component/Notifier/Bridge/Infobip/InfobipTransport.php | 2 +- .../Notifier/Bridge/Mattermost/MattermostTransport.php | 2 +- src/Symfony/Component/Notifier/CHANGELOG.md | 1 + .../Component/Notifier/Transport/AbstractTransport.php | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/UPGRADE-5.3.md b/UPGRADE-5.3.md index 2ccc3bc039595..cd7dda750eeb5 100644 --- a/UPGRADE-5.3.md +++ b/UPGRADE-5.3.md @@ -23,6 +23,11 @@ HttpKernel * Marked the class `Symfony\Component\HttpKernel\EventListener\DebugHandlersListener` as internal +Notifier +------- + +* Changed the return type of `Symfony\Component\Notifier\Transport\AbstractTransportFactory::getEndpoint()` from `?string` to `string` + PhpunitBridge ------------- diff --git a/src/Symfony/Component/Notifier/Bridge/Infobip/InfobipTransport.php b/src/Symfony/Component/Notifier/Bridge/Infobip/InfobipTransport.php index df76522386405..32984b3c2f0dc 100644 --- a/src/Symfony/Component/Notifier/Bridge/Infobip/InfobipTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Infobip/InfobipTransport.php @@ -85,7 +85,7 @@ protected function doSend(MessageInterface $message): SentMessage return new SentMessage($message, (string) $this); } - protected function getEndpoint(): ?string + protected function getEndpoint(): string { return $this->host.($this->port ? ':'.$this->port : ''); } diff --git a/src/Symfony/Component/Notifier/Bridge/Mattermost/MattermostTransport.php b/src/Symfony/Component/Notifier/Bridge/Mattermost/MattermostTransport.php index 59730b97f78b0..6a718b9145d10 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mattermost/MattermostTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Mattermost/MattermostTransport.php @@ -85,7 +85,7 @@ protected function doSend(MessageInterface $message): SentMessage return $sentMessage; } - protected function getEndpoint(): ?string + protected function getEndpoint(): string { return rtrim($this->host.($this->port ? ':'.$this->port : '').($this->path ?? ''), '/'); } diff --git a/src/Symfony/Component/Notifier/CHANGELOG.md b/src/Symfony/Component/Notifier/CHANGELOG.md index 528aa24018742..f6106137d9478 100644 --- a/src/Symfony/Component/Notifier/CHANGELOG.md +++ b/src/Symfony/Component/Notifier/CHANGELOG.md @@ -5,6 +5,7 @@ CHANGELOG ----- * The component is not marked as `@experimental` anymore +* [BC BREAK] Changed the return type of `AbstractTransportFactory::getEndpoint()` from `?string` to `string` 5.2.0 ----- diff --git a/src/Symfony/Component/Notifier/Transport/AbstractTransport.php b/src/Symfony/Component/Notifier/Transport/AbstractTransport.php index ccb1f8c84086b..670fd49847ebd 100644 --- a/src/Symfony/Component/Notifier/Transport/AbstractTransport.php +++ b/src/Symfony/Component/Notifier/Transport/AbstractTransport.php @@ -79,7 +79,7 @@ public function send(MessageInterface $message): SentMessage abstract protected function doSend(MessageInterface $message): SentMessage; - protected function getEndpoint(): ?string + protected function getEndpoint(): string { return ($this->host ?: $this->getDefaultHost()).($this->port ? ':'.$this->port : ''); }