code review fixes 2

Author: Bartłomiej Nowak

src/Symfony/MessageMapFactory.php

@@ -4,7 +4,6 @@
 
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
-use PHPStan\ShouldNotHappenException;
 use Symfony\Component\Messenger\Handler\MessageSubscriberInterface;
 use function class_exists;
 use function count;
@@ -96,14 +95,11 @@ private function guessHandledMessages(ClassReflection $reflectionClass): iterabl
 			$className = $reflectionClass->getName();
 
 			foreach ($className::getHandledMessages() as $index => $value) {
-				try {
-					if (self::containOptions($index, $value)) {
-						yield $index => $value;
-					} else {
-						yield $value => ['method' => self::DEFAULT_HANDLER_METHOD];
-					}
-				} catch (ShouldNotHappenException $e) {
-					continue;
+				$containOptions = self::containOptions($index, $value);
+				if ($containOptions === true) {
+					yield $index => $value;
+				} elseif ($containOptions === false) {
+					yield $value => ['method' => self::DEFAULT_HANDLER_METHOD];
 				}
 			}
 
@@ -144,15 +140,15 @@ private function guessHandledMessages(ClassReflection $reflectionClass): iterabl
 	 * @phpstan-assert-if-false =int $index
 	 * @phpstan-assert-if-false =class-string $value
 	 */
-	private static function containOptions($index, $value): bool
+	private static function containOptions($index, $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();
+		return null;
 	}
 
 }

src/Type/Symfony/MessengerHandleTraitReturnTypeExtension.php

@@ -33,7 +33,12 @@ public function __construct(MessageMapFactory $symfonyMessageMapFactory)
 	public function getType(Expr $expr, Scope $scope): ?Type
 	{
 		if ($this->isSupported($expr, $scope)) {
-			$arg = $expr->getArgs()[0]->value;
+			$args = $expr->getArgs();
+			if (count($args) !== 1) {
+				return null;
+			}
+
+			$arg = $args[0]->value;
 			$argClassNames = $scope->getType($arg)->getObjectClassNames();
 
 			if (count($argClassNames) === 1) {