[BCB] acceptsNamedArguments() returns TrinaryLogic instead of bool

ondrejmirtes · ondrejmirtes · commit 1b45eaee2dc3 · 2024-09-30T10:03:51.000+02:00
diff --git a/UPGRADING.md b/UPGRADING.md
@@ -276,3 +276,4 @@ Instead of `PHPStanTestCase::createBroker()`, call `PHPStanTestCase::createRefle
 * Parameter `$isList` in `ConstantArrayType` constructor can only be `TrinaryLogic`, no longer bool
 * Parameter `$nextAutoIndexes` in `ConstantArrayType` constructor can only be `non-empty-list<int>`, no longer int
 * Remove `ConstantType` interface, use [`Type::isConstantValue()`](https://apiref.phpstan.org/2.0.x/PHPStan.Type.Type.html#_isConstantValue) instead
+* `acceptsNamedArguments()` in `FunctionReflection`, `ExtendedMethodReflection` and `CallableParametersAcceptor` interfaces returns `TrinaryLogic` instead of `bool`
diff --git a/src/Analyser/ArgumentsNormalizer.php b/src/Analyser/ArgumentsNormalizer.php
@@ -11,6 +11,7 @@
 use PHPStan\Reflection\ParametersAcceptor;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\ShouldNotHappenException;
+use PHPStan\TrinaryLogic;
 use PHPStan\Type\Constant\ConstantArrayType;
 use function array_key_exists;
 use function array_keys;
@@ -27,7 +28,7 @@ final class ArgumentsNormalizer
 	public const ORIGINAL_ARG_ATTRIBUTE = 'originalArg';
 
 	/**
-	 * @return array{ParametersAcceptor, FuncCall, bool}|null
+	 * @return array{ParametersAcceptor, FuncCall, TrinaryLogic}|null
 	 */
 	public static function reorderCallUserFuncArguments(
 		FuncCall $callUserFuncCall,
@@ -73,9 +74,9 @@ public static function reorderCallUserFuncArguments(
 			null,
 		);
 
-		$acceptsNamedArguments = true;
+		$acceptsNamedArguments = TrinaryLogic::createYes();
 		foreach ($callableParametersAcceptors as $callableParametersAcceptor) {
-			$acceptsNamedArguments = $acceptsNamedArguments && $callableParametersAcceptor->acceptsNamedArguments();
+			$acceptsNamedArguments = $acceptsNamedArguments->and($callableParametersAcceptor->acceptsNamedArguments());
 		}
 
 		return [$parametersAcceptor, new FuncCall(
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -1357,7 +1357,7 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
 						$cachedClosureData['impurePoints'],
 						$cachedClosureData['invalidateExpressions'],
 						$cachedClosureData['usedVariables'],
-						true,
+						TrinaryLogic::createYes(),
 					);
 				}
 				if (self::$resolveClosureTypeDepth >= 2) {
@@ -1572,7 +1572,7 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
 				$impurePointsForClosureType,
 				$invalidateExpressions,
 				$usedVariables,
-				true,
+				TrinaryLogic::createYes(),
 			);
 		} elseif ($node instanceof New_) {
 			if ($node->class instanceof Name) {
@@ -2521,7 +2521,7 @@ private function createFirstClassCallable(
 
 			$throwPoints = [];
 			$impurePoints = [];
-			$acceptsNamedArguments = true;
+			$acceptsNamedArguments = TrinaryLogic::createYes();
 			if ($variant instanceof CallableParametersAcceptor) {
 				$throwPoints = $variant->getThrowPoints();
 				$impurePoints = $variant->getImpurePoints();
@@ -3151,7 +3151,7 @@ private function enterFunctionLike(
 
 			$paramExprString = '$' . $parameter->getName();
 			if ($parameter->isVariadic()) {
-				if ($this->phpVersion->supportsNamedArguments() && $functionReflection->acceptsNamedArguments()) {
+				if ($this->phpVersion->supportsNamedArguments() && $functionReflection->acceptsNamedArguments()->yes()) {
 					$parameterType = new ArrayType(new UnionType([new IntegerType(), new StringType()]), $parameterType);
 				} else {
 					$parameterType = TypeCombinator::intersect(new ArrayType(new IntegerType(), $parameterType), new AccessoryArrayListType());
@@ -3166,7 +3166,7 @@ private function enterFunctionLike(
 
 			$nativeParameterType = $parameter->getNativeType();
 			if ($parameter->isVariadic()) {
-				if ($this->phpVersion->supportsNamedArguments() && $functionReflection->acceptsNamedArguments()) {
+				if ($this->phpVersion->supportsNamedArguments() && $functionReflection->acceptsNamedArguments()->yes()) {
 					$nativeParameterType = new ArrayType(new UnionType([new IntegerType(), new StringType()]), $nativeParameterType);
 				} else {
 					$nativeParameterType = TypeCombinator::intersect(new ArrayType(new IntegerType(), $nativeParameterType), new AccessoryArrayListType());
diff --git a/src/Reflection/Annotations/AnnotationMethodReflection.php b/src/Reflection/Annotations/AnnotationMethodReflection.php
@@ -147,9 +147,9 @@ public function getAsserts(): Assertions
 		return Assertions::createEmpty();
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
-		return $this->declaringClass->acceptsNamedArguments();
+		return TrinaryLogic::createFromBoolean($this->declaringClass->acceptsNamedArguments());
 	}
 
 	public function getSelfOutType(): ?Type
diff --git a/src/Reflection/CallableFunctionVariantWithPhpDocs.php b/src/Reflection/CallableFunctionVariantWithPhpDocs.php
@@ -35,7 +35,7 @@ public function __construct(
 		private array $impurePoints,
 		private array $invalidateExpressions,
 		private array $usedVariables,
-		private bool $acceptsNamedArguments,
+		private TrinaryLogic $acceptsNamedArguments,
 	)
 	{
 		parent::__construct(
@@ -75,7 +75,7 @@ public function getUsedVariables(): array
 		return $this->usedVariables;
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
 		return $this->acceptsNamedArguments;
 	}
diff --git a/src/Reflection/Callables/CallableParametersAcceptor.php b/src/Reflection/Callables/CallableParametersAcceptor.php
@@ -19,7 +19,7 @@ public function getThrowPoints(): array;
 
 	public function isPure(): TrinaryLogic;
 
-	public function acceptsNamedArguments(): bool;
+	public function acceptsNamedArguments(): TrinaryLogic;
 
 	/**
 	 * @return SimpleImpurePoint[]
diff --git a/src/Reflection/Callables/FunctionCallableVariant.php b/src/Reflection/Callables/FunctionCallableVariant.php
@@ -163,7 +163,7 @@ public function getUsedVariables(): array
 		return [];
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
 		return $this->function->acceptsNamedArguments();
 	}
diff --git a/src/Reflection/Dummy/ChangedTypeMethodReflection.php b/src/Reflection/Dummy/ChangedTypeMethodReflection.php
@@ -119,7 +119,7 @@ public function getAsserts(): Assertions
 		return $this->reflection->getAsserts();
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
 		return $this->reflection->acceptsNamedArguments();
 	}
diff --git a/src/Reflection/Dummy/DummyConstructorReflection.php b/src/Reflection/Dummy/DummyConstructorReflection.php
@@ -117,9 +117,9 @@ public function getAsserts(): Assertions
 		return Assertions::createEmpty();
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
-		return $this->declaringClass->acceptsNamedArguments();
+		return TrinaryLogic::createFromBoolean($this->declaringClass->acceptsNamedArguments());
 	}
 
 	public function getSelfOutType(): ?Type
diff --git a/src/Reflection/Dummy/DummyMethodReflection.php b/src/Reflection/Dummy/DummyMethodReflection.php
@@ -114,9 +114,9 @@ public function getAsserts(): Assertions
 		return Assertions::createEmpty();
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
-		return true;
+		return TrinaryLogic::createYes();
 	}
 
 	public function getSelfOutType(): ?Type
diff --git a/src/Reflection/ExtendedMethodReflection.php b/src/Reflection/ExtendedMethodReflection.php
@@ -37,7 +37,7 @@ public function getOnlyVariant(): ParametersAcceptorWithPhpDocs;
 	 */
 	public function getNamedArgumentsVariants(): ?array;
 
-	public function acceptsNamedArguments(): bool;
+	public function acceptsNamedArguments(): TrinaryLogic;
 
 	public function getAsserts(): Assertions;
 
diff --git a/src/Reflection/FunctionReflection.php b/src/Reflection/FunctionReflection.php
@@ -28,7 +28,7 @@ public function getOnlyVariant(): ParametersAcceptorWithPhpDocs;
 	 */
 	public function getNamedArgumentsVariants(): ?array;
 
-	public function acceptsNamedArguments(): bool;
+	public function acceptsNamedArguments(): TrinaryLogic;
 
 	public function isDeprecated(): TrinaryLogic;
 
diff --git a/src/Reflection/InaccessibleMethod.php b/src/Reflection/InaccessibleMethod.php
@@ -86,7 +86,7 @@ public function getUsedVariables(): array
 		return [];
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
 		return $this->methodReflection->acceptsNamedArguments();
 	}
diff --git a/src/Reflection/Native/NativeFunctionReflection.php b/src/Reflection/Native/NativeFunctionReflection.php
@@ -142,9 +142,9 @@ public function returnsByReference(): TrinaryLogic
 		return $this->returnsByReference;
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
-		return $this->acceptsNamedArguments;
+		return TrinaryLogic::createFromBoolean($this->acceptsNamedArguments);
 	}
 
 }
diff --git a/src/Reflection/Native/NativeMethodReflection.php b/src/Reflection/Native/NativeMethodReflection.php
@@ -200,9 +200,9 @@ public function getAsserts(): Assertions
 		return $this->assertions;
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
-		return $this->declaringClass->acceptsNamedArguments() && $this->acceptsNamedArguments;
+		return TrinaryLogic::createFromBoolean($this->declaringClass->acceptsNamedArguments() && $this->acceptsNamedArguments);
 	}
 
 	public function getSelfOutType(): ?Type
diff --git a/src/Reflection/ParametersAcceptorSelector.php b/src/Reflection/ParametersAcceptorSelector.php
@@ -581,7 +581,7 @@ public static function combineAcceptors(array $acceptors): ParametersAcceptorWit
 		$impurePoints = [];
 		$invalidateExpressions = [];
 		$usedVariables = [];
-		$acceptsNamedArguments = false;
+		$acceptsNamedArguments = TrinaryLogic::createNo();
 
 		foreach ($acceptors as $acceptor) {
 			$returnTypes[] = $acceptor->getReturnType();
@@ -597,7 +597,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();
+				$acceptsNamedArguments = $acceptsNamedArguments->or($acceptor->acceptsNamedArguments());
 			}
 			$isVariadic = $isVariadic || $acceptor->isVariadic();
 
diff --git a/src/Reflection/Php/ClosureCallMethodReflection.php b/src/Reflection/Php/ClosureCallMethodReflection.php
@@ -156,7 +156,7 @@ public function getAsserts(): Assertions
 		return $this->nativeMethodReflection->getAsserts();
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
 		return $this->nativeMethodReflection->acceptsNamedArguments();
 	}
diff --git a/src/Reflection/Php/EnumCasesMethodReflection.php b/src/Reflection/Php/EnumCasesMethodReflection.php
@@ -126,9 +126,9 @@ public function getAsserts(): Assertions
 		return Assertions::createEmpty();
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
-		return $this->declaringClass->acceptsNamedArguments();
+		return TrinaryLogic::createFromBoolean($this->declaringClass->acceptsNamedArguments());
 	}
 
 	public function getSelfOutType(): ?Type
diff --git a/src/Reflection/Php/ExitFunctionReflection.php b/src/Reflection/Php/ExitFunctionReflection.php
@@ -82,9 +82,9 @@ public function getNamedArgumentsVariants(): array
 		return $this->getVariants();
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
-		return true;
+		return TrinaryLogic::createYes();
 	}
 
 	public function isDeprecated(): TrinaryLogic
diff --git a/src/Reflection/Php/PhpFunctionFromParserNodeReflection.php b/src/Reflection/Php/PhpFunctionFromParserNodeReflection.php
@@ -280,9 +280,9 @@ public function isGenerator(): bool
 		return $this->nodeIsOrContainsYield($this->functionLike);
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
-		return $this->acceptsNamedArguments;
+		return TrinaryLogic::createFromBoolean($this->acceptsNamedArguments);
 	}
 
 	private function nodeIsOrContainsYield(Node $node): bool
diff --git a/src/Reflection/Php/PhpFunctionReflection.php b/src/Reflection/Php/PhpFunctionReflection.php
@@ -300,9 +300,9 @@ public function returnsByReference(): TrinaryLogic
 		return TrinaryLogic::createFromBoolean($this->reflection->returnsReference());
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
-		return $this->acceptsNamedArguments;
+		return TrinaryLogic::createFromBoolean($this->acceptsNamedArguments);
 	}
 
 	private function isFunctionNodeVariadic(Function_ $node): bool
diff --git a/src/Reflection/Php/PhpMethodReflection.php b/src/Reflection/Php/PhpMethodReflection.php
@@ -462,9 +462,11 @@ public function getAsserts(): Assertions
 		return $this->asserts;
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
-		return $this->declaringClass->acceptsNamedArguments() && $this->acceptsNamedArguments;
+		return TrinaryLogic::createFromBoolean(
+			$this->declaringClass->acceptsNamedArguments() && $this->acceptsNamedArguments,
+		);
 	}
 
 	public function getSelfOutType(): ?Type
diff --git a/src/Reflection/ResolvedFunctionVariantWithCallable.php b/src/Reflection/ResolvedFunctionVariantWithCallable.php
@@ -27,7 +27,7 @@ public function __construct(
 		private array $impurePoints,
 		private array $invalidateExpressions,
 		private array $usedVariables,
-		private bool $acceptsNamedArguments,
+		private TrinaryLogic $acceptsNamedArguments,
 	)
 	{
 	}
@@ -112,7 +112,7 @@ public function getUsedVariables(): array
 		return $this->usedVariables;
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
 		return $this->acceptsNamedArguments;
 	}
diff --git a/src/Reflection/ResolvedMethodReflection.php b/src/Reflection/ResolvedMethodReflection.php
@@ -175,7 +175,7 @@ public function getAsserts(): Assertions
 		));
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
 		return $this->reflection->acceptsNamedArguments();
 	}
diff --git a/src/Reflection/TrivialParametersAcceptor.php b/src/Reflection/TrivialParametersAcceptor.php
@@ -93,9 +93,9 @@ public function getUsedVariables(): array
 		return [];
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
-		return true;
+		return TrinaryLogic::createYes();
 	}
 
 }
diff --git a/src/Reflection/Type/IntersectionTypeMethodReflection.php b/src/Reflection/Type/IntersectionTypeMethodReflection.php
@@ -198,14 +198,9 @@ public function getAsserts(): Assertions
 		return $assertions;
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
-		$accepts = true;
-		foreach ($this->methods as $method) {
-			$accepts = $accepts && $method->acceptsNamedArguments();
-		}
-
-		return $accepts;
+		return TrinaryLogic::lazyMaxMin($this->methods, static fn (MethodReflection $method): TrinaryLogic => $method->acceptsNamedArguments());
 	}
 
 	public function getSelfOutType(): ?Type
diff --git a/src/Reflection/Type/UnionTypeMethodReflection.php b/src/Reflection/Type/UnionTypeMethodReflection.php
@@ -175,14 +175,9 @@ public function getAsserts(): Assertions
 		return Assertions::createEmpty();
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
-		$accepts = true;
-		foreach ($this->methods as $method) {
-			$accepts = $accepts && $method->acceptsNamedArguments();
-		}
-
-		return $accepts;
+		return TrinaryLogic::lazyExtremeIdentity($this->methods, static fn (ExtendedMethodReflection $method): TrinaryLogic => $method->acceptsNamedArguments());
 	}
 
 	public function getSelfOutType(): ?Type
diff --git a/src/Reflection/WrappedExtendedMethodReflection.php b/src/Reflection/WrappedExtendedMethodReflection.php
@@ -142,9 +142,9 @@ public function getAsserts(): Assertions
 		return Assertions::createEmpty();
 	}
 
-	public function acceptsNamedArguments(): bool
+	public function acceptsNamedArguments(): TrinaryLogic
 	{
-		return $this->getDeclaringClass()->acceptsNamedArguments();
+		return TrinaryLogic::createFromBoolean($this->getDeclaringClass()->acceptsNamedArguments());
 	}
 
 	public function getSelfOutType(): ?Type
diff --git a/src/Rules/FunctionCallParametersCheck.php b/src/Rules/FunctionCallParametersCheck.php
diff --git a/src/Rules/Functions/CallCallablesRule.php b/src/Rules/Functions/CallCallablesRule.php
diff --git a/src/Type/CallableType.php b/src/Type/CallableType.php
diff --git a/src/Type/ClosureType.php b/src/Type/ClosureType.php

Original file line number	Diff line number	Diff line change
`@@ -147,9 +147,9 @@ public function getAsserts(): Assertions`
`147`	`147`	`return Assertions::createEmpty();`
`148`	`148`	`}`
`149`	`149`
`150`		`- public function acceptsNamedArguments(): bool`
	`150`	`+ public function acceptsNamedArguments(): TrinaryLogic`
`151`	`151`	`{`
`152`		`- return $this->declaringClass->acceptsNamedArguments();`
	`152`	`+ return TrinaryLogic::createFromBoolean($this->declaringClass->acceptsNamedArguments());`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`public function getSelfOutType(): ?Type`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function __construct(`
`35`	`35`	`private array $impurePoints,`
`36`	`36`	`private array $invalidateExpressions,`
`37`	`37`	`private array $usedVariables,`
`38`		`- private bool $acceptsNamedArguments,`
	`38`	`+ private TrinaryLogic $acceptsNamedArguments,`
`39`	`39`	`)`
`40`	`40`	`{`
`41`	`41`	`parent::__construct(`
`@@ -75,7 +75,7 @@ public function getUsedVariables(): array`
`75`	`75`	`return $this->usedVariables;`
`76`	`76`	`}`
`77`	`77`
`78`		`- public function acceptsNamedArguments(): bool`
	`78`	`+ public function acceptsNamedArguments(): TrinaryLogic`
`79`	`79`	`{`
`80`	`80`	`return $this->acceptsNamedArguments;`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ public function getUsedVariables(): array`
`163`	`163`	`return [];`
`164`	`164`	`}`
`165`	`165`
`166`		`- public function acceptsNamedArguments(): bool`
	`166`	`+ public function acceptsNamedArguments(): TrinaryLogic`
`167`	`167`	`{`
`168`	`168`	`return $this->function->acceptsNamedArguments();`
`169`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public function getAsserts(): Assertions`
`119`	`119`	`return $this->reflection->getAsserts();`
`120`	`120`	`}`
`121`	`121`
`122`		`- public function acceptsNamedArguments(): bool`
	`122`	`+ public function acceptsNamedArguments(): TrinaryLogic`
`123`	`123`	`{`
`124`	`124`	`return $this->reflection->acceptsNamedArguments();`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,9 +117,9 @@ public function getAsserts(): Assertions`
`117`	`117`	`return Assertions::createEmpty();`
`118`	`118`	`}`
`119`	`119`
`120`		`- public function acceptsNamedArguments(): bool`
	`120`	`+ public function acceptsNamedArguments(): TrinaryLogic`
`121`	`121`	`{`
`122`		`- return $this->declaringClass->acceptsNamedArguments();`
	`122`	`+ return TrinaryLogic::createFromBoolean($this->declaringClass->acceptsNamedArguments());`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`public function getSelfOutType(): ?Type`
Original file line number	Diff line number	Diff line change
`@@ -114,9 +114,9 @@ public function getAsserts(): Assertions`
`114`	`114`	`return Assertions::createEmpty();`
`115`	`115`	`}`
`116`	`116`
`117`		`- public function acceptsNamedArguments(): bool`
	`117`	`+ public function acceptsNamedArguments(): TrinaryLogic`
`118`	`118`	`{`
`119`		`- return true;`
	`119`	`+ return TrinaryLogic::createYes();`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`public function getSelfOutType(): ?Type`