Rework

Author: VincentLanglet

src/Type/Symfony/BrowserKitAssertionTraitReturnTypeExtension.php

@@ -18,7 +18,7 @@ final class BrowserKitAssertionTraitReturnTypeExtension implements ExpressionTyp
 {
 
 	private const TRAIT_NAME = 'Symfony\Bundle\FrameworkBundle\Test\BrowserKitAssertionsTrait';
-	private const TRAIT_METHOD_NAME = 'getClient';
+	private const TRAIT_METHOD_NAME = 'getclient';
 
 	public function getType(Expr $expr, Scope $scope): ?Type
 	{
@@ -45,22 +45,26 @@ public function getType(Expr $expr, Scope $scope): ?Type
 	 */
 	private function isSupported(Expr $expr, Scope $scope): bool
 	{
-		if (!($expr instanceof MethodCall) || !($expr->name instanceof Identifier) || $expr->name->name !== self::TRAIT_METHOD_NAME) {
+		if (!($expr instanceof MethodCall) || !($expr->name instanceof Identifier) || $expr->name->toLowerString() !== self::TRAIT_METHOD_NAME) {
 			return false;
 		}
 
 		if (!$scope->isInClass()) {
 			return false;
 		}
 
-		$reflectionClass = $scope->getClassReflection()->getNativeReflection();
+		$methodReflection = $scope->getMethodReflection($scope->getType($expr->var), $expr->name->toString());
+		if (null === $methodReflection) {
+			return false;
+		}
 
+		$reflectionClass = $methodReflection->getDeclaringClass()->getNativeReflection();
 		if (!$reflectionClass->hasMethod(self::TRAIT_METHOD_NAME)) {
 			return false;
 		}
 
-		$methodReflection = $reflectionClass->getMethod(self::TRAIT_METHOD_NAME);
-		$declaringClassReflection = $methodReflection->getBetterReflection()->getDeclaringClass();
+		$traitMethodReflection = $reflectionClass->getMethod(self::TRAIT_METHOD_NAME);
+		$declaringClassReflection = $traitMethodReflection->getBetterReflection()->getDeclaringClass();
 
 		return $declaringClassReflection->getName() === self::TRAIT_NAME;
 	}

src/Type/Symfony/MessengerHandleTraitReturnTypeExtension.php

@@ -66,22 +66,26 @@ private function getMessageMap(): MessageMap
 	 */
 	private function isSupported(Expr $expr, Scope $scope): bool
 	{
-		if (!($expr instanceof MethodCall) || !($expr->name instanceof Identifier) || $expr->name->name !== self::TRAIT_METHOD_NAME) {
+		if (!($expr instanceof MethodCall) || !($expr->name instanceof Identifier) || $expr->name->toLowerString() !== self::TRAIT_METHOD_NAME) {
 			return false;
 		}
 
 		if (!$scope->isInClass()) {
 			return false;
 		}
 
-		$reflectionClass = $scope->getClassReflection()->getNativeReflection();
+		$methodReflection = $scope->getMethodReflection($scope->getType($expr->var), $expr->name->toString());
+		if (null === $methodReflection) {
+			return false;
+		}
 
+		$reflectionClass = $methodReflection->getDeclaringClass()->getNativeReflection();
 		if (!$reflectionClass->hasMethod(self::TRAIT_METHOD_NAME)) {
 			return false;
 		}
 
-		$methodReflection = $reflectionClass->getMethod(self::TRAIT_METHOD_NAME);
-		$declaringClassReflection = $methodReflection->getBetterReflection()->getDeclaringClass();
+		$traitMethodReflection = $reflectionClass->getMethod(self::TRAIT_METHOD_NAME);
+		$declaringClassReflection = $traitMethodReflection->getBetterReflection()->getDeclaringClass();
 
 		return $declaringClassReflection->getName() === self::TRAIT_NAME;
 	}

tests/Type/Symfony/data/browserkit_assertion_trait.php

@@ -19,5 +19,8 @@ public function test(AbstractBrowser $browser, ?AbstractBrowser $nullableBrowser
         assertType('Symfony\Component\BrowserKit\AbstractBrowser', $this->getClient($browser));
         assertType('Symfony\Component\BrowserKit\AbstractBrowser|null', $this->getClient($nullableBrowser));
         assertType('Symfony\Component\BrowserKit\AbstractBrowser|null', $this->getClient($mixed));
+
+        assertType('Symfony\Component\BrowserKit\AbstractBrowser', $this->getclient());
+        assertType('mixed', $mixed->getClient());
     }
 }