[BCB] Changed TemplateType::isValidVariance() return type to IsSuperTypeOfResult

Author: ondrejmirtes

UPGRADING.md

@@ -313,6 +313,7 @@ Instead of `AccessoryArrayListType::intersectWith($type)`, do `TypeCombinator::i
 * `PHPStan\Node\Printer\Printer` no longer autowired as `PhpParser\PrettyPrinter\Standard`, use `PHPStan\Node\Printer\Printer` in the typehint
 * Remove `Type::acceptsWithReason()`, `Type:accepts()` return type changed from `TrinaryLogic` to [`AcceptsResult`](https://apiref.phpstan.org/2.0.x/PHPStan.Type.AcceptsResult.html)
 * Remove `CompoundType::isAcceptedWithReasonBy()`, `CompoundType::isAcceptedBy()` return type changed from `TrinaryLogic` to [`AcceptsResult`](https://apiref.phpstan.org/2.0.x/PHPStan.Type.AcceptsResult.html)
+* Remove `TemplateType::isValidVarianceWithReason()`, changed `TemplateType::isValidVariance()` return type to `IsSuperTypeOfResult`
 * `RuleLevelHelper::accepts()` return type changed from `bool` to [`RuleLevelHelperAcceptsResult`](https://apiref.phpstan.org/2.0.x/PHPStan.Type.AcceptsResult.html)
 * Changes around `ClassConstantReflection`
   * Class `ClassConstantReflection` removed from BC promise, renamed to `RealClassConstantReflection`

src/Type/Generic/GenericObjectType.php

@@ -190,11 +190,9 @@ private function isSuperTypeOfInternal(Type $type, bool $acceptsContext): IsSupe
 			$thisVariance = $this->variances[$i] ?? TemplateTypeVariance::createInvariant();
 			$ancestorVariance = $ancestor->variances[$i] ?? TemplateTypeVariance::createInvariant();
 			if (!$thisVariance->invariant()) {
-				$result = $thisVariance->isValidVariance($templateType, $this->types[$i], $ancestor->types[$i]);
-				$results[] = new IsSuperTypeOfResult($result->result, $result->reasons);
+				$results[] = $thisVariance->isValidVariance($templateType, $this->types[$i], $ancestor->types[$i]);
 			} else {
-				$result = $templateType->isValidVariance($this->types[$i], $ancestor->types[$i]);
-				$results[] = new IsSuperTypeOfResult($result->result, $result->reasons);
+				$results[] = $templateType->isValidVariance($this->types[$i], $ancestor->types[$i]);
 			}
 
 			$results[] = IsSuperTypeOfResult::createFromBoolean($thisVariance->validPosition($ancestorVariance));

src/Type/Generic/TemplateType.php

@@ -2,8 +2,8 @@
 
 namespace PHPStan\Type\Generic;
 
-use PHPStan\Type\AcceptsResult;
 use PHPStan\Type\CompoundType;
+use PHPStan\Type\IsSuperTypeOfResult;
 use PHPStan\Type\Type;
 
 /** @api */
@@ -21,7 +21,7 @@ public function toArgument(): TemplateType;
 
 	public function isArgument(): bool;
 
-	public function isValidVariance(Type $a, Type $b): AcceptsResult;
+	public function isValidVariance(Type $a, Type $b): IsSuperTypeOfResult;
 
 	public function getVariance(): TemplateTypeVariance;
 

src/Type/Generic/TemplateTypeTrait.php

@@ -92,7 +92,7 @@ public function toArgument(): TemplateType
 		);
 	}
 
-	public function isValidVariance(Type $a, Type $b): AcceptsResult
+	public function isValidVariance(Type $a, Type $b): IsSuperTypeOfResult
 	{
 		return $this->variance->isValidVariance($this, $a, $b);
 	}

src/Type/Generic/TemplateTypeVariance.php

@@ -5,7 +5,6 @@
 use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
-use PHPStan\Type\AcceptsResult;
 use PHPStan\Type\BenevolentUnionType;
 use PHPStan\Type\IsSuperTypeOfResult;
 use PHPStan\Type\MixedType;
@@ -127,30 +126,30 @@ public function compose(self $other): self
 		return $other;
 	}
 
-	public function isValidVariance(TemplateType $templateType, Type $a, Type $b): AcceptsResult
+	public function isValidVariance(TemplateType $templateType, Type $a, Type $b): IsSuperTypeOfResult
 	{
 		if ($b instanceof NeverType) {
-			return AcceptsResult::createYes();
+			return IsSuperTypeOfResult::createYes();
 		}
 
 		if ($a instanceof MixedType && !$a instanceof TemplateType) {
-			return AcceptsResult::createYes();
+			return IsSuperTypeOfResult::createYes();
 		}
 
 		if ($a instanceof BenevolentUnionType) {
 			if (!$a->isSuperTypeOf($b)->no()) {
-				return AcceptsResult::createYes();
+				return IsSuperTypeOfResult::createYes();
 			}
 		}
 
 		if ($b instanceof BenevolentUnionType) {
 			if (!$b->isSuperTypeOf($a)->no()) {
-				return AcceptsResult::createYes();
+				return IsSuperTypeOfResult::createYes();
 			}
 		}
 
 		if ($b instanceof MixedType && !$b instanceof TemplateType) {
-			return AcceptsResult::createYes();
+			return IsSuperTypeOfResult::createYes();
 		}
 
 		if ($this->invariant()) {
@@ -169,19 +168,19 @@ public function isValidVariance(TemplateType $templateType, Type $a, Type $b): A
 				}
 			}
 
-			return new AcceptsResult(TrinaryLogic::createFromBoolean($result), $reasons);
+			return new IsSuperTypeOfResult(TrinaryLogic::createFromBoolean($result), $reasons);
 		}
 
 		if ($this->covariant()) {
-			return $a->isSuperTypeOfWithReason($b)->toAcceptsResult();
+			return $a->isSuperTypeOfWithReason($b);
 		}
 
 		if ($this->contravariant()) {
-			return $b->isSuperTypeOfWithReason($a)->toAcceptsResult();
+			return $b->isSuperTypeOfWithReason($a);
 		}
 
 		if ($this->bivariant()) {
-			return AcceptsResult::createYes();
+			return IsSuperTypeOfResult::createYes();
 		}
 
 		throw new ShouldNotHappenException();