Pass TrinaryLogic into ConstantArrayType isList everywhere

Author: ondrejmirtes

src/Type/Accessory/AccessoryLiteralStringType.php

@@ -188,7 +188,7 @@ public function toArray(): Type
 [$this],
 [1],
 [],
-true,
+TrinaryLogic::createYes(),
 );
 }
 

src/Type/Accessory/AccessoryNonEmptyStringType.php

@@ -189,7 +189,7 @@ public function toArray(): Type
 [$this],
 [1],
 [],
-true,
+TrinaryLogic::createYes(),
 );
 }
 

src/Type/Accessory/AccessoryNonFalsyStringType.php

@@ -189,7 +189,7 @@ public function toArray(): Type
 [$this],
 [1],
 [],
-true,
+TrinaryLogic::createYes(),
 );
 }
 

src/Type/Accessory/AccessoryNumericStringType.php

@@ -191,7 +191,7 @@ public function toArray(): Type
 [$this],
 [1],
 [],
-true,
+TrinaryLogic::createYes(),
 );
 }
 

src/Type/BooleanType.php

@@ -87,7 +87,7 @@ public function toArray(): Type
 [$this],
 [1],
 [],
-true,
+TrinaryLogic::createYes(),
 );
 }
 

src/Type/ClosureType.php

@@ -340,7 +340,7 @@ public function toArray(): Type
 [$this],
 [1],
 [],
-true,
+TrinaryLogic::createYes(),
 );
 }
 

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));
 

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();
 }
 
 }

src/Type/FloatType.php

@@ -135,7 +135,7 @@ public function toArray(): Type
 [$this],
 [1],
 [],
-true,
+TrinaryLogic::createYes(),
 );
 }
 

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;