Use CPP where possible

Author: alexandre-daubois

Envelope.php

@@ -24,15 +24,15 @@ final class Envelope
      * @var array<class-string<StampInterface>, list<StampInterface>>
      */
     private array $stamps = [];
-    private object $message;
 
     /**
      * @param object|Envelope  $message
      * @param StampInterface[] $stamps
      */
-    public function __construct(object $message, array $stamps = [])
-    {
-        $this->message = $message;
+    public function __construct(
+        private object $message,
+        array $stamps = [],
+    ) {
 
         foreach ($stamps as $stamp) {
             $this->stamps[$stamp::class][] = $stamp;

MessageBus.php

@@ -36,12 +36,11 @@ public function __construct(iterable $middlewareHandlers = [])
             // $this->middlewareAggregate should be an instance of IteratorAggregate.
             // When $middlewareHandlers is an Iterator, we wrap it to ensure it is lazy-loaded and can be rewound.
             $this->middlewareAggregate = new class($middlewareHandlers) implements \IteratorAggregate {
-                private \Traversable $middlewareHandlers;
                 private \ArrayObject $cachedIterator;
 
-                public function __construct(\Traversable $middlewareHandlers)
-                {
-                    $this->middlewareHandlers = $middlewareHandlers;
+                public function __construct(
+                    private \Traversable $middlewareHandlers,
+                ) {
                 }
 
                 public function getIterator(): \Traversable

Middleware/DispatchAfterCurrentBusMiddleware.php

@@ -110,12 +110,12 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
 final class QueuedEnvelope
 {
     private Envelope $envelope;
-    private StackInterface $stack;
 
-    public function __construct(Envelope $envelope, StackInterface $stack)
-    {
+    public function __construct(
+        Envelope $envelope,
+        private StackInterface $stack,
+    ) {
         $this->envelope = $envelope->withoutAll(DispatchAfterCurrentBusStamp::class);
-        $this->stack = $stack;
     }
 
     public function getEnvelope(): Envelope

RoutableMessageBus.php

@@ -25,13 +25,10 @@
  */
 class RoutableMessageBus implements MessageBusInterface
 {
-    private ContainerInterface $busLocator;
-    private ?MessageBusInterface $fallbackBus;
-
-    public function __construct(ContainerInterface $busLocator, ?MessageBusInterface $fallbackBus = null)
-    {
-        $this->busLocator = $busLocator;
-        $this->fallbackBus = $fallbackBus;
+    public function __construct(
+        private ContainerInterface $busLocator,
+        private ?MessageBusInterface $fallbackBus = null,
+    ) {
     }
 
     public function dispatch(object $envelope, array $stamps = []): Envelope

TraceableMessageBus.php

@@ -16,12 +16,11 @@
  */
 class TraceableMessageBus implements MessageBusInterface
 {
-    private MessageBusInterface $decoratedBus;
     private array $dispatchedMessages = [];
 
-    public function __construct(MessageBusInterface $decoratedBus)
-    {
-        $this->decoratedBus = $decoratedBus;
+    public function __construct(
+        private MessageBusInterface $decoratedBus,
+    ) {
     }
 
     public function dispatch(object $message, array $stamps = []): Envelope

WorkerMetadata.php

@@ -16,11 +16,9 @@
  */
 final class WorkerMetadata
 {
-    private array $metadata;
-
-    public function __construct(array $metadata)
-    {
-        $this->metadata = $metadata;
+    public function __construct(
+        private array $metadata,
+    ) {
     }
 
     public function set(array $newMetadata): void