covered more test-cases

Author: Bartłomiej Nowak

src/Symfony/MessageMapFactory.php

@@ -53,14 +53,13 @@ public function create(): MessageMap
 				$reflectionClass = $this->reflectionProvider->getClass($serviceClass);
 
 				if (isset($tagAttributes['handles'])) {
-					// todo cover by test case
 					$handles = [$tagAttributes['handles'] => ['method' => $tagAttributes['method'] ?? self::DEFAULT_HANDLER_METHOD]];
 				} else {
 					$handles = $this->guessHandledMessages($reflectionClass);
 				}
 
 				foreach ($handles as $messageClassName => $options) {
-					$methodReflection = $reflectionClass->getNativeMethod($options['method']);
+					$methodReflection = $reflectionClass->getNativeMethod($options['method'] ?? self::DEFAULT_HANDLER_METHOD);
 					$variant = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants());
 
 					$returnTypesMap[$messageClassName][] = $variant->getReturnType();
@@ -84,7 +83,6 @@ public function create(): MessageMap
 	private function guessHandledMessages(ClassReflection $reflectionClass): iterable
 	{
 		if ($reflectionClass->implementsInterface(MessageSubscriberInterface::class)) {
-			// todo handle different return formats
 			foreach ($reflectionClass->getName()::getHandledMessages() as $index => $value) {
 				if (is_int($index) && is_string($value)) {
 					yield $value => ['method' => self::DEFAULT_HANDLER_METHOD];

tests/Type/Symfony/container.xml

@@ -360,5 +360,17 @@
         <service id="multi_query_handler" class="MessengerHandleTrait\MultiQueryHandler">
             <tag name="messenger.message_handler"/>
         </service>
+        <service id="tagged_handler" class="MessengerHandleTrait\TaggedHandler">
+            <tag name="messenger.message_handler" handles="MessengerHandleTrait\TaggedQuery" method="handle"/>
+        </service>
+        <service id="multi_handles_for_in_the_same_handler" class="MessengerHandleTrait\MultiHandlesForInTheSameHandler">
+            <tag name="messenger.message_handler"/>
+        </service>
+        <service id="multi_handlers_for_the_same_message_handler_1" class="MessengerHandleTrait\MultiHandlersForTheSameMessageHandler1">
+            <tag name="messenger.message_handler"/>
+        </service>
+        <service id="multi_handlers_for_the_same_message_handler_2" class="MessengerHandleTrait\MultiHandlersForTheSameMessageHandler2">
+            <tag name="messenger.message_handler"/>
+        </service>
     </services>
 </container>

tests/Type/Symfony/data/messenger_handle_trait.php

@@ -16,22 +16,23 @@ public function __invoke(RegularQuery $query): RegularQueryResult
     }
 }
 
+class BooleanQuery {}
 class StringQuery {}
 class IntQuery {}
 class FloatQuery {}
 class MultiQueryHandler implements MessageSubscriberInterface
 {
     public static function getHandledMessages(): iterable
     {
-        yield StringQuery::class;
+        yield BooleanQuery::class;
         yield IntQuery::class => ['method' => 'handleInt'];
         yield FloatQuery::class => ['method' => 'handleFloat'];
         yield StringQuery::class => ['method' => 'handleString'];
     }
 
-    public function __invoke(StringQuery $query): string
+    public function __invoke(BooleanQuery $query): bool
     {
-        return 'string result';
+        return true;
     }
 
     public function handleInt(IntQuery $query): int
@@ -52,16 +53,63 @@ public function handleString(StringQuery $query): string
     // todo add handle method with union return type?
 }
 
+class TaggedQuery {}
+class TaggedResult {}
+class TaggedHandler
+{
+    public function handle(TaggedQuery $query): TaggedResult
+    {
+        return new TaggedResult();
+    }
+}
+
+class MultiHandlesForInTheSameHandlerQuery {}
+class MultiHandlesForInTheSameHandler implements MessageSubscriberInterface
+{
+    public static function getHandledMessages(): iterable
+    {
+        yield MultiHandlesForInTheSameHandlerQuery::class;
+        yield MultiHandlesForInTheSameHandlerQuery::class => ['priority' => '0'];
+    }
+
+    public function __invoke(MultiHandlesForInTheSameHandlerQuery $query): bool
+    {
+        return true;
+    }
+}
+
+class MultiHandlersForTheSameMessageQuery {}
+class MultiHandlersForTheSameMessageHandler1
+{
+    public function __invoke(MultiHandlersForTheSameMessageQuery $query): bool
+    {
+        return true;
+    }
+}
+class MultiHandlersForTheSameMessageHandler2
+{
+    public function __invoke(MultiHandlersForTheSameMessageQuery $query): bool
+    {
+        return false;
+    }
+}
+
 class HandleTraitClass {
     use HandleTrait;
 
     public function __invoke()
     {
         assertType(RegularQueryResult::class, $this->handle(new RegularQuery()));
+
+        assertType('bool', $this->handle(new BooleanQuery()));
         assertType('int', $this->handle(new IntQuery()));
         assertType('float', $this->handle(new FloatQuery()));
+        assertType('string', $this->handle(new StringQuery()));
+
+        assertType(TaggedResult::class, $this->handle(new TaggedQuery()));
 
-        // HandleTrait will throw exception in fact due to multiple handlers per single query
-        assertType('mixed', $this->handle(new StringQuery()));
+        // HandleTrait will throw exception in fact due to multiple handle methods/handlers per single query
+        assertType('mixed', $this->handle(new MultiHandlesForInTheSameHandlerQuery()));
+        assertType('mixed', $this->handle(new MultiHandlersForTheSameMessageQuery()));
     }
 }