simplify type projections resolution so that it does not need a new m…

…ethod on Type
phpstan · Sep 18, 2023 · fc00bb9 · fc00bb9
1 parent dee5c88
commit fc00bb9
Show file tree

Hide file tree

Showing 45 changed files with 36 additions and 564 deletions.
diff --git a/src/Reflection/ResolvedFunctionVariant.php b/src/Reflection/ResolvedFunctionVariant.php
@@ -14,7 +14,6 @@
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeTraverser;
 use PHPStan\Type\TypeUtils;
-use PHPStan\Type\VarianceAwareTypeTraverser;
 use function array_key_exists;
 use function array_map;
 
@@ -172,30 +171,42 @@ public function getNativeReturnType(): Type
 
 	private function resolveResolvableTemplateTypes(Type $type, TemplateTypeVariance $positionVariance): Type
 	{
-		return VarianceAwareTypeTraverser::map($type, $positionVariance, function (Type $type, TemplateTypeVariance $positionVariance, callable $traverse): Type {
+		$references = $type->getReferencedTemplateTypes($positionVariance);
+
+		return TypeTraverser::map($type, function (Type $type, callable $traverse) use ($references): Type {
 			if ($type instanceof TemplateType && !$type->isArgument()) {
 				$newType = $this->resolvedTemplateTypeMap->getType($type->getName());
 				if ($newType === null || $newType instanceof ErrorType) {
-					return $traverse($type, $positionVariance);
+					return $traverse($type);
+				}
+
+				$variance = TemplateTypeVariance::createInvariant();
+				foreach ($references as $reference) {
+					// this uses identity to distinguish between different occurrences of the same template type
+					// see https://github.com/phpstan/phpstan-src/pull/2485#discussion_r1328555397 for details
+					if ($reference->getType() === $type) {
+						$variance = $reference->getPositionVariance();
+						break;
+					}
 				}
 
 				$callSiteVariance = $this->callSiteVarianceMap->getVariance($type->getName());
 				if ($callSiteVariance === null || $callSiteVariance->invariant()) {
 					return $newType;
 				}
 
-				if (!$callSiteVariance->covariant() && $positionVariance->covariant()) {
-					return $traverse($type->getBound(), $positionVariance);
+				if (!$callSiteVariance->covariant() && $variance->covariant()) {
+					return $traverse($type->getBound());
 				}
 
-				if (!$callSiteVariance->contravariant() && $positionVariance->contravariant()) {
+				if (!$callSiteVariance->contravariant() && $variance->contravariant()) {
 					return new NonAcceptingNeverType();
 				}
 
 				return $newType;
 			}
 
-			return $traverse($type, $positionVariance);
+			return $traverse($type);
 		});
 	}
 

diff --git a/src/Type/Accessory/AccessoryArrayListType.php b/src/Type/Accessory/AccessoryArrayListType.php
@@ -12,7 +12,6 @@
 use PHPStan\Type\Constant\ConstantFloatType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\ErrorType;
-use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\IntegerRangeType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
@@ -446,11 +445,6 @@ public function traverseSimultaneously(Type $right, callable $cb): Type
 		return $this;
 	}
 
-	public function traverseWithVariance(TemplateTypeVariance $variance, callable $cb): Type
-	{
-		return $this;
-	}
-
 	public static function __set_state(array $properties): Type
 	{
 		return new self();

diff --git a/src/Type/Accessory/AccessoryLiteralStringType.php b/src/Type/Accessory/AccessoryLiteralStringType.php
@@ -15,7 +15,6 @@
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\GeneralizePrecision;
-use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
@@ -318,11 +317,6 @@ public function traverseSimultaneously(Type $right, callable $cb): Type
 		return $this;
 	}
 
-	public function traverseWithVariance(TemplateTypeVariance $variance, callable $cb): Type
-	{
-		return $this;
-	}
-
 	public function generalize(GeneralizePrecision $precision): Type
 	{
 		return new StringType();

diff --git a/src/Type/Accessory/AccessoryNonEmptyStringType.php b/src/Type/Accessory/AccessoryNonEmptyStringType.php
@@ -16,7 +16,6 @@
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\GeneralizePrecision;
-use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\ObjectWithoutClassType;
@@ -314,11 +313,6 @@ public function traverseSimultaneously(Type $right, callable $cb): Type
 		return $this;
 	}
 
-	public function traverseWithVariance(TemplateTypeVariance $variance, callable $cb): Type
-	{
-		return $this;
-	}
-
 	public function generalize(GeneralizePrecision $precision): Type
 	{
 		return new StringType();

diff --git a/src/Type/Accessory/AccessoryNonFalsyStringType.php b/src/Type/Accessory/AccessoryNonFalsyStringType.php
@@ -15,7 +15,6 @@
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\GeneralizePrecision;
-use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\IntegerRangeType;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\IntersectionType;
@@ -314,11 +313,6 @@ public function traverseSimultaneously(Type $right, callable $cb): Type
 		return $this;
 	}
 
-	public function traverseWithVariance(TemplateTypeVariance $variance, callable $cb): Type
-	{
-		return $this;
-	}
-
 	public function generalize(GeneralizePrecision $precision): Type
 	{
 		return new StringType();

diff --git a/src/Type/Accessory/AccessoryNumericStringType.php b/src/Type/Accessory/AccessoryNumericStringType.php
@@ -16,7 +16,6 @@
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\GeneralizePrecision;
-use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\StringType;
@@ -316,11 +315,6 @@ public function traverseSimultaneously(Type $right, callable $cb): Type
 		return $this;
 	}
 
-	public function traverseWithVariance(TemplateTypeVariance $variance, callable $cb): Type
-	{
-		return $this;
-	}
-
 	public function generalize(GeneralizePrecision $precision): Type
 	{
 		return new StringType();

diff --git a/src/Type/Accessory/HasMethodType.php b/src/Type/Accessory/HasMethodType.php
@@ -14,7 +14,6 @@
 use PHPStan\Type\AcceptsResult;
 use PHPStan\Type\CompoundType;
 use PHPStan\Type\ErrorType;
-use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
@@ -186,11 +185,6 @@ public function traverseSimultaneously(Type $right, callable $cb): Type
 		return $this;
 	}
 
-	public function traverseWithVariance(TemplateTypeVariance $variance, callable $cb): Type
-	{
-		return $this;
-	}
-
 	public function exponentiate(Type $exponent): Type
 	{
 		return new ErrorType();

diff --git a/src/Type/Accessory/HasOffsetType.php b/src/Type/Accessory/HasOffsetType.php
@@ -12,7 +12,6 @@
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ErrorType;
-use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectWithoutClassType;
@@ -359,11 +358,6 @@ public function traverseSimultaneously(Type $right, callable $cb): Type
 		return $this;
 	}
 
-	public function traverseWithVariance(TemplateTypeVariance $variance, callable $cb): Type
-	{
-		return $this;
-	}
-
 	public function exponentiate(Type $exponent): Type
 	{
 		return new ErrorType();

diff --git a/src/Type/Accessory/HasOffsetValueType.php b/src/Type/Accessory/HasOffsetValueType.php
@@ -14,7 +14,6 @@
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ConstantScalarType;
 use PHPStan\Type\ErrorType;
-use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectWithoutClassType;
@@ -415,16 +414,6 @@ public function traverseSimultaneously(Type $right, callable $cb): Type
 		return new self($this->offsetType, $newValueType);
 	}
 
-	public function traverseWithVariance(TemplateTypeVariance $variance, callable $cb): Type
-	{
-		$newValueType = $cb($this->valueType, $variance);
-		if ($newValueType === $this->valueType) {
-			return $this;
-		}
-
-		return new self($this->offsetType, $newValueType);
-	}
-
 	public function exponentiate(Type $exponent): Type
 	{
 		return new ErrorType();

diff --git a/src/Type/Accessory/HasPropertyType.php b/src/Type/Accessory/HasPropertyType.php
@@ -10,7 +10,6 @@
 use PHPStan\Type\AcceptsResult;
 use PHPStan\Type\CompoundType;
 use PHPStan\Type\ErrorType;
-use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
 use PHPStan\Type\Traits\NonGenericTypeTrait;
@@ -148,11 +147,6 @@ public function traverseSimultaneously(Type $right, callable $cb): Type
 		return $this;
 	}
 
-	public function traverseWithVariance(TemplateTypeVariance $variance, callable $cb): Type
-	{
-		return $this;
-	}
-
 	public function exponentiate(Type $exponent): Type
 	{
 		return new ErrorType();

diff --git a/src/Type/Accessory/NonEmptyArrayType.php b/src/Type/Accessory/NonEmptyArrayType.php
@@ -12,7 +12,6 @@
 use PHPStan\Type\Constant\ConstantFloatType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\ErrorType;
-use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\IntegerRangeType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
@@ -425,11 +424,6 @@ public function traverseSimultaneously(Type $right, callable $cb): Type
 		return $this;
 	}
 
-	public function traverseWithVariance(TemplateTypeVariance $variance, callable $cb): Type
-	{
-		return $this;
-	}
-
 	public function exponentiate(Type $exponent): Type
 	{
 		return new ErrorType();

diff --git a/src/Type/Accessory/OversizedArrayType.php b/src/Type/Accessory/OversizedArrayType.php
@@ -12,7 +12,6 @@
 use PHPStan\Type\Constant\ConstantFloatType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\ErrorType;
-use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\IntegerRangeType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
@@ -411,11 +410,6 @@ public function traverseSimultaneously(Type $right, callable $cb): Type
 		return $this;
 	}
 
-	public function traverseWithVariance(TemplateTypeVariance $variance, callable $cb): Type
-	{
-		return $this;
-	}
-
 	public function exponentiate(Type $exponent): Type
 	{
 		return new ErrorType();

diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -659,24 +659,6 @@ public function traverse(callable $cb): Type
 		return $this;
 	}
 
-	public function traverseWithVariance(TemplateTypeVariance $variance, callable $cb): Type
-	{
-		$composedVariance = $variance->compose(TemplateTypeVariance::createCovariant());
-
-		$newKeyType = $cb($this->keyType, $composedVariance);
-		$newItemType = $cb($this->itemType, $composedVariance);
-
-		if ($newKeyType === $this->keyType && $newItemType === $this->itemType) {
-			return $this;
-		}
-
-		if ($newKeyType instanceof NeverType && $newItemType instanceof NeverType) {
-			return new ConstantArrayType([], []);
-		}
-
-		return new self($newKeyType, $newItemType);
-	}
-
 	public function toPhpDocNode(): TypeNode
 	{
 		$isMixedKeyType = $this->keyType instanceof MixedType && $this->keyType->describe(VerbosityLevel::precise()) === 'mixed';

diff --git a/src/Type/BenevolentUnionType.php b/src/Type/BenevolentUnionType.php
@@ -4,7 +4,6 @@
 
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Generic\TemplateTypeMap;
-use PHPStan\Type\Generic\TemplateTypeVariance;
 use function count;
 
 /** @api */
@@ -167,26 +166,6 @@ public function traverseSimultaneously(Type $right, callable $cb): Type
 		return $this;
 	}
 
-	public function traverseWithVariance(TemplateTypeVariance $variance, callable $cb): Type
-	{
-		$types = [];
-		$changed = false;
-
-		foreach ($this->getTypes() as $type) {
-			$newType = $cb($type, $variance);
-			if ($type !== $newType) {
-				$changed = true;
-			}
-			$types[] = $newType;
-		}
-
-		if ($changed) {
-			return TypeUtils::toBenevolentUnion(TypeCombinator::union(...$types));
-		}
-
-		return $this;
-	}
-
 	/**
 	 * @param mixed[] $properties
 	 */

diff --git a/src/Type/CallableType.php b/src/Type/CallableType.php
@@ -405,32 +405,6 @@ public function traverseSimultaneously(Type $right, callable $cb): Type
 		);
 	}
 
-	public function traverseWithVariance(TemplateTypeVariance $variance, callable $cb): Type
-	{
-		if ($this->isCommonCallable) {
-			return $this;
-		}
-
-		$parameterVariance = $variance->compose(TemplateTypeVariance::createContravariant());
-		$parameters = array_map(static function (ParameterReflection $param) use ($cb, $parameterVariance): NativeParameterReflection {
-			$defaultValue = $param->getDefaultValue();
-			return new NativeParameterReflection(
-				$param->getName(),
-				$param->isOptional(),
-				$cb($param->getType(), $parameterVariance),
-				$param->passedByReference(),
-				$param->isVariadic(),
-				$defaultValue !== null ? $cb($defaultValue, $parameterVariance) : null,
-			);
-		}, $this->getParameters());
-
-		return new self(
-			$parameters,
-			$cb($this->getReturnType(), $variance->compose(TemplateTypeVariance::createCovariant())),
-			$this->isVariadic(),
-		);
-	}
-
 	public function isOversizedArray(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();