Merge pull request #702 from patchlevel/subscribe-metadata-no-method-list-subscribe

SubscribeMetadata dont hold a list of methods for events

Author: DavidBadura

phpstan-baseline.neon

@@ -439,7 +439,7 @@ parameters:
 			path: tests/Unit/Message/Translator/ReplaceEventTranslatorTest.php
 
 		-
-			message: '#^Method class@anonymous/tests/Unit/Metadata/Subscriber/AttributeSubscriberMetadataFactoryTest\.php\:212\:\:profileVisited\(\) has parameter \$message with no type specified\.$#'
+			message: '#^Method class@anonymous/tests/Unit/Metadata/Subscriber/AttributeSubscriberMetadataFactoryTest\.php\:211\:\:profileVisited\(\) has parameter \$message with no type specified\.$#'
 			identifier: missingType.parameter
 			count: 1
 			path: tests/Unit/Metadata/Subscriber/AttributeSubscriberMetadataFactoryTest.php

src/Metadata/Subscriber/AttributeSubscriberMetadataFactory.php

@@ -58,12 +58,12 @@ public function metadata(string $subscriber): SubscriberMetadata
                     throw DuplicateSubscribeMethod::duplicateEvent(
                         $subscriber,
                         $eventClass,
-                        $subscribeMethods[$eventClass][0]->name,
+                        $subscribeMethods[$eventClass]->name,
                         $method->getName(),
                     );
                 }
 
-                $subscribeMethods[$eventClass][] = $this->subscribeMethod($method);
+                $subscribeMethods[$eventClass] = $this->subscribeMethod($method);
             }
 
             if ($method->getAttributes(OnFailed::class)) {

src/Metadata/Subscriber/SubscriberMetadata.php

@@ -13,7 +13,7 @@ public function __construct(
         public readonly string $id,
         public readonly string $group = Subscription::DEFAULT_GROUP,
         public readonly RunMode $runMode = RunMode::FromBeginning,
-        /** @var array<class-string|"*", list<SubscribeMethodMetadata>> */
+        /** @var array<class-string|"*", SubscribeMethodMetadata> */
         public readonly array $subscribeMethods = [],
         public readonly string|null $setupMethod = null,
         public readonly string|null $teardownMethod = null,

src/Subscription/Subscriber/MetadataSubscriberAccessor.php

@@ -16,7 +16,6 @@
 use function array_key_exists;
 use function array_keys;
 use function array_map;
-use function array_merge;
 
 /** @template T of object */
 final class MetadataSubscriberAccessor implements SubscriberAccessor, RealSubscriberAccessor
@@ -115,10 +114,15 @@ public function subscribeMethods(string $eventClass): array
             return $this->subscribeCache[$eventClass];
         }
 
-        $methods = array_merge(
-            $this->metadata->subscribeMethods[$eventClass] ?? [],
-            $this->metadata->subscribeMethods[Subscribe::ALL] ?? [],
-        );
+        $methods = [];
+
+        if (array_key_exists($eventClass, $this->metadata->subscribeMethods)) {
+            $methods[] = $this->metadata->subscribeMethods[$eventClass];
+        }
+
+        if (array_key_exists(Subscribe::ALL, $this->metadata->subscribeMethods)) {
+            $methods[] = $this->metadata->subscribeMethods[Subscribe::ALL];
+        }
 
         $this->subscribeCache[$eventClass] = array_map(
             fn (SubscribeMethodMetadata $method): Closure => $this->createClosure($eventClass, $method),

tests/Unit/Metadata/Subscriber/AttributeSubscriberMetadataFactoryTest.php

@@ -114,9 +114,7 @@ public function drop(): void
 
         self::assertEquals(
             [
-                ProfileVisited::class => [
-                    new SubscribeMethodMetadata('handle', []),
-                ],
+                ProfileVisited::class => new SubscribeMethodMetadata('handle', []),
             ],
             $metadata->subscribeMethods,
         );
@@ -141,8 +139,8 @@ public function handle(): void
 
         self::assertEquals(
             [
-                ProfileVisited::class => [new SubscribeMethodMetadata('handle', [])],
-                ProfileCreated::class => [new SubscribeMethodMetadata('handle', [])],
+                ProfileVisited::class => new SubscribeMethodMetadata('handle', []),
+                ProfileCreated::class => new SubscribeMethodMetadata('handle', []),
             ],
             $metadata->subscribeMethods,
         );
@@ -163,7 +161,7 @@ public function handle(): void
 
         self::assertEquals(
             [
-                '*' => [new SubscribeMethodMetadata('handle', [])],
+                '*' => new SubscribeMethodMetadata('handle', []),
             ],
             $metadata->subscribeMethods,
         );
@@ -189,17 +187,18 @@ public function profileCreated(ProfileCreated $profileCreated, string $aggregate
 
         self::assertEquals(
             [
-                ProfileVisited::class => [
-                    new SubscribeMethodMetadata('profileVisited', [
-                        new ArgumentMetadata('message', Message::class),
-                    ]),
-                ],
-                ProfileCreated::class => [
-                    new SubscribeMethodMetadata('profileCreated', [
+                ProfileVisited::class => new SubscribeMethodMetadata(
+                    'profileVisited',
+                    [new ArgumentMetadata('message', Message::class)],
+                ),
+
+                ProfileCreated::class => new SubscribeMethodMetadata(
+                    'profileCreated',
+                    [
                         new ArgumentMetadata('profileCreated', ProfileCreated::class),
                         new ArgumentMetadata('aggregateId', 'string'),
-                    ]),
-                ],
+                    ],
+                ),
             ],
             $metadata->subscribeMethods,
         );