code review 1

Author: Bartłomiej Nowak

src/Symfony/MessageMap.php

@@ -7,17 +7,16 @@
 final class MessageMap
 {
 
-	/** @var array<string, Type> */
+	/** @var array<class-string, Type> */
 	private $messageMap;
 
-	/**
-	 * @param array<string, Type> $messageMap
-	 */
+	/** @param array<class-string, Type> $messageMap */
 	public function __construct(array $messageMap)
 	{
 		$this->messageMap = $messageMap;
 	}
 
+	/** @param class-string $class */
 	public function getTypeForClass(string $class): ?Type
 	{
 		return $this->messageMap[$class] ?? null;

src/Symfony/MessageMapFactory.php

@@ -5,10 +5,12 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\MissingMethodFromReflectionException;
 use PHPStan\Reflection\ReflectionProvider;
+use PHPStan\ShouldNotHappenException;
 use Symfony\Component\Messenger\Handler\MessageSubscriberInterface;
+use function class_exists;
 use function count;
+use function is_array;
 use function is_int;
-use function is_null;
 use function is_string;
 
 final class MessageMapFactory
@@ -36,7 +38,7 @@ public function create(): MessageMap
 		foreach ($this->serviceMap->getServices() as $service) {
 			$serviceClass = $service->getClass();
 
-			if (is_null($serviceClass)) {
+			if ($serviceClass === null) {
 				continue;
 			}
 
@@ -45,6 +47,7 @@ public function create(): MessageMap
 					continue;
 				}
 
+				/** @var array{handles?: class-string, method?: string} $tagAttributes */
 				$tagAttributes = $tag->getAttributes();
 				$reflectionClass = $this->reflectionProvider->getClass($serviceClass);
 
@@ -76,15 +79,15 @@ public function create(): MessageMap
 		return new MessageMap($messageMap);
 	}
 
-	/** @return array<string, array<string, string>> */
+	/** @return array<class-string, array<string, string>> */
 	private function guessHandledMessages(ClassReflection $reflectionClass): iterable
 	{
 		if ($reflectionClass->implementsInterface(MessageSubscriberInterface::class)) {
 			foreach ($reflectionClass->getName()::getHandledMessages() as $index => $value) {
-				if (is_int($index) && is_string($value)) {
-					yield $value => ['method' => self::DEFAULT_HANDLER_METHOD];
-				} else {
+				if (self::containOptions($index, $value)) {
 					yield $index => $value;
+				} else {
+					yield $value => ['method' => self::DEFAULT_HANDLER_METHOD];
 				}
 			}
 
@@ -108,6 +111,7 @@ private function guessHandledMessages(ClassReflection $reflectionClass): iterabl
 			return;
 		}
 
+		/** @var class-string[] $classNames */
 		$classNames = $parameters[0]->getType()->getObjectClassNames();
 
 		if (count($classNames) !== 1) {
@@ -117,4 +121,21 @@ private function guessHandledMessages(ClassReflection $reflectionClass): iterabl
 		yield $classNames[0] => ['method' => self::DEFAULT_HANDLER_METHOD];
 	}
 
+	/**
+	 * @phpstan-assert-if-true class-string $index
+	 * @phpstan-assert-if-true array<string, mixed> $value
+	 * @phpstan-assert-if-false int $index
+	 * @phpstan-assert-if-false class-string $value
+	 */
+	private static function containOptions(mixed $index, mixed $value): bool
+	{
+		if (is_string($index) && class_exists($index) && is_array($value)) {
+			return true;
+		} elseif (is_int($index) && is_string($value) && class_exists($value)) {
+			return false;
+		}
+
+		throw new ShouldNotHappenException();
+	}
+
 }

src/Type/Symfony/MessengerHandleTraitReturnTypeExtension.php

@@ -35,6 +35,7 @@ public function getType(Expr $expr, Scope $scope): ?Type
 	{
 		if ($this->isSupported($expr, $scope)) {
 			$arg = $expr->getArgs()[0]->value;
+			/** @var class-string[] $argClassNames */
 			$argClassNames = $scope->getType($arg)->getObjectClassNames();
 
 			if (count($argClassNames) === 1) {
@@ -52,7 +53,7 @@ public function getType(Expr $expr, Scope $scope): ?Type
 
 	private function getMessageMap(): MessageMap
 	{
-		if (is_null($this->messageMap)) {
+		if ($this->messageMap === null) {
 			$this->messageMap = $this->messageMapFactory->create();
 		}