Merge branch '5.4' into 6.0

* 5.4:
  [DoctrineBridge] Remove dead code
  [Lock] Remove unused variable
  [DoctrineBridge] Replace string with FQCN resolution in EntityType
  Add missing `@return $this` annotations
  [Notifier] Add missing types to SmscTransport

Author: nicolas-grekas

Transport/AbstractTransport.php

@@ -38,6 +38,8 @@ public function __construct(EventDispatcherInterface $dispatcher = null, LoggerI
 
     /**
      * Sets the maximum number of messages to send per second (0 to disable).
+     *
+     * @return $this
      */
     public function setMaxPerSecond(float $rate): self
     {

Transport/Smtp/EsmtpTransport.php

@@ -63,6 +63,9 @@ public function __construct(string $host = 'localhost', int $port = 0, bool $tls
         $stream->setPort($port);
     }
 
+    /**
+     * @return $this
+     */
     public function setUsername(string $username): self
     {
         $this->username = $username;
@@ -75,6 +78,9 @@ public function getUsername(): string
         return $this->username;
     }
 
+    /**
+     * @return $this
+     */
     public function setPassword(string $password): self
     {
         $this->password = $password;

Transport/Smtp/SmtpTransport.php

@@ -59,6 +59,8 @@ public function getStream(): AbstractStream
      *
      * @param int $threshold The maximum number of messages (0 to disable)
      * @param int $sleep     The number of seconds to sleep between stopping and re-starting the transport
+     *
+     * @return $this
      */
     public function setRestartThreshold(int $threshold, int $sleep = 0): self
     {
@@ -99,6 +101,8 @@ public function setPingThreshold(int $seconds): static
      * If your server does not have a domain name, use the IP address. This will
      * automatically be wrapped in square brackets as described in RFC 5321,
      * section 4.1.3.
+     *
+     * @return $this
      */
     public function setLocalDomain(string $domain): self
     {

Transport/Smtp/Stream/SocketStream.php

@@ -31,6 +31,9 @@ final class SocketStream extends AbstractStream
     private ?string $sourceIp = null;
     private array $streamContextOptions = [];
 
+    /**
+     * @return $this
+     */
     public function setTimeout(float $timeout): self
     {
         $this->timeout = $timeout;
@@ -45,6 +48,8 @@ public function getTimeout(): float
 
     /**
      * Literal IPv6 addresses should be wrapped in square brackets.
+     *
+     * @return $this
      */
     public function setHost(string $host): self
     {
@@ -58,6 +63,9 @@ public function getHost(): string
         return $this->host;
     }
 
+    /**
+     * @return $this
+     */
     public function setPort(int $port): self
     {
         $this->port = $port;
@@ -72,6 +80,8 @@ public function getPort(): int
 
     /**
      * Sets the TLS/SSL on the socket (disables STARTTLS).
+     *
+     * @return $this
      */
     public function disableTls(): self
     {
@@ -85,6 +95,9 @@ public function isTLS(): bool
         return $this->tls;
     }
 
+    /**
+     * @return $this
+     */
     public function setStreamOptions(array $options): self
     {
         $this->streamContextOptions = $options;
@@ -101,6 +114,8 @@ public function getStreamOptions(): array
      * Sets the source IP.
      *
      * IPv6 addresses should be wrapped in square brackets.
+     *
+     * @return $this
      */
     public function setSourceIp(string $ip): self
     {