Bleeding edge - enforce @no-named-arguments

phpstan · Aug 5, 2024 · 74ba8c2 · 74ba8c2
1 parent f3810d9
commit 74ba8c2
Show file tree

Hide file tree

Showing 50 changed files with 392 additions and 9 deletions.
diff --git a/src/Analyser/ArgumentsNormalizer.php b/src/Analyser/ArgumentsNormalizer.php
@@ -27,7 +27,7 @@ final class ArgumentsNormalizer
 	public const ORIGINAL_ARG_ATTRIBUTE = 'originalArg';
 
 	/**
-	 * @return array{ParametersAcceptor, FuncCall}|null
+	 * @return array{ParametersAcceptor, FuncCall, bool}|null
 	 */
 	public static function reorderCallUserFuncArguments(
 		FuncCall $callUserFuncCall,
@@ -65,18 +65,24 @@ public static function reorderCallUserFuncArguments(
 			return null;
 		}
 
+		$callableParametersAcceptors = $calledOnType->getCallableParametersAcceptors($scope);
 		$parametersAcceptor = ParametersAcceptorSelector::selectFromArgs(
 			$scope,
 			$passThruArgs,
-			$calledOnType->getCallableParametersAcceptors($scope),
+			$callableParametersAcceptors,
 			null,
 		);
 
+		$acceptsNamedArguments = true;
+		foreach ($callableParametersAcceptors as $callableParametersAcceptor) {
+			$acceptsNamedArguments = $acceptsNamedArguments && $callableParametersAcceptor->acceptsNamedArguments();
+		}
+
 		return [$parametersAcceptor, new FuncCall(
 			$callbackArg->value,
 			$passThruArgs,
 			$callUserFuncCall->getAttributes(),
-		)];
+		), $acceptsNamedArguments];
 	}
 
 	public static function reorderFuncArguments(

diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -1361,6 +1361,7 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
 						$cachedClosureData['impurePoints'],
 						$cachedClosureData['invalidateExpressions'],
 						$cachedClosureData['usedVariables'],
+						true,
 					);
 				}
 				if (self::$resolveClosureTypeDepth >= 2) {
@@ -1575,6 +1576,7 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
 				$impurePointsForClosureType,
 				$invalidateExpressions,
 				$usedVariables,
+				true,
 			);
 		} elseif ($node instanceof New_) {
 			if ($node->class instanceof Name) {
@@ -2523,9 +2525,11 @@ private function createFirstClassCallable(
 
 			$throwPoints = [];
 			$impurePoints = [];
+			$acceptsNamedArguments = true;
 			if ($variant instanceof CallableParametersAcceptor) {
 				$throwPoints = $variant->getThrowPoints();
 				$impurePoints = $variant->getImpurePoints();
+				$acceptsNamedArguments = $variant->acceptsNamedArguments();
 			} elseif ($function !== null) {
 				$returnTypeForThrow = $variant->getReturnType();
 				$throwType = $function->getThrowType();
@@ -2549,6 +2553,8 @@ private function createFirstClassCallable(
 				if ($impurePoint !== null) {
 					$impurePoints[] = $impurePoint;
 				}
+
+				$acceptsNamedArguments = $function->acceptsNamedArguments();
 			}
 
 			$parameters = $variant->getParameters();
@@ -2564,6 +2570,7 @@ private function createFirstClassCallable(
 				$impurePoints,
 				[],
 				[],
+				$acceptsNamedArguments,
 			);
 		}
 

diff --git a/src/PhpDoc/TypeNodeResolver.php b/src/PhpDoc/TypeNodeResolver.php
@@ -961,7 +961,7 @@ function (CallableTypeParameterNode $parameterNode) use ($nameScope, &$isVariadi
 				),
 			]);
 		} elseif ($mainType instanceof ClosureType) {
-			$closure = new ClosureType($parameters, $returnType, $isVariadic, $templateTypeMap, null, null, $templateTags, [], $mainType->getImpurePoints());
+			$closure = new ClosureType($parameters, $returnType, $isVariadic, $templateTypeMap, null, null, $templateTags, [], $mainType->getImpurePoints(), $mainType->getInvalidateExpressions(), $mainType->getUsedVariables(), $mainType->acceptsNamedArguments());
 			if ($closure->isPure()->yes() && $returnType->isVoid()->yes()) {
 				return new ErrorType();
 			}

diff --git a/src/Reflection/Annotations/AnnotationMethodReflection.php b/src/Reflection/Annotations/AnnotationMethodReflection.php
@@ -141,6 +141,11 @@ public function getAsserts(): Assertions
 		return Assertions::createEmpty();
 	}
 
+	public function acceptsNamedArguments(): bool
+	{
+		return $this->declaringClass->acceptsNamedArguments();
+	}
+
 	public function getSelfOutType(): ?Type
 	{
 		return null;

diff --git a/src/Reflection/BetterReflection/BetterReflectionProvider.php b/src/Reflection/BetterReflection/BetterReflectionProvider.php
@@ -280,6 +280,7 @@ private function getCustomFunction(string $functionName): PhpFunctionReflection
 		$isFinal = false;
 		$isPure = null;
 		$asserts = Assertions::createEmpty();
+		$acceptsNamedArguments = true;
 		$phpDocComment = null;
 		$phpDocParameterOutTags = [];
 		$phpDocParameterImmediatelyInvokedCallable = [];
@@ -305,6 +306,7 @@ private function getCustomFunction(string $functionName): PhpFunctionReflection
 			if ($resolvedPhpDoc->hasPhpDocString()) {
 				$phpDocComment = $resolvedPhpDoc->getPhpDocString();
 			}
+			$acceptsNamedArguments = $resolvedPhpDoc->acceptsNamedArguments();
 			$phpDocParameterOutTags = $resolvedPhpDoc->getParamOutTags();
 			$phpDocParameterImmediatelyInvokedCallable = $resolvedPhpDoc->getParamsImmediatelyInvokedCallable();
 			$phpDocParameterClosureThisTypeTags = $resolvedPhpDoc->getParamClosureThisTags();
@@ -323,6 +325,7 @@ private function getCustomFunction(string $functionName): PhpFunctionReflection
 			$reflectionFunction->getFileName() !== false ? $reflectionFunction->getFileName() : null,
 			$isPure,
 			$asserts,
+			$acceptsNamedArguments,
 			$phpDocComment,
 			array_map(static fn (ParamOutTag $paramOutTag): Type => $paramOutTag->getType(), $phpDocParameterOutTags),
 			$phpDocParameterImmediatelyInvokedCallable,

diff --git a/src/Reflection/CallableFunctionVariantWithPhpDocs.php b/src/Reflection/CallableFunctionVariantWithPhpDocs.php
@@ -35,6 +35,7 @@ public function __construct(
 		private array $impurePoints,
 		private array $invalidateExpressions,
 		private array $usedVariables,
+		private bool $acceptsNamedArguments,
 	)
 	{
 		parent::__construct(
@@ -74,4 +75,9 @@ public function getUsedVariables(): array
 		return $this->usedVariables;
 	}
 
+	public function acceptsNamedArguments(): bool
+	{
+		return $this->acceptsNamedArguments;
+	}
+
 }
diff --git a/src/Reflection/Callables/CallableParametersAcceptor.php b/src/Reflection/Callables/CallableParametersAcceptor.php
@@ -19,6 +19,8 @@ public function getThrowPoints(): array;
 
 	public function isPure(): TrinaryLogic;
 
+	public function acceptsNamedArguments(): bool;
+
 	/**
 	 * @return SimpleImpurePoint[]
 	 */

diff --git a/src/Reflection/Callables/FunctionCallableVariant.php b/src/Reflection/Callables/FunctionCallableVariant.php
@@ -163,4 +163,9 @@ public function getUsedVariables(): array
 		return [];
 	}
 
+	public function acceptsNamedArguments(): bool
+	{
+		return $this->function->acceptsNamedArguments();
+	}
+
 }
diff --git a/src/Reflection/Dummy/ChangedTypeMethodReflection.php b/src/Reflection/Dummy/ChangedTypeMethodReflection.php
@@ -107,6 +107,11 @@ public function getAsserts(): Assertions
 		return $this->reflection->getAsserts();
 	}
 
+	public function acceptsNamedArguments(): bool
+	{
+		return $this->reflection->acceptsNamedArguments();
+	}
+
 	public function getSelfOutType(): ?Type
 	{
 		return $this->reflection->getSelfOutType();

diff --git a/src/Reflection/Dummy/DummyConstructorReflection.php b/src/Reflection/Dummy/DummyConstructorReflection.php
@@ -111,6 +111,11 @@ public function getAsserts(): Assertions
 		return Assertions::createEmpty();
 	}
 
+	public function acceptsNamedArguments(): bool
+	{
+		return $this->declaringClass->acceptsNamedArguments();
+	}
+
 	public function getSelfOutType(): ?Type
 	{
 		return null;

diff --git a/src/Reflection/Dummy/DummyMethodReflection.php b/src/Reflection/Dummy/DummyMethodReflection.php
@@ -108,6 +108,11 @@ public function getAsserts(): Assertions
 		return Assertions::createEmpty();
 	}
 
+	public function acceptsNamedArguments(): bool
+	{
+		return true;
+	}
+
 	public function getSelfOutType(): ?Type
 	{
 		return null;

diff --git a/src/Reflection/ExtendedMethodReflection.php b/src/Reflection/ExtendedMethodReflection.php
@@ -32,6 +32,8 @@ public function getVariants(): array;
 	 */
 	public function getNamedArgumentsVariants(): ?array;
 
+	public function acceptsNamedArguments(): bool;
+
 	public function getAsserts(): Assertions;
 
 	public function getSelfOutType(): ?Type;

diff --git a/src/Reflection/FunctionReflection.php b/src/Reflection/FunctionReflection.php
@@ -23,6 +23,8 @@ public function getVariants(): array;
 	 */
 	public function getNamedArgumentsVariants(): ?array;
 
+	public function acceptsNamedArguments(): bool;
+
 	public function isDeprecated(): TrinaryLogic;
 
 	public function getDeprecatedDescription(): ?string;

diff --git a/src/Reflection/FunctionReflectionFactory.php b/src/Reflection/FunctionReflectionFactory.php
@@ -29,6 +29,7 @@ public function create(
 		?string $filename,
 		?bool $isPure,
 		Assertions $asserts,
+		bool $acceptsNamedArguments,
 		?string $phpDocComment,
 		array $phpDocParameterOutTypes,
 		array $phpDocParameterImmediatelyInvokedCallable,

diff --git a/src/Reflection/GenericParametersAcceptorResolver.php b/src/Reflection/GenericParametersAcceptorResolver.php
@@ -126,6 +126,7 @@ public static function resolve(array $argTypes, ParametersAcceptor $parametersAc
 				$originalParametersAcceptor->getImpurePoints(),
 				$originalParametersAcceptor->getInvalidateExpressions(),
 				$originalParametersAcceptor->getUsedVariables(),
+				$originalParametersAcceptor->acceptsNamedArguments(),
 			);
 		}
 

diff --git a/src/Reflection/InaccessibleMethod.php b/src/Reflection/InaccessibleMethod.php
@@ -13,11 +13,11 @@
 final class InaccessibleMethod implements CallableParametersAcceptor
 {
 
-	public function __construct(private MethodReflection $methodReflection)
+	public function __construct(private ExtendedMethodReflection $methodReflection)
 	{
 	}
 
-	public function getMethod(): MethodReflection
+	public function getMethod(): ExtendedMethodReflection
 	{
 		return $this->methodReflection;
 	}
@@ -86,4 +86,9 @@ public function getUsedVariables(): array
 		return [];
 	}
 
+	public function acceptsNamedArguments(): bool
+	{
+		return $this->methodReflection->acceptsNamedArguments();
+	}
+
 }
diff --git a/src/Reflection/Native/NativeFunctionReflection.php b/src/Reflection/Native/NativeFunctionReflection.php
@@ -29,6 +29,7 @@ public function __construct(
 		?Assertions $assertions = null,
 		private ?string $phpDocComment = null,
 		?TrinaryLogic $returnsByReference = null,
+		private bool $acceptsNamedArguments = true,
 	)
 	{
 		$this->assertions = $assertions ?? Assertions::createEmpty();
@@ -132,4 +133,9 @@ public function returnsByReference(): TrinaryLogic
 		return $this->returnsByReference;
 	}
 
+	public function acceptsNamedArguments(): bool
+	{
+		return $this->acceptsNamedArguments;
+	}
+
 }
diff --git a/src/Reflection/Native/NativeMethodReflection.php b/src/Reflection/Native/NativeMethodReflection.php
@@ -32,6 +32,7 @@ public function __construct(
 		private TrinaryLogic $hasSideEffects,
 		private ?Type $throwType,
 		private Assertions $assertions,
+		private bool $acceptsNamedArguments,
 		private ?Type $selfOutType,
 		private ?string $phpDocComment,
 	)
@@ -187,6 +188,11 @@ public function getAsserts(): Assertions
 		return $this->assertions;
 	}
 
+	public function acceptsNamedArguments(): bool
+	{
+		return $this->declaringClass->acceptsNamedArguments() && $this->acceptsNamedArguments;
+	}
+
 	public function getSelfOutType(): ?Type
 	{
 		return $this->selfOutType;

diff --git a/src/Reflection/ParametersAcceptorSelector.php b/src/Reflection/ParametersAcceptorSelector.php
@@ -606,6 +606,7 @@ public static function combineAcceptors(array $acceptors): ParametersAcceptorWit
 		$impurePoints = [];
 		$invalidateExpressions = [];
 		$usedVariables = [];
+		$acceptsNamedArguments = false;
 
 		foreach ($acceptors as $acceptor) {
 			$returnTypes[] = $acceptor->getReturnType();
@@ -621,6 +622,7 @@ public static function combineAcceptors(array $acceptors): ParametersAcceptorWit
 				$impurePoints = array_merge($impurePoints, $acceptor->getImpurePoints());
 				$invalidateExpressions = array_merge($invalidateExpressions, $acceptor->getInvalidateExpressions());
 				$usedVariables = array_merge($usedVariables, $acceptor->getUsedVariables());
+				$acceptsNamedArguments = $acceptsNamedArguments || $acceptor->acceptsNamedArguments();
 			}
 			$isVariadic = $isVariadic || $acceptor->isVariadic();
 
@@ -722,6 +724,7 @@ public static function combineAcceptors(array $acceptors): ParametersAcceptorWit
 				$impurePoints,
 				$invalidateExpressions,
 				$usedVariables,
+				$acceptsNamedArguments,
 			);
 		}
 
@@ -757,6 +760,7 @@ private static function wrapAcceptor(ParametersAcceptor $acceptor): ParametersAc
 				$acceptor->getImpurePoints(),
 				$acceptor->getInvalidateExpressions(),
 				$acceptor->getUsedVariables(),
+				$acceptor->acceptsNamedArguments(),
 			);
 		}
 

diff --git a/src/Reflection/Php/ClosureCallMethodReflection.php b/src/Reflection/Php/ClosureCallMethodReflection.php
@@ -150,6 +150,11 @@ public function getAsserts(): Assertions
 		return $this->nativeMethodReflection->getAsserts();
 	}
 
+	public function acceptsNamedArguments(): bool
+	{
+		return $this->nativeMethodReflection->acceptsNamedArguments();
+	}
+
 	public function getSelfOutType(): ?Type
 	{
 		return $this->nativeMethodReflection->getSelfOutType();

diff --git a/src/Reflection/Php/EnumCasesMethodReflection.php b/src/Reflection/Php/EnumCasesMethodReflection.php
@@ -120,6 +120,11 @@ public function getAsserts(): Assertions
 		return Assertions::createEmpty();
 	}
 
+	public function acceptsNamedArguments(): bool
+	{
+		return $this->declaringClass->acceptsNamedArguments();
+	}
+
 	public function getSelfOutType(): ?Type
 	{
 		return null;

diff --git a/src/Reflection/Php/PhpClassReflectionExtension.php b/src/Reflection/Php/PhpClassReflectionExtension.php
@@ -477,6 +477,7 @@ private function createMethod(
 			$reflectionMethod = null;
 			$throwType = null;
 			$asserts = Assertions::createEmpty();
+			$acceptsNamedArguments = true;
 			$selfOutType = null;
 			$phpDocComment = null;
 			if ($classReflection->getNativeReflection()->hasMethod($methodReflection->getName())) {
@@ -539,6 +540,7 @@ private function createMethod(
 							}
 
 							$asserts = Assertions::createFromResolvedPhpDocBlock($stubPhpDoc);
+							$acceptsNamedArguments = $stubPhpDoc->acceptsNamedArguments();
 
 							$selfOutTypeTag = $stubPhpDoc->getSelfOutTag();
 							if ($selfOutTypeTag !== null) {
@@ -583,6 +585,7 @@ private function createMethod(
 								$phpDocParameterTypes[$name] = $paramTag->getType();
 							}
 							$asserts = Assertions::createFromResolvedPhpDocBlock($phpDocBlock);
+							$acceptsNamedArguments = $phpDocBlock->acceptsNamedArguments();
 
 							$selfOutTypeTag = $phpDocBlock->getSelfOutTag();
 							if ($selfOutTypeTag !== null) {
@@ -625,6 +628,7 @@ private function createMethod(
 				$hasSideEffects,
 				$throwType,
 				$asserts,
+				$acceptsNamedArguments,
 				$selfOutType,
 				$phpDocComment,
 			);
@@ -773,6 +777,7 @@ public function createUserlandMethodReflection(ClassReflection $fileDeclaringCla
 		$isFinal = $resolvedPhpDoc->isFinal();
 		$isPure = $resolvedPhpDoc->isPure();
 		$asserts = Assertions::createFromResolvedPhpDocBlock($resolvedPhpDoc);
+		$acceptsNamedArguments = $resolvedPhpDoc->acceptsNamedArguments();
 		$selfOutType = $resolvedPhpDoc->getSelfOutTag() !== null ? $resolvedPhpDoc->getSelfOutTag()->getType() : null;
 		$phpDocComment = null;
 		if ($resolvedPhpDoc->hasPhpDocString()) {
@@ -793,6 +798,7 @@ public function createUserlandMethodReflection(ClassReflection $fileDeclaringCla
 			$isFinal,
 			$isPure,
 			$asserts,
+			$acceptsNamedArguments,
 			$selfOutType,
 			$phpDocComment,
 			$phpDocParameterOutTypes,