Merge branch '5.2' into 5.x

nicolas-grekas · nicolas-grekas · commit 92f814967d8e · 2020-12-18T11:41:32.000+01:00
* 5.2:
  Fix merge
diff --git a/src/Symfony/Component/Notifier/Bridge/Mattermost/MattermostTransport.php b/src/Symfony/Component/Notifier/Bridge/Mattermost/MattermostTransport.php
@@ -87,11 +87,6 @@ protected function doSend(MessageInterface $message): SentMessage
         return $sentMessage;
     }
 
-    protected function getEndpoint(): ?string
-    {
-        return $this->host.($this->port ? ':'.$this->port : '');
-    }
-
     protected function getEndpoint(): ?string
     {
         return rtrim($this->host.($this->port ? ':'.$this->port : '').($this->path ?? ''), '/');

Original file line number	Diff line number	Diff line change
`@@ -87,11 +87,6 @@ protected function doSend(MessageInterface $message): SentMessage`
`87`	`87`	`return $sentMessage;`
`88`	`88`	`}`
`89`	`89`
`90`		`- protected function getEndpoint(): ?string`
`91`		`- {`
`92`		`- return $this->host.($this->port ? ':'.$this->port : '');`
`93`		`- }`
`94`		`-`
`95`	`90`	`protected function getEndpoint(): ?string`
`96`	`91`	`{`
`97`	`92`	`return rtrim($this->host.($this->port ? ':'.$this->port : '').($this->path ?? ''), '/');`