adjust MessageMap to contain only supported cases

Author: Bartłomiej Nowak

src/Symfony/Message.php

@@ -2,25 +2,25 @@
 
 namespace PHPStan\Symfony;
 
+use PHPStan\Type\Type;
+
 final class MessageMap
 {
 
-	/** @var Message[] */
-	private $messages = [];
+	/** @var array<string, Type> */
+	private $messageMap;
 
 	/**
-	 * @param Message[] $messages
+	 * @param array<string, Type> $messageMap
 	 */
-	public function __construct(array $messages)
+	public function __construct(array $messageMap)
 	{
-		foreach ($messages as $message) {
-			$this->messages[$message->getClass()] = $message;
-		}
+		$this->messageMap = $messageMap;
 	}
 
-	public function getMessageForClass(string $class): ?Message
+	public function getTypeForClass(string $class): ?Type
 	{
-		return $this->messages[$class] ?? null;
+		return $this->messageMap[$class] ?? null;
 	}
 
 }

src/Symfony/MessageMap.php

@@ -68,12 +68,16 @@ public function create(): MessageMap
 			}
 		}
 
-		$messages = [];
+		$messageMap = [];
 		foreach ($returnTypesMap as $messageClassName => $returnTypes) {
-			$messages[] = new Message($messageClassName, $returnTypes);
+			if (count($returnTypes) !== 1) {
+				continue;
+			}
+
+			$messageMap[$messageClassName] = $returnTypes[0];
 		}
 
-		return new MessageMap($messages);
+		return new MessageMap($messageMap);
 	}
 
 	/** @return array<string, array<string, string>> */

src/Symfony/MessageMapFactory.php

@@ -46,13 +46,12 @@ public function getType(Expr $expr, Scope $scope): ?Type
 			$arg = $expr->getArgs()[0]->value;
 			$argClassNames = $scope->getType($arg)->getObjectClassNames();
 
-			// todo filter out not handled cases on map creation?
 			if (count($argClassNames) === 1) {
 				$messageMap = $this->getMessageMap();
-				$message = $messageMap->getMessageForClass($argClassNames[0]);
+				$returnType = $messageMap->getTypeForClass($argClassNames[0]);
 
-				if (!is_null($message) && $message->countReturnTypes() === 1) {
-					return $message->getReturnTypes()[0];
+				if (!is_null($returnType)) {
+					return $returnType;
 				}
 			}
 		}