Merge branch refs/heads/2.1.x into 2.2.x

phpstan-bot · web-flow · commit 14c06ab92a0f · 2026-03-10T08:13:34.000+01:00
diff --git a/src/Analyser/ExprHandler/FuncCallHandler.php b/src/Analyser/ExprHandler/FuncCallHandler.php
@@ -17,7 +17,7 @@
 use PHPStan\Analyser\ExpressionResult;
 use PHPStan\Analyser\ExpressionResultStorage;
 use PHPStan\Analyser\ExprHandler;
-use PHPStan\Analyser\ExprHandler\Helper\VoidToNullTypeTransfomer;
+use PHPStan\Analyser\ExprHandler\Helper\VoidToNullTypeTransformer;
 use PHPStan\Analyser\ImpurePoint;
 use PHPStan\Analyser\InternalThrowPoint;
 use PHPStan\Analyser\MutatingScope;
@@ -808,7 +808,7 @@ public function resolveType(MutatingScope $scope, Expr $expr): Type
 			}
 		}
 
-		return VoidToNullTypeTransfomer::transform($parametersAcceptor->getReturnType(), $expr);
+		return VoidToNullTypeTransformer::transform($parametersAcceptor->getReturnType(), $expr);
 	}
 
 	private function getDynamicFunctionReturnType(MutatingScope $scope, FuncCall $normalizedNode, FunctionReflection $functionReflection): ?Type
diff --git a/src/Analyser/ExprHandler/Helper/MethodCallReturnTypeHelper.php b/src/Analyser/ExprHandler/Helper/MethodCallReturnTypeHelper.php
@@ -48,7 +48,7 @@ public function methodCallReturnType(
 			$normalizedMethodCall = ArgumentsNormalizer::reorderStaticCallArguments($parametersAcceptor, $methodCall);
 		}
 		if ($normalizedMethodCall === null) {
-			return VoidToNullTypeTransfomer::transform($parametersAcceptor->getReturnType(), $methodCall);
+			return VoidToNullTypeTransformer::transform($parametersAcceptor->getReturnType(), $methodCall);
 		}
 
 		$resolvedTypes = [];
@@ -87,10 +87,10 @@ public function methodCallReturnType(
 		}
 
 		if (count($resolvedTypes) > 0) {
-			return VoidToNullTypeTransfomer::transform(TypeCombinator::union(...$resolvedTypes), $methodCall);
+			return VoidToNullTypeTransformer::transform(TypeCombinator::union(...$resolvedTypes), $methodCall);
 		}
 
-		return VoidToNullTypeTransfomer::transform($parametersAcceptor->getReturnType(), $methodCall);
+		return VoidToNullTypeTransformer::transform($parametersAcceptor->getReturnType(), $methodCall);
 	}
 
 }
diff --git a/src/Analyser/ExprHandler/Helper/VoidToNullTypeTransformer.php b/src/Analyser/ExprHandler/Helper/VoidToNullTypeTransformer.php
@@ -8,7 +8,7 @@
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeTraverser;
 
-final class VoidToNullTypeTransfomer
+final class VoidToNullTypeTransformer
 {
 
 	public static function transform(Type $type, Node $node): Type

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`use PHPStan\Analyser\ExpressionResult;`
`18`	`18`	`use PHPStan\Analyser\ExpressionResultStorage;`
`19`	`19`	`use PHPStan\Analyser\ExprHandler;`
`20`		`-use PHPStan\Analyser\ExprHandler\Helper\VoidToNullTypeTransfomer;`
	`20`	`+use PHPStan\Analyser\ExprHandler\Helper\VoidToNullTypeTransformer;`
`21`	`21`	`use PHPStan\Analyser\ImpurePoint;`
`22`	`22`	`use PHPStan\Analyser\InternalThrowPoint;`
`23`	`23`	`use PHPStan\Analyser\MutatingScope;`
`@@ -808,7 +808,7 @@ public function resolveType(MutatingScope $scope, Expr $expr): Type`
`808`	`808`	`}`
`809`	`809`	`}`
`810`	`810`
`811`		`- return VoidToNullTypeTransfomer::transform($parametersAcceptor->getReturnType(), $expr);`
	`811`	`+ return VoidToNullTypeTransformer::transform($parametersAcceptor->getReturnType(), $expr);`
`812`	`812`	`}`
`813`	`813`
`814`	`814`	`private function getDynamicFunctionReturnType(MutatingScope $scope, FuncCall $normalizedNode, FunctionReflection $functionReflection): ?Type`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function methodCallReturnType(`
`48`	`48`	`$normalizedMethodCall = ArgumentsNormalizer::reorderStaticCallArguments($parametersAcceptor, $methodCall);`
`49`	`49`	`}`
`50`	`50`	`if ($normalizedMethodCall === null) {`
`51`		`- return VoidToNullTypeTransfomer::transform($parametersAcceptor->getReturnType(), $methodCall);`
	`51`	`+ return VoidToNullTypeTransformer::transform($parametersAcceptor->getReturnType(), $methodCall);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`$resolvedTypes = [];`
`@@ -87,10 +87,10 @@ public function methodCallReturnType(`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`if (count($resolvedTypes) > 0) {`
`90`		`- return VoidToNullTypeTransfomer::transform(TypeCombinator::union(...$resolvedTypes), $methodCall);`
	`90`	`+ return VoidToNullTypeTransformer::transform(TypeCombinator::union(...$resolvedTypes), $methodCall);`
`91`	`91`	`}`
`92`	`92`
`93`		`- return VoidToNullTypeTransfomer::transform($parametersAcceptor->getReturnType(), $methodCall);`
	`93`	`+ return VoidToNullTypeTransformer::transform($parametersAcceptor->getReturnType(), $methodCall);`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`use PHPStan\Type\Type;`
`9`	`9`	`use PHPStan\Type\TypeTraverser;`
`10`	`10`
`11`		`-final class VoidToNullTypeTransfomer`
	`11`	`+final class VoidToNullTypeTransformer`
`12`	`12`	`{`
`13`	`13`
`14`	`14`	`public static function transform(Type $type, Node $node): Type`