Make sure first argument is required

nicholasruunu · nicholasruunu · commit 303051a07c47 · 2019-01-10T20:02:28.000+01:00
diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -206,11 +206,11 @@ private function guessHandledClasses(\ReflectionClass $handlerClass, string $ser
             throw new RuntimeException(sprintf('Invalid handler service "%s": class "%s" must have an "__invoke()" method.', $serviceId, $handlerClass->getName()));
         }
 
-        $parameters = $method->getParameters();
-        if (0 === \count($parameters)) {
+        if (0 === $method->getNumberOfRequiredParameters()) {
             throw new RuntimeException(sprintf('Invalid handler service "%s": method "%s::__invoke()" first argument must correspond to the message it handles.', $serviceId, $handlerClass->getName()));
         }
 
+        $parameters = $method->getParameters();
         if (!$type = $parameters[0]->getType()) {
             throw new RuntimeException(sprintf('Invalid handler service "%s": argument "$%s" of method "%s::__invoke()" must have a type-hint corresponding to the message class it handles.', $serviceId, $parameters[0]->getName(), $handlerClass->getName()));
         }

Original file line number	Diff line number	Diff line change
`@@ -206,11 +206,11 @@ private function guessHandledClasses(\ReflectionClass $handlerClass, string $ser`
`206`	`206`	`throw new RuntimeException(sprintf('Invalid handler service "%s": class "%s" must have an "__invoke()" method.', $serviceId, $handlerClass->getName()));`
`207`	`207`	`}`
`208`	`208`
`209`		`- $parameters = $method->getParameters();`
`210`		`- if (0 === \count($parameters)) {`
	`209`	`+ if (0 === $method->getNumberOfRequiredParameters()) {`
`211`	`210`	`throw new RuntimeException(sprintf('Invalid handler service "%s": method "%s::__invoke()" first argument must correspond to the message it handles.', $serviceId, $handlerClass->getName()));`
`212`	`211`	`}`
`213`	`212`
	`213`	`+ $parameters = $method->getParameters();`
`214`	`214`	`if (!$type = $parameters[0]->getType()) {`
`215`	`215`	`throw new RuntimeException(sprintf('Invalid handler service "%s": argument "$%s" of method "%s::__invoke()" must have a type-hint corresponding to the message class it handles.', $serviceId, $parameters[0]->getName(), $handlerClass->getName()));`
`216`	`216`	`}`