Remove FQCN type hints on properties

fabpot · fabpot · commit d0547edd8de5 · 2021-12-08T16:13:44.000+01:00
diff --git a/DataCollector/MessageDataCollector.php b/DataCollector/MessageDataCollector.php
@@ -22,7 +22,7 @@
  */
 final class MessageDataCollector extends DataCollector
 {
-    private MessageEvents $events;
+    private $events;
 
     public function __construct(MessageLoggerListener $logger)
     {
diff --git a/DelayedEnvelope.php b/DelayedEnvelope.php
@@ -25,7 +25,7 @@ final class DelayedEnvelope extends Envelope
 {
     private bool $senderSet = false;
     private bool $recipientsSet = false;
-    private Message $message;
+    private $message;
 
     public function __construct(Message $message)
     {
diff --git a/Envelope.php b/Envelope.php
@@ -21,7 +21,7 @@
  */
 class Envelope
 {
-    private Address $sender;
+    private $sender;
     private array $recipients = [];
 
     /**
diff --git a/Event/MessageEvent.php b/Event/MessageEvent.php
@@ -22,8 +22,8 @@
  */
 final class MessageEvent extends Event
 {
-    private RawMessage $message;
-    private Envelope $envelope;
+    private $message;
+    private $envelope;
     private string $transport;
     private bool $queued;
 
diff --git a/EventListener/EnvelopeListener.php b/EventListener/EnvelopeListener.php
@@ -23,7 +23,7 @@
  */
 class EnvelopeListener implements EventSubscriberInterface
 {
-    private ?Address $sender = null;
+    private $sender = null;
 
     /**
      * @var Address[]|null
diff --git a/EventListener/MessageListener.php b/EventListener/MessageListener.php
@@ -39,9 +39,9 @@ class MessageListener implements EventSubscriberInterface
         'bcc' => self::HEADER_ADD,
     ];
 
-    private ?Headers $headers;
+    private $headers;
     private array $headerRules = [];
-    private ?BodyRendererInterface $renderer;
+    private $renderer;
 
     public function __construct(Headers $headers = null, BodyRendererInterface $renderer = null, array $headerRules = self::DEFAULT_RULES)
     {
diff --git a/EventListener/MessageLoggerListener.php b/EventListener/MessageLoggerListener.php
@@ -23,7 +23,7 @@
  */
 class MessageLoggerListener implements EventSubscriberInterface, ResetInterface
 {
-    private MessageEvents $events;
+    private $events;
 
     public function __construct()
     {
diff --git a/Exception/HttpTransportException.php b/Exception/HttpTransportException.php
@@ -18,7 +18,7 @@
  */
 class HttpTransportException extends TransportException
 {
-    private ResponseInterface $response;
+    private $response;
 
     public function __construct(string $message, ResponseInterface $response, int $code = 0, \Throwable $previous = null)
     {
diff --git a/Mailer.php b/Mailer.php
@@ -23,9 +23,9 @@
  */
 final class Mailer implements MailerInterface
 {
-    private TransportInterface $transport;
-    private ?MessageBusInterface $bus;
-    private ?EventDispatcherInterface $dispatcher;
+    private $transport;
+    private $bus;
+    private $dispatcher;
 
     public function __construct(TransportInterface $transport, MessageBusInterface $bus = null, EventDispatcherInterface $dispatcher = null)
     {
diff --git a/Messenger/MessageHandler.php b/Messenger/MessageHandler.php
@@ -19,7 +19,7 @@
  */
 class MessageHandler
 {
-    private TransportInterface $transport;
+    private $transport;
 
     public function __construct(TransportInterface $transport)
     {
diff --git a/Messenger/SendEmailMessage.php b/Messenger/SendEmailMessage.php
@@ -19,8 +19,8 @@
  */
 class SendEmailMessage
 {
-    private RawMessage $message;
-    private ?Envelope $envelope;
+    private $message;
+    private $envelope;
 
     public function __construct(RawMessage $message, Envelope $envelope = null)
     {
diff --git a/SentMessage.php b/SentMessage.php
@@ -19,9 +19,9 @@
  */
 class SentMessage
 {
-    private RawMessage $original;
-    private RawMessage $raw;
-    private Envelope $envelope;
+    private $original;
+    private $raw;
+    private $envelope;
     private string $messageId;
     private string $debug = '';
 
diff --git a/Transport/AbstractTransport.php b/Transport/AbstractTransport.php
@@ -25,8 +25,8 @@
  */
 abstract class AbstractTransport implements TransportInterface
 {
-    private ?EventDispatcherInterface $dispatcher;
-    private LoggerInterface $logger;
+    private $dispatcher;
+    private $logger;
     private float $rate = 0;
     private float $lastSent = 0;
 
diff --git a/Transport/FailoverTransport.php b/Transport/FailoverTransport.php
@@ -18,7 +18,7 @@
  */
 class FailoverTransport extends RoundRobinTransport
 {
-    private ?TransportInterface $currentTransport = null;
+    private $currentTransport = null;
 
     protected function getNextTransport(): ?TransportInterface
     {
diff --git a/Transport/SendmailTransport.php b/Transport/SendmailTransport.php
@@ -38,8 +38,8 @@
 class SendmailTransport extends AbstractTransport
 {
     private string $command = '/usr/sbin/sendmail -bs';
-    private ProcessStream $stream;
-    private ?SmtpTransport $transport = null;
+    private $stream;
+    private $transport = null;
 
     /**
      * Constructor.
diff --git a/Transport/Smtp/SmtpTransport.php b/Transport/Smtp/SmtpTransport.php
@@ -37,7 +37,7 @@ class SmtpTransport extends AbstractTransport
     private int $restartCounter = 0;
     private int $pingThreshold = 100;
     private float $lastMessageTime = 0;
-    private AbstractStream $stream;
+    private $stream;
     private string $domain = '[127.0.0.1]';
 
     public function __construct(AbstractStream $stream = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
diff --git a/Transport/Transports.php b/Transport/Transports.php
@@ -27,7 +27,7 @@ final class Transports implements TransportInterface
      * @var array<string, TransportInterface>
      */
     private array $transports = [];
-    private TransportInterface $default;
+    private $default;
 
     /**
      * @param iterable<string, TransportInterface> $transports

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*/`
`23`	`23`	`final class MessageDataCollector extends DataCollector`
`24`	`24`	`{`
`25`		`- private MessageEvents $events;`
	`25`	`+ private $events;`
`26`	`26`
`27`	`27`	`public function __construct(MessageLoggerListener $logger)`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ final class DelayedEnvelope extends Envelope`
`25`	`25`	`{`
`26`	`26`	`private bool $senderSet = false;`
`27`	`27`	`private bool $recipientsSet = false;`
`28`		`- private Message $message;`
	`28`	`+ private $message;`
`29`	`29`
`30`	`30`	`public function __construct(Message $message)`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*/`
`22`	`22`	`class Envelope`
`23`	`23`	`{`
`24`		`- private Address $sender;`
	`24`	`+ private $sender;`
`25`	`25`	`private array $recipients = [];`
`26`	`26`
`27`	`27`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`*/`
`24`	`24`	`class EnvelopeListener implements EventSubscriberInterface`
`25`	`25`	`{`
`26`		`- private ?Address $sender = null;`
	`26`	`+ private $sender = null;`
`27`	`27`
`28`	`28`	`/**`
`29`	`29`	`* @var Address[]\|null`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*/`
`19`	`19`	`class HttpTransportException extends TransportException`
`20`	`20`	`{`
`21`		`- private ResponseInterface $response;`
	`21`	`+ private $response;`
`22`	`22`
`23`	`23`	`public function __construct(string $message, ResponseInterface $response, int $code = 0, \Throwable $previous = null)`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,9 @@`
`23`	`23`	`*/`
`24`	`24`	`final class Mailer implements MailerInterface`
`25`	`25`	`{`
`26`		`- private TransportInterface $transport;`
`27`		`- private ?MessageBusInterface $bus;`
`28`		`- private ?EventDispatcherInterface $dispatcher;`
	`26`	`+ private $transport;`
	`27`	`+ private $bus;`
	`28`	`+ private $dispatcher;`
`29`	`29`
`30`	`30`	`public function __construct(TransportInterface $transport, MessageBusInterface $bus = null, EventDispatcherInterface $dispatcher = null)`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`*/`
`20`	`20`	`class MessageHandler`
`21`	`21`	`{`
`22`		`- private TransportInterface $transport;`
	`22`	`+ private $transport;`
`23`	`23`
`24`	`24`	`public function __construct(TransportInterface $transport)`
`25`	`25`	`{`