[Notifier] Use CPP

OskarStark · nicolas-grekas · commit b6b9d86b828b · 2024-01-02T11:08:49.000+01:00
diff --git a/Channel/BrowserChannel.php b/Channel/BrowserChannel.php
@@ -22,14 +22,10 @@
  */
 final class BrowserChannel implements ChannelInterface
 {
-    private RequestStack $stack;
-
-    private FlashMessageImportanceMapperInterface $mapper;
-
-    public function __construct(RequestStack $stack, FlashMessageImportanceMapperInterface $mapper = new DefaultFlashMessageImportanceMapper())
-    {
-        $this->stack = $stack;
-        $this->mapper = $mapper;
+    public function __construct(
+        private RequestStack $stack,
+        private FlashMessageImportanceMapperInterface $mapper = new DefaultFlashMessageImportanceMapper(),
+    ) {
     }
 
     public function notify(Notification $notification, RecipientInterface $recipient, string $transportName = null): void
diff --git a/Channel/ChannelPolicy.php b/Channel/ChannelPolicy.php
@@ -18,11 +18,9 @@
  */
 final class ChannelPolicy implements ChannelPolicyInterface
 {
-    private array $policy;
-
-    public function __construct(array $policy)
-    {
-        $this->policy = $policy;
+    public function __construct(
+        private array $policy,
+    ) {
     }
 
     public function getChannels(string $importance): array
diff --git a/Channel/EmailChannel.php b/Channel/EmailChannel.php
@@ -29,21 +29,19 @@
  */
 class EmailChannel implements ChannelInterface
 {
-    private ?TransportInterface $transport;
-    private ?MessageBusInterface $bus;
     private string|Address|null $from;
-    private ?Envelope $envelope;
 
-    public function __construct(TransportInterface $transport = null, MessageBusInterface $bus = null, string $from = null, Envelope $envelope = null)
-    {
+    public function __construct(
+        private ?TransportInterface $transport = null,
+        private ?MessageBusInterface $bus = null,
+        string $from = null,
+        private ?Envelope $envelope = null,
+    ) {
         if (null === $transport && null === $bus) {
             throw new LogicException(sprintf('"%s" needs a Transport or a Bus but both cannot be "null".', static::class));
         }
 
-        $this->transport = $transport;
-        $this->bus = $bus;
         $this->from = $from ?: $envelope?->getSender();
-        $this->envelope = $envelope;
     }
 
     /**
diff --git a/Chatter.php b/Chatter.php
@@ -23,15 +23,11 @@
  */
 final class Chatter implements ChatterInterface
 {
-    private TransportInterface $transport;
-    private ?MessageBusInterface $bus;
-    private ?EventDispatcherInterface $dispatcher;
-
-    public function __construct(TransportInterface $transport, MessageBusInterface $bus = null, EventDispatcherInterface $dispatcher = null)
-    {
-        $this->transport = $transport;
-        $this->bus = $bus;
-        $this->dispatcher = $dispatcher;
+    public function __construct(
+        private TransportInterface $transport,
+        private ?MessageBusInterface $bus = null,
+        private ?EventDispatcherInterface $dispatcher = null,
+    ) {
     }
 
     public function __toString(): string
diff --git a/DataCollector/NotificationDataCollector.php b/DataCollector/NotificationDataCollector.php
@@ -22,11 +22,9 @@
  */
 final class NotificationDataCollector extends DataCollector
 {
-    private NotificationLoggerListener $logger;
-
-    public function __construct(NotificationLoggerListener $logger)
-    {
-        $this->logger = $logger;
+    public function __construct(
+        private NotificationLoggerListener $logger,
+    ) {
     }
 
     public function collect(Request $request, Response $response, \Throwable $exception = null): void
diff --git a/Event/FailedMessageEvent.php b/Event/FailedMessageEvent.php
@@ -19,13 +19,10 @@
  */
 final class FailedMessageEvent extends Event
 {
-    private MessageInterface $message;
-    private \Throwable $error;
-
-    public function __construct(MessageInterface $message, \Throwable $error)
-    {
-        $this->message = $message;
-        $this->error = $error;
+    public function __construct(
+        private MessageInterface $message,
+        private \Throwable $error,
+    ) {
     }
 
     public function getMessage(): MessageInterface
diff --git a/Event/MessageEvent.php b/Event/MessageEvent.php
@@ -19,13 +19,10 @@
  */
 final class MessageEvent extends Event
 {
-    private MessageInterface $message;
-    private bool $queued;
-
-    public function __construct(MessageInterface $message, bool $queued = false)
-    {
-        $this->message = $message;
-        $this->queued = $queued;
+    public function __construct(
+        private MessageInterface $message,
+        private bool $queued = false,
+    ) {
     }
 
     public function getMessage(): MessageInterface
diff --git a/Event/SentMessageEvent.php b/Event/SentMessageEvent.php
@@ -19,11 +19,9 @@
  */
 final class SentMessageEvent extends Event
 {
-    private SentMessage $message;
-
-    public function __construct(SentMessage $message)
-    {
-        $this->message = $message;
+    public function __construct(
+        private SentMessage $message,
+    ) {
     }
 
     public function getMessage(): SentMessage
diff --git a/EventListener/SendFailedMessageToNotifierListener.php b/EventListener/SendFailedMessageToNotifierListener.php
@@ -24,11 +24,9 @@
  */
 class SendFailedMessageToNotifierListener implements EventSubscriberInterface
 {
-    private Notifier $notifier;
-
-    public function __construct(Notifier $notifier)
-    {
-        $this->notifier = $notifier;
+    public function __construct(
+        private Notifier $notifier,
+    ) {
     }
 
     public function onMessageFailed(WorkerMessageFailedEvent $event): void
diff --git a/Exception/IncompleteDsnException.php b/Exception/IncompleteDsnException.php
@@ -16,11 +16,11 @@
  */
 class IncompleteDsnException extends InvalidArgumentException
 {
-    private ?string $dsn;
-
-    public function __construct(string $message, string $dsn = null, \Throwable $previous = null)
-    {
-        $this->dsn = $dsn;
+    public function __construct(
+        string $message,
+        private ?string $dsn = null,
+        \Throwable $previous = null,
+    ) {
         if ($dsn) {
             $message = sprintf('Invalid "%s" notifier DSN: %s', $dsn, $message);
         }
diff --git a/Exception/TransportException.php b/Exception/TransportException.php
@@ -18,12 +18,14 @@
  */
 class TransportException extends RuntimeException implements TransportExceptionInterface
 {
-    private ResponseInterface $response;
     private string $debug = '';
 
-    public function __construct(string $message, ResponseInterface $response, int $code = 0, \Throwable $previous = null)
-    {
-        $this->response = $response;
+    public function __construct(
+        string $message,
+        private ResponseInterface $response,
+        int $code = 0,
+        \Throwable $previous = null,
+    ) {
         $this->debug .= $response->getInfo('debug') ?? '';
 
         parent::__construct($message, $code, $previous);
diff --git a/Message/ChatMessage.php b/Message/ChatMessage.php
@@ -19,14 +19,12 @@
 class ChatMessage implements MessageInterface, FromNotificationInterface
 {
     private ?string $transport = null;
-    private string $subject;
-    private ?MessageOptionsInterface $options;
     private ?Notification $notification = null;
 
-    public function __construct(string $subject, MessageOptionsInterface $options = null)
-    {
-        $this->subject = $subject;
-        $this->options = $options;
+    public function __construct(
+        private string $subject,
+        private ?MessageOptionsInterface $options = null,
+    ) {
     }
 
     public static function fromNotification(Notification $notification): self
diff --git a/Message/EmailMessage.php b/Message/EmailMessage.php
@@ -25,14 +25,12 @@
  */
 class EmailMessage implements MessageInterface, FromNotificationInterface
 {
-    private RawMessage $message;
-    private ?Envelope $envelope;
     private ?Notification $notification = null;
 
-    public function __construct(RawMessage $message, Envelope $envelope = null)
-    {
-        $this->message = $message;
-        $this->envelope = $envelope;
+    public function __construct(
+        private RawMessage $message,
+        private ?Envelope $envelope = null,
+    ) {
     }
 
     public static function fromNotification(Notification $notification, EmailRecipientInterface $recipient): self
diff --git a/Message/PushMessage.php b/Message/PushMessage.php
@@ -19,16 +19,13 @@
 class PushMessage implements MessageInterface, FromNotificationInterface
 {
     private ?string $transport = null;
-    private string $subject;
-    private string $content;
-    private ?MessageOptionsInterface $options;
     private ?Notification $notification = null;
 
-    public function __construct(string $subject, string $content, MessageOptionsInterface $options = null)
-    {
-        $this->subject = $subject;
-        $this->content = $content;
-        $this->options = $options;
+    public function __construct(
+        private string $subject,
+        private string $content,
+        private ?MessageOptionsInterface $options = null,
+    ) {
     }
 
     public static function fromNotification(Notification $notification): self
diff --git a/Message/SentMessage.php b/Message/SentMessage.php
@@ -16,14 +16,12 @@
  */
 class SentMessage
 {
-    private MessageInterface $original;
-    private string $transport;
     private ?string $messageId = null;
 
-    public function __construct(MessageInterface $original, string $transport)
-    {
-        $this->original = $original;
-        $this->transport = $transport;
+    public function __construct(
+        private MessageInterface $original,
+        private string $transport,
+    ) {
     }
 
     public function getOriginalMessage(): MessageInterface
diff --git a/Message/SmsMessage.php b/Message/SmsMessage.php
@@ -21,22 +21,17 @@
 class SmsMessage implements MessageInterface, FromNotificationInterface
 {
     private ?string $transport = null;
-    private string $subject;
-    private string $phone;
-    private string $from;
-    private ?MessageOptionsInterface $options;
     private ?Notification $notification = null;
 
-    public function __construct(string $phone, string $subject, string $from = '', MessageOptionsInterface $options = null)
-    {
+    public function __construct(
+        private string $phone,
+        private string $subject,
+        private string $from = '',
+        private ?MessageOptionsInterface $options = null,
+    ) {
         if ('' === $phone) {
             throw new InvalidArgumentException(sprintf('"%s" needs a phone number, it cannot be empty.', __CLASS__));
         }
-
-        $this->subject = $subject;
-        $this->phone = $phone;
-        $this->from = $from;
-        $this->options = $options;
     }
 
     public static function fromNotification(Notification $notification, SmsRecipientInterface $recipient): self
diff --git a/Messenger/MessageHandler.php b/Messenger/MessageHandler.php
@@ -20,11 +20,9 @@
  */
 final class MessageHandler
 {
-    private TransportInterface $transport;
-
-    public function __construct(TransportInterface $transport)
-    {
-        $this->transport = $transport;
+    public function __construct(
+        private TransportInterface $transport,
+    ) {
     }
 
     public function __invoke(MessageInterface $message): ?SentMessage
diff --git a/Notifier.php b/Notifier.php
@@ -27,16 +27,14 @@
 final class Notifier implements NotifierInterface
 {
     private array $adminRecipients = [];
-    private array|ContainerInterface $channels;
-    private ?ChannelPolicyInterface $policy;
 
     /**
      * @param ChannelInterface[]|ContainerInterface $channels
      */
-    public function __construct(array|ContainerInterface $channels, ChannelPolicyInterface $policy = null)
-    {
-        $this->channels = $channels;
-        $this->policy = $policy;
+    public function __construct(
+        private array|ContainerInterface $channels,
+        private ?ChannelPolicyInterface $policy = null,
+    ) {
     }
 
     public function send(Notification $notification, RecipientInterface ...$recipients): void
diff --git a/Test/Constraint/NotificationCount.php b/Test/Constraint/NotificationCount.php
@@ -19,15 +19,11 @@
  */
 final class NotificationCount extends Constraint
 {
-    private int $expectedValue;
-    private ?string $transport;
-    private bool $queued;
-
-    public function __construct(int $expectedValue, string $transport = null, bool $queued = false)
-    {
-        $this->expectedValue = $expectedValue;
-        $this->transport = $transport;
-        $this->queued = $queued;
+    public function __construct(
+        private int $expectedValue,
+        private ?string $transport = null,
+        private bool $queued = false,
+    ) {
     }
 
     public function toString(): string
diff --git a/Test/Constraint/NotificationSubjectContains.php b/Test/Constraint/NotificationSubjectContains.php
@@ -19,11 +19,9 @@
  */
 final class NotificationSubjectContains extends Constraint
 {
-    private string $expectedText;
-
-    public function __construct(string $expectedText)
-    {
-        $this->expectedText = $expectedText;
+    public function __construct(
+        private string $expectedText,
+    ) {
     }
 
     public function toString(): string
diff --git a/Test/Constraint/NotificationTransportIsEqual.php b/Test/Constraint/NotificationTransportIsEqual.php
@@ -19,11 +19,9 @@
  */
 final class NotificationTransportIsEqual extends Constraint
 {
-    private ?string $expectedText;
-
-    public function __construct(?string $expectedText)
-    {
-        $this->expectedText = $expectedText;
+    public function __construct(
+        private ?string $expectedText,
+    ) {
     }
 
     public function toString(): string
diff --git a/Texter.php b/Texter.php
diff --git a/Transport.php b/Transport.php

Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,9 @@`
`18`	`18`	`*/`
`19`	`19`	`final class ChannelPolicy implements ChannelPolicyInterface`
`20`	`20`	`{`
`21`		`- private array $policy;`
`22`		`-`
`23`		`- public function __construct(array $policy)`
`24`		`- {`
`25`		`- $this->policy = $policy;`
	`21`	`+ public function __construct(`
	`22`	`+ private array $policy,`
	`23`	`+ ) {`
`26`	`24`	`}`
`27`	`25`
`28`	`26`	`public function getChannels(string $importance): array`
Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,9 @@`
`22`	`22`	`*/`
`23`	`23`	`final class NotificationDataCollector extends DataCollector`
`24`	`24`	`{`
`25`		`- private NotificationLoggerListener $logger;`
`26`		`-`
`27`		`- public function __construct(NotificationLoggerListener $logger)`
`28`		`- {`
`29`		`- $this->logger = $logger;`
	`25`	`+ public function __construct(`
	`26`	`+ private NotificationLoggerListener $logger,`
	`27`	`+ ) {`
`30`	`28`	`}`
`31`	`29`
`32`	`30`	`public function collect(Request $request, Response $response, \Throwable $exception = null): void`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,9 @@`
`19`	`19`	`*/`
`20`	`20`	`final class SentMessageEvent extends Event`
`21`	`21`	`{`
`22`		`- private SentMessage $message;`
`23`		`-`
`24`		`- public function __construct(SentMessage $message)`
`25`		`- {`
`26`		`- $this->message = $message;`
	`22`	`+ public function __construct(`
	`23`	`+ private SentMessage $message,`
	`24`	`+ ) {`
`27`	`25`	`}`
`28`	`26`
`29`	`27`	`public function getMessage(): SentMessage`
Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,9 @@`
`24`	`24`	`*/`
`25`	`25`	`class SendFailedMessageToNotifierListener implements EventSubscriberInterface`
`26`	`26`	`{`
`27`		`- private Notifier $notifier;`
`28`		`-`
`29`		`- public function __construct(Notifier $notifier)`
`30`		`- {`
`31`		`- $this->notifier = $notifier;`
	`27`	`+ public function __construct(`
	`28`	`+ private Notifier $notifier,`
	`29`	`+ ) {`
`32`	`30`	`}`
`33`	`31`
`34`	`32`	`public function onMessageFailed(WorkerMessageFailedEvent $event): void`