Rework

VincentLanglet · VincentLanglet · commit 2b57a140c85b · 2025-09-10T21:22:01.000+02:00
diff --git a/src/Type/Symfony/BrowserKitAssertionTraitReturnTypeExtension.php b/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 ($methodReflection === null) {
+			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;
 	}
diff --git a/src/Type/Symfony/MessengerHandleTraitReturnTypeExtension.php b/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 ($methodReflection === null) {
+			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;
 	}
diff --git a/tests/Type/Symfony/data/browserkit_assertion_trait.php b/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());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ final class BrowserKitAssertionTraitReturnTypeExtension implements ExpressionTyp`
`18`	`18`	`{`
`19`	`19`
`20`	`20`	`private const TRAIT_NAME = 'Symfony\Bundle\FrameworkBundle\Test\BrowserKitAssertionsTrait';`
`21`		`- private const TRAIT_METHOD_NAME = 'getClient';`
	`21`	`+ private const TRAIT_METHOD_NAME = 'getclient';`
`22`	`22`
`23`	`23`	`public function getType(Expr $expr, Scope $scope): ?Type`
`24`	`24`	`{`
`@@ -45,22 +45,26 @@ public function getType(Expr $expr, Scope $scope): ?Type`
`45`	`45`	`*/`
`46`	`46`	`private function isSupported(Expr $expr, Scope $scope): bool`
`47`	`47`	`{`
`48`		`- if (!($expr instanceof MethodCall) \|\| !($expr->name instanceof Identifier) \|\| $expr->name->name !== self::TRAIT_METHOD_NAME) {`
	`48`	`+ if (!($expr instanceof MethodCall) \|\| !($expr->name instanceof Identifier) \|\| $expr->name->toLowerString() !== self::TRAIT_METHOD_NAME) {`
`49`	`49`	`return false;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`if (!$scope->isInClass()) {`
`53`	`53`	`return false;`
`54`	`54`	`}`
`55`	`55`
`56`		`- $reflectionClass = $scope->getClassReflection()->getNativeReflection();`
	`56`	`+ $methodReflection = $scope->getMethodReflection($scope->getType($expr->var), $expr->name->toString());`
	`57`	`+ if ($methodReflection === null) {`
	`58`	`+ return false;`
	`59`	`+ }`
`57`	`60`
	`61`	`+ $reflectionClass = $methodReflection->getDeclaringClass()->getNativeReflection();`
`58`	`62`	`if (!$reflectionClass->hasMethod(self::TRAIT_METHOD_NAME)) {`
`59`	`63`	`return false;`
`60`	`64`	`}`
`61`	`65`
`62`		`- $methodReflection = $reflectionClass->getMethod(self::TRAIT_METHOD_NAME);`
`63`		`- $declaringClassReflection = $methodReflection->getBetterReflection()->getDeclaringClass();`
	`66`	`+ $traitMethodReflection = $reflectionClass->getMethod(self::TRAIT_METHOD_NAME);`
	`67`	`+ $declaringClassReflection = $traitMethodReflection->getBetterReflection()->getDeclaringClass();`
`64`	`68`
`65`	`69`	`return $declaringClassReflection->getName() === self::TRAIT_NAME;`
`66`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,22 +66,26 @@ private function getMessageMap(): MessageMap`
`66`	`66`	`*/`
`67`	`67`	`private function isSupported(Expr $expr, Scope $scope): bool`
`68`	`68`	`{`
`69`		`- if (!($expr instanceof MethodCall) \|\| !($expr->name instanceof Identifier) \|\| $expr->name->name !== self::TRAIT_METHOD_NAME) {`
	`69`	`+ if (!($expr instanceof MethodCall) \|\| !($expr->name instanceof Identifier) \|\| $expr->name->toLowerString() !== self::TRAIT_METHOD_NAME) {`
`70`	`70`	`return false;`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`if (!$scope->isInClass()) {`
`74`	`74`	`return false;`
`75`	`75`	`}`
`76`	`76`
`77`		`- $reflectionClass = $scope->getClassReflection()->getNativeReflection();`
	`77`	`+ $methodReflection = $scope->getMethodReflection($scope->getType($expr->var), $expr->name->toString());`
	`78`	`+ if ($methodReflection === null) {`
	`79`	`+ return false;`
	`80`	`+ }`
`78`	`81`
	`82`	`+ $reflectionClass = $methodReflection->getDeclaringClass()->getNativeReflection();`
`79`	`83`	`if (!$reflectionClass->hasMethod(self::TRAIT_METHOD_NAME)) {`
`80`	`84`	`return false;`
`81`	`85`	`}`
`82`	`86`
`83`		`- $methodReflection = $reflectionClass->getMethod(self::TRAIT_METHOD_NAME);`
`84`		`- $declaringClassReflection = $methodReflection->getBetterReflection()->getDeclaringClass();`
	`87`	`+ $traitMethodReflection = $reflectionClass->getMethod(self::TRAIT_METHOD_NAME);`
	`88`	`+ $declaringClassReflection = $traitMethodReflection->getBetterReflection()->getDeclaringClass();`
`85`	`89`
`86`	`90`	`return $declaringClassReflection->getName() === self::TRAIT_NAME;`
`87`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,8 @@ public function test(AbstractBrowser $browser, ?AbstractBrowser $nullableBrowser`
`19`	`19`	`assertType('Symfony\Component\BrowserKit\AbstractBrowser', $this->getClient($browser));`
`20`	`20`	`assertType('Symfony\Component\BrowserKit\AbstractBrowser\|null', $this->getClient($nullableBrowser));`
`21`	`21`	`assertType('Symfony\Component\BrowserKit\AbstractBrowser\|null', $this->getClient($mixed));`
	`22`	`+`
	`23`	`+ assertType('Symfony\Component\BrowserKit\AbstractBrowser', $this->getclient());`
	`24`	`+ assertType('mixed', $mixed->getClient());`
`22`	`25`	`}`
`23`	`26`	`}`