Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_…

…null_value
symfony · Jan 23, 2024 · 9b17d85 · 9b17d85
1 parent 211e349
commit 9b17d85
Show file tree

Hide file tree

Showing 31 changed files with 44 additions and 44 deletions.
diff --git a/Command/ConsumeMessagesCommand.php b/Command/ConsumeMessagesCommand.php
@@ -50,7 +50,7 @@ class ConsumeMessagesCommand extends Command
     private $resetServicesListener;
     private $busIds;
 
-    public function __construct(RoutableMessageBus $routableBus, ContainerInterface $receiverLocator, EventDispatcherInterface $eventDispatcher, LoggerInterface $logger = null, array $receiverNames = [], ResetServicesListener $resetServicesListener = null, array $busIds = [])
+    public function __construct(RoutableMessageBus $routableBus, ContainerInterface $receiverLocator, EventDispatcherInterface $eventDispatcher, ?LoggerInterface $logger = null, array $receiverNames = [], ?ResetServicesListener $resetServicesListener = null, array $busIds = [])
     {
         $this->routableBus = $routableBus;
         $this->receiverLocator = $receiverLocator;

diff --git a/Command/FailedMessagesRetryCommand.php b/Command/FailedMessagesRetryCommand.php
@@ -41,7 +41,7 @@ class FailedMessagesRetryCommand extends AbstractFailedMessagesCommand
     private $messageBus;
     private $logger;
 
-    public function __construct(?string $globalReceiverName, $failureTransports, MessageBusInterface $messageBus, EventDispatcherInterface $eventDispatcher, LoggerInterface $logger = null)
+    public function __construct(?string $globalReceiverName, $failureTransports, MessageBusInterface $messageBus, EventDispatcherInterface $eventDispatcher, ?LoggerInterface $logger = null)
     {
         $this->eventDispatcher = $eventDispatcher;
         $this->messageBus = $messageBus;

diff --git a/DataCollector/MessengerDataCollector.php b/DataCollector/MessengerDataCollector.php
@@ -35,7 +35,7 @@ public function registerBus(string $name, TraceableMessageBus $bus)
     /**
      * {@inheritdoc}
      */
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null)
     {
         // Noop. Everything is collected live by the traceable buses & cloned as late as possible.
     }
@@ -121,7 +121,7 @@ private function collectMessage(string $busName, array $tracedMessage)
         return $debugRepresentation;
     }
 
-    public function getExceptionsCount(string $bus = null): int
+    public function getExceptionsCount(?string $bus = null): int
     {
         $count = 0;
         foreach ($this->getMessages($bus) as $message) {
@@ -131,7 +131,7 @@ public function getExceptionsCount(string $bus = null): int
         return $count;
     }
 
-    public function getMessages(string $bus = null): array
+    public function getMessages(?string $bus = null): array
     {
         if (null === $bus) {
             return $this->data['messages'];

diff --git a/Envelope.php b/Envelope.php
@@ -102,7 +102,7 @@ public function last(string $stampFqcn): ?StampInterface
     /**
      * @return StampInterface[]|StampInterface[][] The stamps for the specified FQCN, or all stamps by their class name
      */
-    public function all(string $stampFqcn = null): array
+    public function all(?string $stampFqcn = null): array
     {
         if (null !== $stampFqcn) {
             return $this->stamps[$this->resolveAlias($stampFqcn)] ?? [];

diff --git a/Event/WorkerMessageReceivedEvent.php b/Event/WorkerMessageReceivedEvent.php
@@ -20,7 +20,7 @@ final class WorkerMessageReceivedEvent extends AbstractWorkerMessageEvent
 {
     private $shouldHandle = true;
 
-    public function shouldHandle(bool $shouldHandle = null): bool
+    public function shouldHandle(?bool $shouldHandle = null): bool
     {
         if (null !== $shouldHandle) {
             $this->shouldHandle = $shouldHandle;

diff --git a/EventListener/SendFailedMessageForRetryListener.php b/EventListener/SendFailedMessageForRetryListener.php
@@ -39,7 +39,7 @@ class SendFailedMessageForRetryListener implements EventSubscriberInterface
     private $eventDispatcher;
     private $historySize;
 
-    public function __construct(ContainerInterface $sendersLocator, ContainerInterface $retryStrategyLocator, LoggerInterface $logger = null, EventDispatcherInterface $eventDispatcher = null, int $historySize = 10)
+    public function __construct(ContainerInterface $sendersLocator, ContainerInterface $retryStrategyLocator, ?LoggerInterface $logger = null, ?EventDispatcherInterface $eventDispatcher = null, int $historySize = 10)
     {
         $this->sendersLocator = $sendersLocator;
         $this->retryStrategyLocator = $retryStrategyLocator;

diff --git a/EventListener/SendFailedMessageToFailureTransportListener.php b/EventListener/SendFailedMessageToFailureTransportListener.php
@@ -33,7 +33,7 @@ class SendFailedMessageToFailureTransportListener implements EventSubscriberInte
     /**
      * @param ContainerInterface $failureSenders
      */
-    public function __construct($failureSenders, LoggerInterface $logger = null)
+    public function __construct($failureSenders, ?LoggerInterface $logger = null)
     {
         if (!$failureSenders instanceof ContainerInterface) {
             trigger_deprecation('symfony/messenger', '5.3', 'Passing a SenderInterface value as 1st argument to "%s()" is deprecated, pass a ServiceLocator instead.', __METHOD__);

diff --git a/EventListener/StopWorkerOnFailureLimitListener.php b/EventListener/StopWorkerOnFailureLimitListener.php
@@ -26,7 +26,7 @@ class StopWorkerOnFailureLimitListener implements EventSubscriberInterface
     private $logger;
     private $failedMessages = 0;
 
-    public function __construct(int $maximumNumberOfFailures, LoggerInterface $logger = null)
+    public function __construct(int $maximumNumberOfFailures, ?LoggerInterface $logger = null)
     {
         $this->maximumNumberOfFailures = $maximumNumberOfFailures;
         $this->logger = $logger;

diff --git a/EventListener/StopWorkerOnMemoryLimitListener.php b/EventListener/StopWorkerOnMemoryLimitListener.php
@@ -25,7 +25,7 @@ class StopWorkerOnMemoryLimitListener implements EventSubscriberInterface
     private $logger;
     private $memoryResolver;
 
-    public function __construct(int $memoryLimit, LoggerInterface $logger = null, callable $memoryResolver = null)
+    public function __construct(int $memoryLimit, ?LoggerInterface $logger = null, ?callable $memoryResolver = null)
     {
         $this->memoryLimit = $memoryLimit;
         $this->logger = $logger;

diff --git a/EventListener/StopWorkerOnMessageLimitListener.php b/EventListener/StopWorkerOnMessageLimitListener.php
@@ -26,7 +26,7 @@ class StopWorkerOnMessageLimitListener implements EventSubscriberInterface
     private $logger;
     private $receivedMessages = 0;
 
-    public function __construct(int $maximumNumberOfMessages, LoggerInterface $logger = null)
+    public function __construct(int $maximumNumberOfMessages, ?LoggerInterface $logger = null)
     {
         $this->maximumNumberOfMessages = $maximumNumberOfMessages;
         $this->logger = $logger;

diff --git a/EventListener/StopWorkerOnRestartSignalListener.php b/EventListener/StopWorkerOnRestartSignalListener.php
@@ -28,7 +28,7 @@ class StopWorkerOnRestartSignalListener implements EventSubscriberInterface
     private $logger;
     private $workerStartedAt;
 
-    public function __construct(CacheItemPoolInterface $cachePool, LoggerInterface $logger = null)
+    public function __construct(CacheItemPoolInterface $cachePool, ?LoggerInterface $logger = null)
     {
         $this->cachePool = $cachePool;
         $this->logger = $logger;

diff --git a/EventListener/StopWorkerOnSigtermSignalListener.php b/EventListener/StopWorkerOnSigtermSignalListener.php
@@ -22,7 +22,7 @@ class StopWorkerOnSigtermSignalListener implements EventSubscriberInterface
 {
     private $logger;
 
-    public function __construct(LoggerInterface $logger = null)
+    public function __construct(?LoggerInterface $logger = null)
     {
         $this->logger = $logger;
     }

diff --git a/EventListener/StopWorkerOnTimeLimitListener.php b/EventListener/StopWorkerOnTimeLimitListener.php
@@ -27,7 +27,7 @@ class StopWorkerOnTimeLimitListener implements EventSubscriberInterface
     private $logger;
     private $endTime;
 
-    public function __construct(int $timeLimitInSeconds, LoggerInterface $logger = null)
+    public function __construct(int $timeLimitInSeconds, ?LoggerInterface $logger = null)
     {
         $this->timeLimitInSeconds = $timeLimitInSeconds;
         $this->logger = $logger;

diff --git a/Exception/StopWorkerException.php b/Exception/StopWorkerException.php
@@ -16,7 +16,7 @@
  */
 class StopWorkerException extends RuntimeException implements StopWorkerExceptionInterface
 {
-    public function __construct(string $message = 'Worker should stop.', \Throwable $previous = null)
+    public function __construct(string $message = 'Worker should stop.', ?\Throwable $previous = null)
     {
         parent::__construct($message, 0, $previous);
     }

diff --git a/Handler/Acknowledger.php b/Handler/Acknowledger.php
@@ -26,7 +26,7 @@ class Acknowledger
     /**
      * @param \Closure(\Throwable|null, mixed):void|null $ack
      */
-    public function __construct(string $handlerClass, \Closure $ack = null)
+    public function __construct(string $handlerClass, ?\Closure $ack = null)
     {
         $this->handlerClass = $handlerClass;
         $this->ack = $ack ?? static function () {};
@@ -70,7 +70,7 @@ public function __destruct()
         }
     }
 
-    private function doAck(\Throwable $e = null, $result = null): void
+    private function doAck(?\Throwable $e = null, $result = null): void
     {
         if (!$ack = $this->ack) {
             throw new LogicException(sprintf('The acknowledger cannot be called twice by the "%s" batch handler.', $this->handlerClass));

diff --git a/Middleware/HandleMessageMiddleware.php b/Middleware/HandleMessageMiddleware.php
@@ -70,7 +70,7 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
 
                 /** @var AckStamp $ackStamp */
                 if ($batchHandler && $ackStamp = $envelope->last(AckStamp::class)) {
-                    $ack = new Acknowledger(get_debug_type($batchHandler), static function (\Throwable $e = null, $result = null) use ($envelope, $ackStamp, $handlerDescriptor) {
+                    $ack = new Acknowledger(get_debug_type($batchHandler), static function (?\Throwable $e = null, $result = null) use ($envelope, $ackStamp, $handlerDescriptor) {
                         if (null !== $e) {
                             $e = new HandlerFailedException($envelope, [$e]);
                         } else {

diff --git a/Middleware/SendMessageMiddleware.php b/Middleware/SendMessageMiddleware.php
@@ -33,7 +33,7 @@ class SendMessageMiddleware implements MiddlewareInterface
     private $sendersLocator;
     private $eventDispatcher;
 
-    public function __construct(SendersLocatorInterface $sendersLocator, EventDispatcherInterface $eventDispatcher = null)
+    public function __construct(SendersLocatorInterface $sendersLocator, ?EventDispatcherInterface $eventDispatcher = null)
     {
         $this->sendersLocator = $sendersLocator;
         $this->eventDispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($eventDispatcher) : $eventDispatcher;

diff --git a/Retry/MultiplierRetryStrategy.php b/Retry/MultiplierRetryStrategy.php
@@ -66,7 +66,7 @@ public function __construct(int $maxRetries = 3, int $delayMilliseconds = 1000,
     /**
      * @param \Throwable|null $throwable The cause of the failed handling
      */
-    public function isRetryable(Envelope $message, \Throwable $throwable = null): bool
+    public function isRetryable(Envelope $message, ?\Throwable $throwable = null): bool
     {
         $retries = RedeliveryStamp::getRetryCountFromEnvelope($message);
 
@@ -76,7 +76,7 @@ public function isRetryable(Envelope $message, \Throwable $throwable = null): bo
     /**
      * @param \Throwable|null $throwable The cause of the failed handling
      */
-    public function getWaitingTime(Envelope $message, \Throwable $throwable = null): int
+    public function getWaitingTime(Envelope $message, ?\Throwable $throwable = null): int
     {
         $retries = RedeliveryStamp::getRetryCountFromEnvelope($message);
 

diff --git a/RoutableMessageBus.php b/RoutableMessageBus.php
@@ -28,7 +28,7 @@ class RoutableMessageBus implements MessageBusInterface
     private $busLocator;
     private $fallbackBus;
 
-    public function __construct(ContainerInterface $busLocator, MessageBusInterface $fallbackBus = null)
+    public function __construct(ContainerInterface $busLocator, ?MessageBusInterface $fallbackBus = null)
     {
         $this->busLocator = $busLocator;
         $this->fallbackBus = $fallbackBus;

diff --git a/Stamp/AckStamp.php b/Stamp/AckStamp.php
@@ -28,7 +28,7 @@ public function __construct(\Closure $ack)
         $this->ack = $ack;
     }
 
-    public function ack(Envelope $envelope, \Throwable $e = null): void
+    public function ack(Envelope $envelope, ?\Throwable $e = null): void
     {
         ($this->ack)($envelope, $e);
     }

diff --git a/Stamp/ErrorDetailsStamp.php b/Stamp/ErrorDetailsStamp.php
@@ -34,7 +34,7 @@ final class ErrorDetailsStamp implements StampInterface
     /**
      * @param int|string $exceptionCode
      */
-    public function __construct(string $exceptionClass, $exceptionCode, string $exceptionMessage, FlattenException $flattenException = null)
+    public function __construct(string $exceptionClass, $exceptionCode, string $exceptionMessage, ?FlattenException $flattenException = null)
     {
         $this->exceptionClass = $exceptionClass;
         $this->exceptionCode = $exceptionCode;

diff --git a/Stamp/SentStamp.php b/Stamp/SentStamp.php
@@ -23,7 +23,7 @@ final class SentStamp implements NonSendableStampInterface
     private $senderClass;
     private $senderAlias;
 
-    public function __construct(string $senderClass, string $senderAlias = null)
+    public function __construct(string $senderClass, ?string $senderAlias = null)
     {
         $this->senderAlias = $senderAlias;
         $this->senderClass = $senderClass;

diff --git a/Test/Middleware/MiddlewareTestCase.php b/Test/Middleware/MiddlewareTestCase.php
@@ -46,7 +46,7 @@ protected function getStackMock(bool $nextIsCalled = true)
         return new StackMiddleware($nextMiddleware);
     }
 
-    protected function getThrowingStackMock(\Throwable $throwable = null)
+    protected function getThrowingStackMock(?\Throwable $throwable = null)
     {
         $nextMiddleware = $this->createMock(MiddlewareInterface::class);
         $nextMiddleware

diff --git a/Tests/Middleware/HandleMessageMiddlewareTest.php b/Tests/Middleware/HandleMessageMiddlewareTest.php
@@ -173,7 +173,7 @@ public function testBatchHandler()
 
             use BatchHandlerTrait;
 
-            public function __invoke(DummyMessage $message, Acknowledger $ack = null)
+            public function __invoke(DummyMessage $message, ?Acknowledger $ack = null)
             {
                 return $this->handle($message, $ack);
             }
@@ -198,7 +198,7 @@ private function process(array $jobs): void
         ]));
 
         $ackedMessages = [];
-        $ack = static function (Envelope $envelope, \Throwable $e = null) use (&$ackedMessages) {
+        $ack = static function (Envelope $envelope, ?\Throwable $e = null) use (&$ackedMessages) {
             if (null !== $e) {
                 throw $e;
             }
@@ -227,7 +227,7 @@ public function testBatchHandlerNoAck()
         $handler = new class() implements BatchHandlerInterface {
             use BatchHandlerTrait;
 
-            public function __invoke(DummyMessage $message, Acknowledger $ack = null)
+            public function __invoke(DummyMessage $message, ?Acknowledger $ack = null)
             {
                 return $this->handle($message, $ack);
             }
@@ -247,7 +247,7 @@ private function process(array $jobs): void
         ]));
 
         $error = null;
-        $ack = static function (Envelope $envelope, \Throwable $e = null) use (&$error) {
+        $ack = static function (Envelope $envelope, ?\Throwable $e = null) use (&$error) {
             $error = $e;
         };
 
@@ -264,7 +264,7 @@ public function testBatchHandlerNoBatch()
 
             use BatchHandlerTrait;
 
-            public function __invoke(DummyMessage $message, Acknowledger $ack = null)
+            public function __invoke(DummyMessage $message, ?Acknowledger $ack = null)
             {
                 return $this->handle($message, $ack);
             }

diff --git a/Tests/Middleware/TraceableMiddlewareTest.php b/Tests/Middleware/TraceableMiddlewareTest.php
@@ -53,7 +53,7 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
 
         $stopwatch->expects($this->exactly(2))
             ->method('start')
-            ->willReturnCallback(function (string $name, string $category = null) use (&$series) {
+            ->willReturnCallback(function (string $name, ?string $category = null) use (&$series) {
                 [$constraint, $expectedCategory] = array_shift($series);
 
                 $constraint->evaluate($name);
@@ -195,7 +195,7 @@ class_exists(TraceableMiddleware::class);
         ];
         $stopwatch->expects($this->exactly(4))
             ->method('start')
-            ->willReturnCallback(function (string $name, string $category = null) use (&$startSeries) {
+            ->willReturnCallback(function (string $name, ?string $category = null) use (&$startSeries) {
                 [$constraint, $expectedCategory] = array_shift($startSeries);
 
                 $constraint->evaluate($name);

diff --git a/Tests/WorkerTest.php b/Tests/WorkerTest.php
@@ -528,7 +528,7 @@ class DummyBatchHandler implements BatchHandlerInterface
 
     public $processedMessages;
 
-    public function __invoke(DummyMessage $message, Acknowledger $ack = null)
+    public function __invoke(DummyMessage $message, ?Acknowledger $ack = null)
     {
         return $this->handle($message, $ack);
     }

diff --git a/Transport/InMemoryTransport.php b/Transport/InMemoryTransport.php
@@ -51,7 +51,7 @@ class InMemoryTransport implements TransportInterface, ResetInterface
      */
     private $serializer;
 
-    public function __construct(SerializerInterface $serializer = null)
+    public function __construct(?SerializerInterface $serializer = null)
     {
         $this->serializer = $serializer;
     }

diff --git a/Transport/Receiver/ListableReceiverInterface.php b/Transport/Receiver/ListableReceiverInterface.php
@@ -29,7 +29,7 @@ interface ListableReceiverInterface extends ReceiverInterface
      *
      * @return Envelope[]|iterable
      */
-    public function all(int $limit = null): iterable;
+    public function all(?int $limit = null): iterable;
 
     /**
      * Returns the Envelope by id or none.

diff --git a/Transport/Serialization/Normalizer/FlattenExceptionNormalizer.php b/Transport/Serialization/Normalizer/FlattenExceptionNormalizer.php
@@ -32,7 +32,7 @@ final class FlattenExceptionNormalizer implements DenormalizerInterface, Context
      *
      * @throws InvalidArgumentException
      */
-    public function normalize($object, string $format = null, array $context = []): array
+    public function normalize($object, ?string $format = null, array $context = []): array
     {
         $normalized = [
             'message' => $object->getMessage(),
@@ -54,15 +54,15 @@ public function normalize($object, string $format = null, array $context = []):
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, string $format = null, array $context = []): bool
+    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
     {
         return $data instanceof FlattenException && ($context[Serializer::MESSENGER_SERIALIZATION_CONTEXT] ?? false);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function denormalize($data, string $type, string $format = null, array $context = []): FlattenException
+    public function denormalize($data, string $type, ?string $format = null, array $context = []): FlattenException
     {
         $object = new FlattenException();
 
@@ -93,7 +93,7 @@ public function denormalize($data, string $type, string $format = null, array $c
     /**
      * {@inheritdoc}
      */
-    public function supportsDenormalization($data, string $type, string $format = null, array $context = []): bool
+    public function supportsDenormalization($data, string $type, ?string $format = null, array $context = []): bool
     {
         return FlattenException::class === $type && ($context[Serializer::MESSENGER_SERIALIZATION_CONTEXT] ?? false);
     }

diff --git a/Transport/Serialization/Serializer.php b/Transport/Serialization/Serializer.php
@@ -38,7 +38,7 @@ class Serializer implements SerializerInterface
     private $format;
     private $context;
 
-    public function __construct(SymfonySerializerInterface $serializer = null, string $format = 'json', array $context = [])
+    public function __construct(?SymfonySerializerInterface $serializer = null, string $format = 'json', array $context = [])
     {
         $this->serializer = $serializer ?? self::create()->serializer;
         $this->format = $format;

diff --git a/Worker.php b/Worker.php
@@ -52,7 +52,7 @@ class Worker
     /**
      * @param ReceiverInterface[] $receivers Where the key is the transport name
      */
-    public function __construct(array $receivers, MessageBusInterface $bus, EventDispatcherInterface $eventDispatcher = null, LoggerInterface $logger = null)
+    public function __construct(array $receivers, MessageBusInterface $bus, ?EventDispatcherInterface $eventDispatcher = null, ?LoggerInterface $logger = null)
     {
         $this->receivers = $receivers;
         $this->bus = $bus;
@@ -148,7 +148,7 @@ private function handleMessage(Envelope $envelope, string $transportName): void
         }
 
         $acked = false;
-        $ack = function (Envelope $envelope, \Throwable $e = null) use ($transportName, &$acked) {
+        $ack = function (Envelope $envelope, ?\Throwable $e = null) use ($transportName, &$acked) {
             $acked = true;
             $this->acks[] = [$transportName, $envelope, $e];
         };