Small fixes

src/Bus/BusEnvelopeCollection.php

@@ -16,11 +16,8 @@
 
 final class BusEnvelopeCollection extends EnvelopeCollection
 {
-    private TestBus $bus;
-
-    public function __construct(TestBus $bus, Envelope ...$envelope)
+    public function __construct(private TestBus $bus, Envelope ...$envelope)
     {
-        $this->bus = $bus;
         parent::__construct(...$envelope);
     }
 

src/EnvelopeCollection.php

@@ -86,10 +86,7 @@ final public function assertNotContains(string $messageClass): static
         return $this;
     }
 
-    /**
-     * @param string|callable|null $filter
-     */
-    final public function first($filter = null): TestEnvelope
+    final public function first(callable|string|null $filter = null): TestEnvelope
     {
         if (null === $filter) {
             // just the first envelope
@@ -157,7 +154,7 @@ final public function count(): int
 
     private static function normalizeFilter(callable $filter): callable
     {
-        $function = new \ReflectionFunction(\Closure::fromCallable($filter));
+        $function = new \ReflectionFunction($filter(...));
 
         if (!$parameter = $function->getParameters()[0] ?? null) {
             return $filter;
@@ -172,8 +169,8 @@ private static function normalizeFilter(callable $filter): callable
         }
 
         // user used message class name as type-hint
-        return function(Envelope $envelope) use ($filter, $type) {
-            if ($type->getName() !== \get_class($envelope->getMessage())) {
+        return static function(Envelope $envelope) use ($filter, $type) {
+            if ($type->getName() !== $envelope->getMessage()::class) {
                 return false;
             }
 

src/TestEnvelope.php

@@ -22,11 +22,8 @@
  */
 final class TestEnvelope
 {
-    private Envelope $envelope;
-
-    public function __construct(Envelope $envelope)
+    public function __construct(private Envelope $envelope)
     {
-        $this->envelope = $envelope;
     }
 
     /**

src/Transport/TestTransportFactory.php

@@ -22,6 +22,8 @@
  * @author Kevin Bond <kevinbond@gmail.com>
  *
  * @internal
+ *
+ * @implements TransportFactoryInterface<TestTransport>
  */
 final class TestTransportFactory implements TransportFactoryInterface
 {
@@ -36,7 +38,7 @@ public function createTransport(string $dsn, array $options, SerializerInterface
 
     public function supports(string $dsn, array $options): bool // @phpstan-ignore-line
     {
-        return 0 === \mb_strpos($dsn, 'test://');
+        return \str_starts_with($dsn, 'test://');
     }
 
     /**

src/Transport/TransportEnvelopeCollection.php

@@ -16,11 +16,8 @@
 
 final class TransportEnvelopeCollection extends EnvelopeCollection
 {
-    private TestTransport $transport;
-
-    public function __construct(TestTransport $transport, Envelope ...$envelopes)
+    public function __construct(private TestTransport $transport, Envelope ...$envelopes)
     {
-        $this->transport = $transport;
         parent::__construct(...$envelopes);
     }
 

tests/DelayStampTestTest.php → tests/DelayStampTest.php

@@ -24,7 +24,7 @@
 /**
  * @author Nicolas PHILIPPE <nikophil@gmail.com>
  */
-final class DelayStampTestTest extends WebTestCase
+final class DelayStampTest extends WebTestCase
 {
     use ClockSensitiveTrait;
     use InteractsWithMessenger;