Narrow existing return types on private/internal/final/test methods

Author: nicolas-grekas

Message/ChatMessage.php

@@ -37,10 +37,7 @@ public static function fromNotification(Notification $notification): self
         return $message;
     }
 
-    /**
-     * @return $this
-     */
-    public function subject(string $subject): self
+    public function subject(string $subject): static
     {
         $this->subject = $subject;
 
@@ -57,10 +54,7 @@ public function getRecipientId(): ?string
         return $this->options ? $this->options->getRecipientId() : null;
     }
 
-    /**
-     * @return $this
-     */
-    public function options(MessageOptionsInterface $options): self
+    public function options(MessageOptionsInterface $options): static
     {
         $this->options = $options;
 
@@ -72,10 +66,7 @@ public function getOptions(): ?MessageOptionsInterface
         return $this->options;
     }
 
-    /**
-     * @return $this
-     */
-    public function transport(?string $transport): self
+    public function transport(?string $transport): static
     {
         $this->transport = $transport;
 

Message/EmailMessage.php

@@ -72,10 +72,7 @@ public function getEnvelope(): ?Envelope
         return $this->envelope;
     }
 
-    /**
-     * @return $this
-     */
-    public function envelope(Envelope $envelope): self
+    public function envelope(Envelope $envelope): static
     {
         $this->envelope = $envelope;
 
@@ -97,10 +94,7 @@ public function getOptions(): ?MessageOptionsInterface
         return null;
     }
 
-    /**
-     * @return $this
-     */
-    public function transport(?string $transport): self
+    public function transport(?string $transport): static
     {
         if (!$this->message instanceof Email) {
             throw new LogicException('Cannot set a Transport on a RawMessage instance.');

Message/SmsMessage.php

@@ -39,10 +39,7 @@ public static function fromNotification(Notification $notification, SmsRecipient
         return new self($recipient->getPhone(), $notification->getSubject());
     }
 
-    /**
-     * @return $this
-     */
-    public function phone(string $phone): self
+    public function phone(string $phone): static
     {
         if ('' === $phone) {
             throw new InvalidArgumentException(sprintf('"%s" needs a phone number, it cannot be empty.', static::class));
@@ -63,10 +60,7 @@ public function getRecipientId(): string
         return $this->phone;
     }
 
-    /**
-     * @return $this
-     */
-    public function subject(string $subject): self
+    public function subject(string $subject): static
     {
         $this->subject = $subject;
 
@@ -78,10 +72,7 @@ public function getSubject(): string
         return $this->subject;
     }
 
-    /**
-     * @return $this
-     */
-    public function transport(?string $transport): self
+    public function transport(?string $transport): static
     {
         $this->transport = $transport;
 

Transport/NullTransportFactory.php

@@ -18,10 +18,7 @@
  */
 final class NullTransportFactory extends AbstractTransportFactory
 {
-    /**
-     * @return NullTransport
-     */
-    public function create(Dsn $dsn): TransportInterface
+    public function create(Dsn $dsn): NullTransport
     {
         if ('null' === $dsn->getScheme()) {
             return new NullTransport($this->dispatcher);