Pass TrinaryLogic into ConstantArrayType isList everywhere

ondrejmirtes · ondrejmirtes · commit f0a9fd796e1b · 2023-07-18T16:53:10.000+02:00
diff --git a/src/Type/Accessory/AccessoryLiteralStringType.php b/src/Type/Accessory/AccessoryLiteralStringType.php
@@ -188,7 +188,7 @@ public function toArray(): Type
 			[$this],
 			[1],
 			[],
-			true,
+			TrinaryLogic::createYes(),
 		);
 	}
 
diff --git a/src/Type/Accessory/AccessoryNonEmptyStringType.php b/src/Type/Accessory/AccessoryNonEmptyStringType.php
@@ -189,7 +189,7 @@ public function toArray(): Type
 			[$this],
 			[1],
 			[],
-			true,
+			TrinaryLogic::createYes(),
 		);
 	}
 
diff --git a/src/Type/Accessory/AccessoryNonFalsyStringType.php b/src/Type/Accessory/AccessoryNonFalsyStringType.php
@@ -189,7 +189,7 @@ public function toArray(): Type
 			[$this],
 			[1],
 			[],
-			true,
+			TrinaryLogic::createYes(),
 		);
 	}
 
diff --git a/src/Type/Accessory/AccessoryNumericStringType.php b/src/Type/Accessory/AccessoryNumericStringType.php
@@ -191,7 +191,7 @@ public function toArray(): Type
 			[$this],
 			[1],
 			[],
-			true,
+			TrinaryLogic::createYes(),
 		);
 	}
 
diff --git a/src/Type/BooleanType.php b/src/Type/BooleanType.php
@@ -87,7 +87,7 @@ public function toArray(): Type
 			[$this],
 			[1],
 			[],
-			true,
+			TrinaryLogic::createYes(),
 		);
 	}
 
diff --git a/src/Type/ClosureType.php b/src/Type/ClosureType.php
@@ -340,7 +340,7 @@ public function toArray(): Type
 			[$this],
 			[1],
 			[],
-			true,
+			TrinaryLogic::createYes(),
 		);
 	}
 
diff --git a/src/Type/Constant/ConstantArrayType.php b/src/Type/Constant/ConstantArrayType.php
@@ -695,7 +695,7 @@ public function unsetOffset(Type $offsetType): Type
 					$k++;
 				}
 
-				return new self($newKeyTypes, $newValueTypes, $this->nextAutoIndexes, $newOptionalKeys, false);
+				return new self($newKeyTypes, $newValueTypes, $this->nextAutoIndexes, $newOptionalKeys, TrinaryLogic::createNo());
 			}
 
 			return $this;
@@ -724,7 +724,7 @@ public function unsetOffset(Type $offsetType): Type
 				}
 			}
 
-			return new self($this->keyTypes, $this->valueTypes, $this->nextAutoIndexes, $optionalKeys, false);
+			return new self($this->keyTypes, $this->valueTypes, $this->nextAutoIndexes, $optionalKeys, TrinaryLogic::createNo());
 		}
 
 		$optionalKeys = $this->optionalKeys;
@@ -734,7 +734,7 @@ public function unsetOffset(Type $offsetType): Type
 				continue;
 			}
 			$optionalKeys[] = $i;
-			$isList = false;
+			$isList = TrinaryLogic::createNo();
 		}
 		$optionalKeys = array_values(array_unique($optionalKeys));
 
diff --git a/src/Type/Constant/ConstantArrayTypeBuilder.php b/src/Type/Constant/ConstantArrayTypeBuilder.php
@@ -3,6 +3,7 @@
 namespace PHPStan\Type\Constant;
 
 use PHPStan\ShouldNotHappenException;
+use PHPStan\TrinaryLogic;
 use PHPStan\Type\Accessory\AccessoryArrayListType;
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\Accessory\OversizedArrayType;
@@ -42,14 +43,14 @@ private function __construct(
 		private array $valueTypes,
 		private array $nextAutoIndexes,
 		private array $optionalKeys,
-		private bool $isList,
+		private TrinaryLogic $isList,
 	)
 	{
 	}
 
 	public static function createEmpty(): self
 	{
-		return new self([], [], [0], [], true);
+		return new self([], [], [0], [], TrinaryLogic::createYes());
 	}
 
 	public static function createFromConstantArray(ConstantArrayType $startArrayType): self
@@ -59,7 +60,7 @@ public static function createFromConstantArray(ConstantArrayType $startArrayType
 			$startArrayType->getValueTypes(),
 			$startArrayType->getNextAutoIndexes(),
 			$startArrayType->getOptionalKeys(),
-			$startArrayType->isList()->yes(),
+			$startArrayType->isList(),
 		);
 
 		if (count($startArrayType->getKeyTypes()) > self::ARRAY_COUNT_LIMIT) {
@@ -162,7 +163,7 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $opt
 					$min = min($this->nextAutoIndexes);
 					$max = max($this->nextAutoIndexes);
 					if ($offsetType->getValue() > $min) {
-						$this->isList = false;
+						$this->isList = TrinaryLogic::createNo();
 					}
 					if ($offsetType->getValue() >= $max) {
 						/** @var int|float $newAutoIndex */
@@ -177,7 +178,7 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $opt
 						}
 					}
 				} else {
-					$this->isList = false;
+					$this->isList = TrinaryLogic::createNo();
 				}
 
 				if ($optional) {
@@ -191,7 +192,7 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $opt
 				return;
 			}
 
-			$this->isList = false;
+			$this->isList = TrinaryLogic::createNo();
 
 			$scalarTypes = $offsetType->getConstantScalarTypes();
 			if (count($scalarTypes) === 0) {
@@ -254,7 +255,7 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $opt
 		if ($offsetType === null) {
 			$offsetType = TypeCombinator::union(...array_map(static fn (int $index) => new ConstantIntegerType($index), $this->nextAutoIndexes));
 		} else {
-			$this->isList = false;
+			$this->isList = TrinaryLogic::createNo();
 		}
 
 		$this->keyTypes[] = $offsetType;
@@ -297,7 +298,7 @@ public function getArray(): Type
 			$array = TypeCombinator::intersect($array, new OversizedArrayType());
 		}
 
-		if ($this->isList) {
+		if ($this->isList->yes()) {
 			$array = AccessoryArrayListType::intersectWith($array);
 		}
 
@@ -306,7 +307,7 @@ public function getArray(): Type
 
 	public function isList(): bool
 	{
-		return $this->isList;
+		return $this->isList->yes();
 	}
 
 }
diff --git a/src/Type/FloatType.php b/src/Type/FloatType.php
@@ -135,7 +135,7 @@ public function toArray(): Type
 			[$this],
 			[1],
 			[],
-			true,
+			TrinaryLogic::createYes(),
 		);
 	}
 
diff --git a/src/Type/Generic/TemplateConstantArrayType.php b/src/Type/Generic/TemplateConstantArrayType.php
@@ -21,7 +21,7 @@ public function __construct(
 		ConstantArrayType $bound,
 	)
 	{
-		parent::__construct($bound->getKeyTypes(), $bound->getValueTypes(), $bound->getNextAutoIndexes(), $bound->getOptionalKeys(), $bound->isList()->yes());
+		parent::__construct($bound->getKeyTypes(), $bound->getValueTypes(), $bound->getNextAutoIndexes(), $bound->getOptionalKeys(), $bound->isList());
 		$this->scope = $scope;
 		$this->strategy = $templateTypeStrategy;
 		$this->variance = $templateTypeVariance;
diff --git a/src/Type/IntegerType.php b/src/Type/IntegerType.php
@@ -87,7 +87,7 @@ public function toArray(): Type
 			[$this],
 			[1],
 			[],
-			true,
+			TrinaryLogic::createYes(),
 		);
 	}
 
diff --git a/src/Type/Php/HrtimeFunctionReturnTypeExtension.php b/src/Type/Php/HrtimeFunctionReturnTypeExtension.php
@@ -5,6 +5,7 @@
 use PhpParser\Node\Expr\FuncCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\FunctionReflection;
+use PHPStan\TrinaryLogic;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantIntegerType;
@@ -26,7 +27,7 @@ public function isFunctionSupported(FunctionReflection $functionReflection): boo
 
 	public function getTypeFromFunctionCall(FunctionReflection $functionReflection, FuncCall $functionCall, Scope $scope): Type
 	{
-		$arrayType = new ConstantArrayType([new ConstantIntegerType(0), new ConstantIntegerType(1)], [new IntegerType(), new IntegerType()], [2]);
+		$arrayType = new ConstantArrayType([new ConstantIntegerType(0), new ConstantIntegerType(1)], [new IntegerType(), new IntegerType()], [2], [], TrinaryLogic::createYes());
 		$numberType = TypeUtils::toBenevolentUnion(TypeCombinator::union(new IntegerType(), new FloatType()));
 
 		if (count($functionCall->getArgs()) < 1) {
diff --git a/src/Type/Php/PregSplitDynamicReturnTypeExtension.php b/src/Type/Php/PregSplitDynamicReturnTypeExtension.php
@@ -6,6 +6,7 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
+use PHPStan\TrinaryLogic;
 use PHPStan\Type\Accessory\AccessoryArrayListType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\BitwiseFlagHelper;
@@ -41,7 +42,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		if ($flagsArg !== null && $this->bitwiseFlagAnalyser->bitwiseOrContainsConstant($flagsArg->value, $scope, 'PREG_SPLIT_OFFSET_CAPTURE')->yes()) {
 			$type = new ArrayType(
 				new IntegerType(),
-				new ConstantArrayType([new ConstantIntegerType(0), new ConstantIntegerType(1)], [new StringType(), IntegerRangeType::fromInterval(0, null)], [2]),
+				new ConstantArrayType([new ConstantIntegerType(0), new ConstantIntegerType(1)], [new StringType(), IntegerRangeType::fromInterval(0, null)], [2], [], TrinaryLogic::createYes()),
 			);
 			return TypeCombinator::union(AccessoryArrayListType::intersectWith($type), new ConstantBooleanType(false));
 		}
diff --git a/src/Type/Php/StrSplitFunctionReturnTypeExtension.php b/src/Type/Php/StrSplitFunctionReturnTypeExtension.php
@@ -8,6 +8,7 @@
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\ShouldNotHappenException;
+use PHPStan\TrinaryLogic;
 use PHPStan\Type\Accessory\AccessoryArrayListType;
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\ArrayType;
@@ -20,6 +21,7 @@
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
+use function array_is_list;
 use function array_map;
 use function array_unique;
 use function count;
@@ -134,7 +136,7 @@ private static function createConstantArrayFrom(array $constantArray, Scope $sco
 			$i++;
 		}
 
-		return new ConstantArrayType($keyTypes, $valueTypes, $isList ? [$i] : [0]);
+		return new ConstantArrayType($keyTypes, $valueTypes, $isList ? [$i] : [0], [], TrinaryLogic::createFromBoolean(array_is_list($constantArray)));
 	}
 
 }
diff --git a/src/Type/ResourceType.php b/src/Type/ResourceType.php
@@ -77,7 +77,7 @@ public function toArray(): Type
 			[$this],
 			[1],
 			[],
-			true,
+			TrinaryLogic::createYes(),
 		);
 	}
 
diff --git a/src/Type/StringType.php b/src/Type/StringType.php
@@ -155,7 +155,7 @@ public function toArray(): Type
 			[$this],
 			[1],
 			[],
-			true,
+			TrinaryLogic::createYes(),
 		);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ public function toArray(): Type`
`188`	`188`	`[$this],`
`189`	`189`	`[1],`
`190`	`190`	`[],`
`191`		`- true,`
	`191`	`+ TrinaryLogic::createYes(),`
`192`	`192`	`);`
`193`	`193`	`}`
`194`	`194`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ public function toArray(): Type`
`189`	`189`	`[$this],`
`190`	`190`	`[1],`
`191`	`191`	`[],`
`192`		`- true,`
	`192`	`+ TrinaryLogic::createYes(),`
`193`	`193`	`);`
`194`	`194`	`}`
`195`	`195`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ public function toArray(): Type`
`191`	`191`	`[$this],`
`192`	`192`	`[1],`
`193`	`193`	`[],`
`194`		`- true,`
	`194`	`+ TrinaryLogic::createYes(),`
`195`	`195`	`);`
`196`	`196`	`}`
`197`	`197`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function toArray(): Type`
`87`	`87`	`[$this],`
`88`	`88`	`[1],`
`89`	`89`	`[],`
`90`		`- true,`
	`90`	`+ TrinaryLogic::createYes(),`
`91`	`91`	`);`
`92`	`92`	`}`
`93`	`93`
Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ public function toArray(): Type`
`340`	`340`	`[$this],`
`341`	`341`	`[1],`
`342`	`342`	`[],`
`343`		`- true,`
	`343`	`+ TrinaryLogic::createYes(),`
`344`	`344`	`);`
`345`	`345`	`}`
`346`	`346`
Original file line number	Diff line number	Diff line change
`@@ -695,7 +695,7 @@ public function unsetOffset(Type $offsetType): Type`
`695`	`695`	`$k++;`
`696`	`696`	`}`
`697`	`697`
`698`		`- return new self($newKeyTypes, $newValueTypes, $this->nextAutoIndexes, $newOptionalKeys, false);`
	`698`	`+ return new self($newKeyTypes, $newValueTypes, $this->nextAutoIndexes, $newOptionalKeys, TrinaryLogic::createNo());`
`699`	`699`	`}`
`700`	`700`
`701`	`701`	`return $this;`
`@@ -724,7 +724,7 @@ public function unsetOffset(Type $offsetType): Type`
`724`	`724`	`}`
`725`	`725`	`}`
`726`	`726`
`727`		`- return new self($this->keyTypes, $this->valueTypes, $this->nextAutoIndexes, $optionalKeys, false);`
	`727`	`+ return new self($this->keyTypes, $this->valueTypes, $this->nextAutoIndexes, $optionalKeys, TrinaryLogic::createNo());`
`728`	`728`	`}`
`729`	`729`
`730`	`730`	`$optionalKeys = $this->optionalKeys;`
`@@ -734,7 +734,7 @@ public function unsetOffset(Type $offsetType): Type`
`734`	`734`	`continue;`
`735`	`735`	`}`
`736`	`736`	`$optionalKeys[] = $i;`
`737`		`- $isList = false;`
	`737`	`+ $isList = TrinaryLogic::createNo();`
`738`	`738`	`}`
`739`	`739`	`$optionalKeys = array_values(array_unique($optionalKeys));`
`740`	`740`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`namespace PHPStan\Type\Constant;`
`4`	`4`
`5`	`5`	`use PHPStan\ShouldNotHappenException;`
	`6`	`+use PHPStan\TrinaryLogic;`
`6`	`7`	`use PHPStan\Type\Accessory\AccessoryArrayListType;`
`7`	`8`	`use PHPStan\Type\Accessory\NonEmptyArrayType;`
`8`	`9`	`use PHPStan\Type\Accessory\OversizedArrayType;`
`@@ -42,14 +43,14 @@ private function __construct(`
`42`	`43`	`private array $valueTypes,`
`43`	`44`	`private array $nextAutoIndexes,`
`44`	`45`	`private array $optionalKeys,`
`45`		`- private bool $isList,`
	`46`	`+ private TrinaryLogic $isList,`
`46`	`47`	`)`
`47`	`48`	`{`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`public static function createEmpty(): self`
`51`	`52`	`{`
`52`		`- return new self([], [], [0], [], true);`
	`53`	`+ return new self([], [], [0], [], TrinaryLogic::createYes());`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`public static function createFromConstantArray(ConstantArrayType $startArrayType): self`
`@@ -59,7 +60,7 @@ public static function createFromConstantArray(ConstantArrayType $startArrayType`
`59`	`60`	`$startArrayType->getValueTypes(),`
`60`	`61`	`$startArrayType->getNextAutoIndexes(),`
`61`	`62`	`$startArrayType->getOptionalKeys(),`
`62`		`- $startArrayType->isList()->yes(),`
	`63`	`+ $startArrayType->isList(),`
`63`	`64`	`);`
`64`	`65`
`65`	`66`	`if (count($startArrayType->getKeyTypes()) > self::ARRAY_COUNT_LIMIT) {`
`@@ -162,7 +163,7 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $opt`
`162`	`163`	`$min = min($this->nextAutoIndexes);`
`163`	`164`	`$max = max($this->nextAutoIndexes);`
`164`	`165`	`if ($offsetType->getValue() > $min) {`
`165`		`- $this->isList = false;`
	`166`	`+ $this->isList = TrinaryLogic::createNo();`
`166`	`167`	`}`
`167`	`168`	`if ($offsetType->getValue() >= $max) {`
`168`	`169`	`/** @var int\|float $newAutoIndex */`
`@@ -177,7 +178,7 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $opt`
`177`	`178`	`}`
`178`	`179`	`}`
`179`	`180`	`} else {`
`180`		`- $this->isList = false;`
	`181`	`+ $this->isList = TrinaryLogic::createNo();`
`181`	`182`	`}`
`182`	`183`
`183`	`184`	`if ($optional) {`
`@@ -191,7 +192,7 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $opt`
`191`	`192`	`return;`
`192`	`193`	`}`
`193`	`194`
`194`		`- $this->isList = false;`
	`195`	`+ $this->isList = TrinaryLogic::createNo();`
`195`	`196`
`196`	`197`	`$scalarTypes = $offsetType->getConstantScalarTypes();`
`197`	`198`	`if (count($scalarTypes) === 0) {`
`@@ -254,7 +255,7 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $opt`
`254`	`255`	`if ($offsetType === null) {`
`255`	`256`	`$offsetType = TypeCombinator::union(...array_map(static fn (int $index) => new ConstantIntegerType($index), $this->nextAutoIndexes));`
`256`	`257`	`} else {`
`257`		`- $this->isList = false;`
	`258`	`+ $this->isList = TrinaryLogic::createNo();`
`258`	`259`	`}`
`259`	`260`
`260`	`261`	`$this->keyTypes[] = $offsetType;`
`@@ -297,7 +298,7 @@ public function getArray(): Type`
`297`	`298`	`$array = TypeCombinator::intersect($array, new OversizedArrayType());`
`298`	`299`	`}`
`299`	`300`
`300`		`- if ($this->isList) {`
	`301`	`+ if ($this->isList->yes()) {`
`301`	`302`	`$array = AccessoryArrayListType::intersectWith($array);`
`302`	`303`	`}`
`303`	`304`
`@@ -306,7 +307,7 @@ public function getArray(): Type`
`306`	`307`
`307`	`308`	`public function isList(): bool`
`308`	`309`	`{`
`309`		`- return $this->isList;`
	`310`	`+ return $this->isList->yes();`
`310`	`311`	`}`
`311`	`312`
`312`	`313`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public function toArray(): Type`
`135`	`135`	`[$this],`
`136`	`136`	`[1],`
`137`	`137`	`[],`
`138`		`- true,`
	`138`	`+ TrinaryLogic::createYes(),`
`139`	`139`	`);`
`140`	`140`	`}`
`141`	`141`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public function __construct(`
`21`	`21`	`ConstantArrayType $bound,`
`22`	`22`	`)`
`23`	`23`	`{`
`24`		`- parent::__construct($bound->getKeyTypes(), $bound->getValueTypes(), $bound->getNextAutoIndexes(), $bound->getOptionalKeys(), $bound->isList()->yes());`
	`24`	`+ parent::__construct($bound->getKeyTypes(), $bound->getValueTypes(), $bound->getNextAutoIndexes(), $bound->getOptionalKeys(), $bound->isList());`
`25`	`25`	`$this->scope = $scope;`
`26`	`26`	`$this->strategy = $templateTypeStrategy;`
`27`	`27`	`$this->variance = $templateTypeVariance;`