use TrinaryLogic over bool

phpstan · Jan 19, 2025 · 61d8f3b · 61d8f3b
1 parent 507727d
commit 61d8f3b
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 18 deletions.
diff --git a/src/Type/Accessory/AccessoryArrayListType.php b/src/Type/Accessory/AccessoryArrayListType.php
@@ -172,7 +172,7 @@ public function unsetOffset(Type $offsetType): Type
 		return new ErrorType();
 	}
 
-	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	public function getKeysArrayFiltered(Type $filterValueType, TrinaryLogic $strict): Type
 	{
 		return $this->getKeysArray();
 	}

diff --git a/src/Type/Accessory/HasOffsetType.php b/src/Type/Accessory/HasOffsetType.php
@@ -343,7 +343,7 @@ public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 		return new BooleanType();
 	}
 
-	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	public function getKeysArrayFiltered(Type $filterValueType, TrinaryLogic $strict): Type
 	{
 		return $this->getKeysArray();
 	}

diff --git a/src/Type/Accessory/HasOffsetValueType.php b/src/Type/Accessory/HasOffsetValueType.php
@@ -195,7 +195,7 @@ public function unsetOffset(Type $offsetType): Type
 		return $this;
 	}
 
-	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	public function getKeysArrayFiltered(Type $filterValueType, TrinaryLogic $strict): Type
 	{
 		return $this->getKeysArray();
 	}

diff --git a/src/Type/Accessory/NonEmptyArrayType.php b/src/Type/Accessory/NonEmptyArrayType.php
@@ -159,7 +159,7 @@ public function unsetOffset(Type $offsetType): Type
 		return new ErrorType();
 	}
 
-	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	public function getKeysArrayFiltered(Type $filterValueType, TrinaryLogic $strict): Type
 	{
 		return $this->getKeysArray();
 	}

diff --git a/src/Type/Accessory/OversizedArrayType.php b/src/Type/Accessory/OversizedArrayType.php
@@ -154,7 +154,7 @@ public function unsetOffset(Type $offsetType): Type
 		return new ErrorType();
 	}
 
-	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	public function getKeysArrayFiltered(Type $filterValueType, TrinaryLogic $strict): Type
 	{
 		return $this->getKeysArray();
 	}

diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -170,7 +170,7 @@ public function generalizeValues(): self
 		return new self($this->keyType, $this->itemType->generalize(GeneralizePrecision::lessSpecific()));
 	}
 
-	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	public function getKeysArrayFiltered(Type $filterValueType, TrinaryLogic $strict): Type
 	{
 		return $this->getKeysArray();
 	}

diff --git a/src/Type/Constant/ConstantArrayType.php b/src/Type/Constant/ConstantArrayType.php
@@ -1251,7 +1251,7 @@ public function generalizeValues(): self
 		return new self($this->keyTypes, $valueTypes, $this->nextAutoIndexes, $this->optionalKeys, $this->isList);
 	}
 
-	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	public function getKeysArrayFiltered(Type $filterValueType, TrinaryLogic $strict): Type
 	{
 		$keysArray = $this->getKeysOrValuesArray($this->keyTypes);
 

diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
@@ -799,7 +799,7 @@ public function unsetOffset(Type $offsetType): Type
 		return $this->intersectTypes(static fn (Type $type): Type => $type->unsetOffset($offsetType));
 	}
 
-	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	public function getKeysArrayFiltered(Type $filterValueType, TrinaryLogic $strict): Type
 	{
 		return $this->intersectTypes(static fn (Type $type): Type => $type->getKeysArrayFiltered($filterValueType, $strict));
 	}

diff --git a/src/Type/MixedType.php b/src/Type/MixedType.php
@@ -179,7 +179,7 @@ public function unsetOffset(Type $offsetType): Type
 		return $this;
 	}
 
-	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	public function getKeysArrayFiltered(Type $filterValueType, TrinaryLogic $strict): Type
 	{
 		return $this->getKeysArray();
 	}

diff --git a/src/Type/NeverType.php b/src/Type/NeverType.php
@@ -273,7 +273,7 @@ public function unsetOffset(Type $offsetType): Type
 		return new NeverType();
 	}
 
-	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	public function getKeysArrayFiltered(Type $filterValueType, TrinaryLogic $strict): Type
 	{
 		return $this->getKeysArray();
 	}

diff --git a/src/Type/Php/ArrayKeysFunctionDynamicReturnTypeExtension.php b/src/Type/Php/ArrayKeysFunctionDynamicReturnTypeExtension.php
@@ -6,6 +6,7 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\FunctionReflection;
+use PHPStan\TrinaryLogic;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\NullType;
@@ -39,9 +40,9 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		if (count($functionCall->getArgs()) >= 2) {
 			$filterType = $scope->getType($functionCall->getArgs()[1]->value);
 
-			$strict = false;
+			$strict = TrinaryLogic::createNo();
 			if (count($functionCall->getArgs()) >= 3) {
-				$strict = $scope->getType($functionCall->getArgs()[2]->value)->isTrue()->yes();
+				$strict = $scope->getType($functionCall->getArgs()[2]->value)->isTrue();
 			}
 
 			return $arrayType->getKeysArrayFiltered($filterType, $strict);

diff --git a/src/Type/StaticType.php b/src/Type/StaticType.php
@@ -396,7 +396,7 @@ public function unsetOffset(Type $offsetType): Type
 		return $this->getStaticObjectType()->unsetOffset($offsetType);
 	}
 
-	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	public function getKeysArrayFiltered(Type $filterValueType, TrinaryLogic $strict): Type
 	{
 		return $this->getStaticObjectType()->getKeysArrayFiltered($filterValueType, $strict);
 	}

diff --git a/src/Type/Traits/LateResolvableTypeTrait.php b/src/Type/Traits/LateResolvableTypeTrait.php
@@ -248,7 +248,7 @@ public function unsetOffset(Type $offsetType): Type
 		return $this->resolve()->unsetOffset($offsetType);
 	}
 
-	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	public function getKeysArrayFiltered(Type $filterValueType, TrinaryLogic $strict): Type
 	{
 		return $this->resolve()->getKeysArrayFiltered($filterValueType, $strict);
 	}

diff --git a/src/Type/Traits/MaybeArrayTypeTrait.php b/src/Type/Traits/MaybeArrayTypeTrait.php
@@ -39,7 +39,7 @@ public function isList(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	public function getKeysArrayFiltered(Type $filterValueType, TrinaryLogic $strict): Type
 	{
 		return $this->getKeysArray();
 	}

diff --git a/src/Type/Traits/NonArrayTypeTrait.php b/src/Type/Traits/NonArrayTypeTrait.php
@@ -39,7 +39,7 @@ public function isList(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	public function getKeysArrayFiltered(Type $filterValueType, TrinaryLogic $strict): Type
 	{
 		return $this->getKeysArray();
 	}

diff --git a/src/Type/Type.php b/src/Type/Type.php
@@ -134,7 +134,7 @@ public function setExistingOffsetValueType(Type $offsetType, Type $valueType): T
 
 	public function unsetOffset(Type $offsetType): Type;
 
-	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type;
+	public function getKeysArrayFiltered(Type $filterValueType, TrinaryLogic $strict): Type;
 
 	public function getKeysArray(): Type;
 

diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
@@ -730,7 +730,7 @@ public function unsetOffset(Type $offsetType): Type
 		return $this->unionTypes(static fn (Type $type): Type => $type->unsetOffset($offsetType));
 	}
 
-	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	public function getKeysArrayFiltered(Type $filterValueType, TrinaryLogic $strict): Type
 	{
 		return $this->unionTypes(static fn (Type $type): Type => $type->getKeysArrayFiltered($filterValueType, $strict));
 	}