Remove FQCN type hints on properties

fabpot · fabpot · commit 53c6ce08a44f · 2021-12-08T16:13:44.000+01:00
diff --git a/Command/ConsumeMessagesCommand.php b/Command/ConsumeMessagesCommand.php
@@ -40,12 +40,12 @@
 #[AsCommand(name: 'messenger:consume', description: 'Consume messages')]
 class ConsumeMessagesCommand extends Command
 {
-    private RoutableMessageBus $routableBus;
-    private ContainerInterface $receiverLocator;
-    private EventDispatcherInterface $eventDispatcher;
-    private ?LoggerInterface $logger;
+    private $routableBus;
+    private $receiverLocator;
+    private $eventDispatcher;
+    private $logger;
     private array $receiverNames;
-    private ?ResetServicesListener $resetServicesListener;
+    private $resetServicesListener;
     private array $busIds;
 
     public function __construct(RoutableMessageBus $routableBus, ContainerInterface $receiverLocator, EventDispatcherInterface $eventDispatcher, LoggerInterface $logger = null, array $receiverNames = [], ResetServicesListener $resetServicesListener = null, array $busIds = [])
diff --git a/Command/FailedMessagesRetryCommand.php b/Command/FailedMessagesRetryCommand.php
@@ -37,9 +37,9 @@
 #[AsCommand(name: 'messenger:failed:retry', description: 'Retry one or more messages from the failure transport')]
 class FailedMessagesRetryCommand extends AbstractFailedMessagesCommand
 {
-    private EventDispatcherInterface $eventDispatcher;
-    private MessageBusInterface $messageBus;
-    private ?LoggerInterface $logger;
+    private $eventDispatcher;
+    private $messageBus;
+    private $logger;
 
     public function __construct(?string $globalReceiverName, ServiceProviderInterface $failureTransports, MessageBusInterface $messageBus, EventDispatcherInterface $eventDispatcher, LoggerInterface $logger = null)
     {
diff --git a/Command/SetupTransportsCommand.php b/Command/SetupTransportsCommand.php
@@ -28,7 +28,7 @@
 #[AsCommand(name: 'messenger:setup-transports', description: 'Prepare the required infrastructure for the transport')]
 class SetupTransportsCommand extends Command
 {
-    private ContainerInterface $transportLocator;
+    private $transportLocator;
     private array $transportNames;
 
     public function __construct(ContainerInterface $transportLocator, array $transportNames = [])
diff --git a/Command/StopWorkersCommand.php b/Command/StopWorkersCommand.php
@@ -26,7 +26,7 @@
 #[AsCommand(name: 'messenger:stop-workers', description: 'Stop workers after their current message')]
 class StopWorkersCommand extends Command
 {
-    private CacheItemPoolInterface $restartSignalCachePool;
+    private $restartSignalCachePool;
 
     public function __construct(CacheItemPoolInterface $restartSignalCachePool)
     {
diff --git a/Event/AbstractWorkerMessageEvent.php b/Event/AbstractWorkerMessageEvent.php
@@ -16,7 +16,7 @@
 
 abstract class AbstractWorkerMessageEvent
 {
-    private Envelope $envelope;
+    private $envelope;
     private string $receiverName;
 
     public function __construct(Envelope $envelope, string $receiverName)
diff --git a/Event/SendMessageToTransportsEvent.php b/Event/SendMessageToTransportsEvent.php
@@ -26,7 +26,7 @@
  */
 final class SendMessageToTransportsEvent
 {
-    private Envelope $envelope;
+    private $envelope;
 
     public function __construct(Envelope $envelope)
     {
diff --git a/Event/WorkerRunningEvent.php b/Event/WorkerRunningEvent.php
@@ -20,7 +20,7 @@
  */
 final class WorkerRunningEvent
 {
-    private Worker $worker;
+    private $worker;
     private bool $isWorkerIdle;
 
     public function __construct(Worker $worker, bool $isWorkerIdle)
diff --git a/Event/WorkerStartedEvent.php b/Event/WorkerStartedEvent.php
@@ -20,7 +20,7 @@
  */
 final class WorkerStartedEvent
 {
-    private Worker $worker;
+    private $worker;
 
     public function __construct(Worker $worker)
     {
diff --git a/Event/WorkerStoppedEvent.php b/Event/WorkerStoppedEvent.php
@@ -20,7 +20,7 @@
  */
 final class WorkerStoppedEvent
 {
-    private Worker $worker;
+    private $worker;
 
     public function __construct(Worker $worker)
     {
diff --git a/EventListener/ResetServicesListener.php b/EventListener/ResetServicesListener.php
@@ -20,7 +20,7 @@
  */
 class ResetServicesListener implements EventSubscriberInterface
 {
-    private ServicesResetter $servicesResetter;
+    private $servicesResetter;
 
     public function __construct(ServicesResetter $servicesResetter)
     {
diff --git a/EventListener/SendFailedMessageForRetryListener.php b/EventListener/SendFailedMessageForRetryListener.php
@@ -32,10 +32,10 @@
  */
 class SendFailedMessageForRetryListener implements EventSubscriberInterface
 {
-    private ContainerInterface $sendersLocator;
-    private ContainerInterface $retryStrategyLocator;
-    private ?LoggerInterface $logger;
-    private ?EventDispatcherInterface $eventDispatcher;
+    private $sendersLocator;
+    private $retryStrategyLocator;
+    private $logger;
+    private $eventDispatcher;
     private int $historySize;
 
     public function __construct(ContainerInterface $sendersLocator, ContainerInterface $retryStrategyLocator, LoggerInterface $logger = null, EventDispatcherInterface $eventDispatcher = null, int $historySize = 10)
diff --git a/EventListener/SendFailedMessageToFailureTransportListener.php b/EventListener/SendFailedMessageToFailureTransportListener.php
@@ -25,8 +25,8 @@
  */
 class SendFailedMessageToFailureTransportListener implements EventSubscriberInterface
 {
-    private ContainerInterface $failureSenders;
-    private ?LoggerInterface $logger;
+    private $failureSenders;
+    private $logger;
 
     public function __construct(ContainerInterface $failureSenders, LoggerInterface $logger = null)
     {
diff --git a/EventListener/StopWorkerOnFailureLimitListener.php b/EventListener/StopWorkerOnFailureLimitListener.php
@@ -23,7 +23,7 @@
 class StopWorkerOnFailureLimitListener implements EventSubscriberInterface
 {
     private int $maximumNumberOfFailures;
-    private ?LoggerInterface $logger;
+    private $logger;
     private int $failedMessages = 0;
 
     public function __construct(int $maximumNumberOfFailures, LoggerInterface $logger = null)
diff --git a/EventListener/StopWorkerOnMemoryLimitListener.php b/EventListener/StopWorkerOnMemoryLimitListener.php
@@ -22,7 +22,7 @@
 class StopWorkerOnMemoryLimitListener implements EventSubscriberInterface
 {
     private int $memoryLimit;
-    private ?LoggerInterface $logger;
+    private $logger;
     private \Closure $memoryResolver;
 
     public function __construct(int $memoryLimit, LoggerInterface $logger = null, callable $memoryResolver = null)
diff --git a/EventListener/StopWorkerOnMessageLimitListener.php b/EventListener/StopWorkerOnMessageLimitListener.php
@@ -23,7 +23,7 @@
 class StopWorkerOnMessageLimitListener implements EventSubscriberInterface
 {
     private int $maximumNumberOfMessages;
-    private ?LoggerInterface $logger;
+    private $logger;
     private int $receivedMessages = 0;
 
     public function __construct(int $maximumNumberOfMessages, LoggerInterface $logger = null)
diff --git a/EventListener/StopWorkerOnRestartSignalListener.php b/EventListener/StopWorkerOnRestartSignalListener.php
@@ -24,8 +24,8 @@ class StopWorkerOnRestartSignalListener implements EventSubscriberInterface
 {
     public const RESTART_REQUESTED_TIMESTAMP_KEY = 'workers.restart_requested_timestamp';
 
-    private CacheItemPoolInterface $cachePool;
-    private ?LoggerInterface $logger;
+    private $cachePool;
+    private $logger;
     private float $workerStartedAt = 0;
 
     public function __construct(CacheItemPoolInterface $cachePool, LoggerInterface $logger = null)
diff --git a/EventListener/StopWorkerOnSigtermSignalListener.php b/EventListener/StopWorkerOnSigtermSignalListener.php
@@ -20,7 +20,7 @@
  */
 class StopWorkerOnSigtermSignalListener implements EventSubscriberInterface
 {
-    private ?LoggerInterface $logger;
+    private $logger;
 
     public function __construct(LoggerInterface $logger = null)
     {
diff --git a/EventListener/StopWorkerOnTimeLimitListener.php b/EventListener/StopWorkerOnTimeLimitListener.php
@@ -23,7 +23,7 @@
 class StopWorkerOnTimeLimitListener implements EventSubscriberInterface
 {
     private int $timeLimitInSeconds;
-    private ?LoggerInterface $logger;
+    private $logger;
     private float $endTime = 0;
 
     public function __construct(int $timeLimitInSeconds, LoggerInterface $logger = null)
diff --git a/Exception/HandlerFailedException.php b/Exception/HandlerFailedException.php
@@ -16,7 +16,7 @@
 class HandlerFailedException extends RuntimeException
 {
     private array $exceptions;
-    private Envelope $envelope;
+    private $envelope;
 
     /**
      * @param \Throwable[] $exceptions
diff --git a/Exception/ValidationFailedException.php b/Exception/ValidationFailedException.php
@@ -18,7 +18,7 @@
  */
 class ValidationFailedException extends RuntimeException
 {
-    private ConstraintViolationListInterface $violations;
+    private $violations;
     private object $violatingMessage;
 
     public function __construct(object $violatingMessage, ConstraintViolationListInterface $violations)
diff --git a/HandleTrait.php b/HandleTrait.php
@@ -21,7 +21,7 @@
  */
 trait HandleTrait
 {
-    private MessageBusInterface $messageBus;
+    private $messageBus;
 
     /**
      * Dispatches the given message, expecting to be handled by a single handler
diff --git a/Handler/HandlerDescriptor.php b/Handler/HandlerDescriptor.php
@@ -20,7 +20,7 @@ final class HandlerDescriptor
 {
     private \Closure $handler;
     private string $name;
-    private ?BatchHandlerInterface $batchHandler = null;
+    private $batchHandler = null;
     private array $options;
 
     public function __construct(callable $handler, array $options = [])
diff --git a/Middleware/ActivationMiddleware.php b/Middleware/ActivationMiddleware.php
@@ -20,7 +20,7 @@
  */
 class ActivationMiddleware implements MiddlewareInterface
 {
-    private MiddlewareInterface $inner;
+    private $inner;
     private \Closure|bool $activated;
 
     public function __construct(MiddlewareInterface $inner, bool|callable $activated)
diff --git a/Middleware/DispatchAfterCurrentBusMiddleware.php b/Middleware/DispatchAfterCurrentBusMiddleware.php
@@ -109,8 +109,8 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
  */
 final class QueuedEnvelope
 {
-    private Envelope $envelope;
-    private StackInterface $stack;
+    private $envelope;
+    private $stack;
 
     public function __construct(Envelope $envelope, StackInterface $stack)
     {
diff --git a/Middleware/HandleMessageMiddleware.php b/Middleware/HandleMessageMiddleware.php
@@ -32,7 +32,7 @@ class HandleMessageMiddleware implements MiddlewareInterface
 {
     use LoggerAwareTrait;
 
-    private HandlersLocatorInterface $handlersLocator;
+    private $handlersLocator;
     private bool $allowNoHandlers;
 
     public function __construct(HandlersLocatorInterface $handlersLocator, bool $allowNoHandlers = false)
diff --git a/Middleware/RouterContextMiddleware.php b/Middleware/RouterContextMiddleware.php
@@ -23,7 +23,7 @@
  */
 class RouterContextMiddleware implements MiddlewareInterface
 {
-    private RequestContextAwareInterface $router;
+    private $router;
 
     public function __construct(RequestContextAwareInterface $router)
     {
diff --git a/Middleware/SendMessageMiddleware.php b/Middleware/SendMessageMiddleware.php
@@ -28,8 +28,8 @@ class SendMessageMiddleware implements MiddlewareInterface
 {
     use LoggerAwareTrait;
 
-    private SendersLocatorInterface $sendersLocator;
-    private ?EventDispatcherInterface $eventDispatcher;
+    private $sendersLocator;
+    private $eventDispatcher;
 
     public function __construct(SendersLocatorInterface $sendersLocator, EventDispatcherInterface $eventDispatcher = null)
     {
diff --git a/Middleware/StackMiddleware.php b/Middleware/StackMiddleware.php
@@ -18,7 +18,7 @@
  */
 class StackMiddleware implements MiddlewareInterface, StackInterface
 {
-    private MiddlewareStack $stack;
+    private $stack;
     private int $offset = 0;
 
     /**
diff --git a/Middleware/TraceableMiddleware.php b/Middleware/TraceableMiddleware.php
@@ -21,7 +21,7 @@
  */
 class TraceableMiddleware implements MiddlewareInterface
 {
-    private Stopwatch $stopwatch;
+    private $stopwatch;
     private string $busName;
     private string $eventCategory;
 
@@ -52,8 +52,8 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
  */
 class TraceableStack implements StackInterface
 {
-    private StackInterface $stack;
-    private Stopwatch $stopwatch;
+    private $stack;
+    private $stopwatch;
     private string $busName;
     private string $eventCategory;
     private ?string $currentEvent = null;
diff --git a/Middleware/ValidationMiddleware.php b/Middleware/ValidationMiddleware.php
@@ -21,7 +21,7 @@
  */
 class ValidationMiddleware implements MiddlewareInterface
 {
-    private ValidatorInterface $validator;
+    private $validator;
 
     public function __construct(ValidatorInterface $validator)
     {
diff --git a/RoutableMessageBus.php b/RoutableMessageBus.php
@@ -25,8 +25,8 @@
  */
 class RoutableMessageBus implements MessageBusInterface
 {
-    private ContainerInterface $busLocator;
-    private ?MessageBusInterface $fallbackBus;
+    private $busLocator;
+    private $fallbackBus;
 
     public function __construct(ContainerInterface $busLocator, MessageBusInterface $fallbackBus = null)
     {
diff --git a/Stamp/ErrorDetailsStamp.php b/Stamp/ErrorDetailsStamp.php
@@ -23,7 +23,7 @@ final class ErrorDetailsStamp implements StampInterface
     private string $exceptionClass;
     private int|string $exceptionCode;
     private string $exceptionMessage;
-    private ?FlattenException $flattenException;
+    private $flattenException;
 
     public function __construct(string $exceptionClass, int|string $exceptionCode, string $exceptionMessage, FlattenException $flattenException = null)
     {
diff --git a/TraceableMessageBus.php b/TraceableMessageBus.php
@@ -16,7 +16,7 @@
  */
 class TraceableMessageBus implements MessageBusInterface
 {
-    private MessageBusInterface $decoratedBus;
+    private $decoratedBus;
     private array $dispatchedMessages = [];
 
     public function __construct(MessageBusInterface $decoratedBus)
diff --git a/Transport/InMemoryTransport.php b/Transport/InMemoryTransport.php
@@ -45,7 +45,7 @@ class InMemoryTransport implements TransportInterface, ResetInterface
     private array $queue = [];
 
     private int $nextId = 1;
-    private ?SerializerInterface $serializer;
+    private $serializer;
 
     public function __construct(SerializerInterface $serializer = null)
     {
diff --git a/Transport/Receiver/SingleMessageReceiver.php b/Transport/Receiver/SingleMessageReceiver.php
@@ -22,8 +22,8 @@
  */
 class SingleMessageReceiver implements ReceiverInterface
 {
-    private ReceiverInterface $receiver;
-    private Envelope $envelope;
+    private $receiver;
+    private $envelope;
     private bool $hasReceived = false;
 
     public function __construct(ReceiverInterface $receiver, Envelope $envelope)
diff --git a/Transport/Sender/SendersLocator.php b/Transport/Sender/SendersLocator.php
@@ -24,7 +24,7 @@
 class SendersLocator implements SendersLocatorInterface
 {
     private array $sendersMap;
-    private ContainerInterface $sendersLocator;
+    private $sendersLocator;
 
     /**
      * @param array<string, list<string>> $sendersMap     An array, keyed by "type", set to an array of sender aliases
diff --git a/Transport/Serialization/Serializer.php b/Transport/Serialization/Serializer.php
@@ -33,7 +33,7 @@ class Serializer implements SerializerInterface
     public const MESSENGER_SERIALIZATION_CONTEXT = 'messenger_serialization';
     private const STAMP_HEADER_PREFIX = 'X-Message-Stamp-';
 
-    private SymfonySerializerInterface $serializer;
+    private $serializer;
     private string $format;
     private array $context;
 
diff --git a/Transport/Sync/SyncTransport.php b/Transport/Sync/SyncTransport.php
@@ -25,7 +25,7 @@
  */
 class SyncTransport implements TransportInterface
 {
-    private MessageBusInterface $messageBus;
+    private $messageBus;
 
     public function __construct(MessageBusInterface $messageBus)
     {
diff --git a/Transport/Sync/SyncTransportFactory.php b/Transport/Sync/SyncTransportFactory.php
@@ -21,7 +21,7 @@
  */
 class SyncTransportFactory implements TransportFactoryInterface
 {
-    private MessageBusInterface $messageBus;
+    private $messageBus;
 
     public function __construct(MessageBusInterface $messageBus)
     {
diff --git a/Worker.php b/Worker.php

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,9 @@`
`37`	`37`	`#[AsCommand(name: 'messenger:failed:retry', description: 'Retry one or more messages from the failure transport')]`
`38`	`38`	`class FailedMessagesRetryCommand extends AbstractFailedMessagesCommand`
`39`	`39`	`{`
`40`		`- private EventDispatcherInterface $eventDispatcher;`
`41`		`- private MessageBusInterface $messageBus;`
`42`		`- private ?LoggerInterface $logger;`
	`40`	`+ private $eventDispatcher;`
	`41`	`+ private $messageBus;`
	`42`	`+ private $logger;`
`43`	`43`
`44`	`44`	`public function __construct(?string $globalReceiverName, ServiceProviderInterface $failureTransports, MessageBusInterface $messageBus, EventDispatcherInterface $eventDispatcher, LoggerInterface $logger = null)`
`45`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`#[AsCommand(name: 'messenger:setup-transports', description: 'Prepare the required infrastructure for the transport')]`
`29`	`29`	`class SetupTransportsCommand extends Command`
`30`	`30`	`{`
`31`		`- private ContainerInterface $transportLocator;`
	`31`	`+ private $transportLocator;`
`32`	`32`	`private array $transportNames;`
`33`	`33`
`34`	`34`	`public function __construct(ContainerInterface $transportLocator, array $transportNames = [])`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`#[AsCommand(name: 'messenger:stop-workers', description: 'Stop workers after their current message')]`
`27`	`27`	`class StopWorkersCommand extends Command`
`28`	`28`	`{`
`29`		`- private CacheItemPoolInterface $restartSignalCachePool;`
	`29`	`+ private $restartSignalCachePool;`
`30`	`30`
`31`	`31`	`public function __construct(CacheItemPoolInterface $restartSignalCachePool)`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`abstract class AbstractWorkerMessageEvent`
`18`	`18`	`{`
`19`		`- private Envelope $envelope;`
	`19`	`+ private $envelope;`
`20`	`20`	`private string $receiverName;`
`21`	`21`
`22`	`22`	`public function __construct(Envelope $envelope, string $receiverName)`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*/`
`21`	`21`	`final class WorkerRunningEvent`
`22`	`22`	`{`
`23`		`- private Worker $worker;`
	`23`	`+ private $worker;`
`24`	`24`	`private bool $isWorkerIdle;`
`25`	`25`
`26`	`26`	`public function __construct(Worker $worker, bool $isWorkerIdle)`