Merge remote-tracking branch 'origin/1.12.x' into 2.0.x

Author: ondrejmirtes

src/Type/Generic/GenericObjectType.php

@@ -190,9 +190,11 @@ private function isSuperTypeOfInternal(Type $type, bool $acceptsContext): IsSupe
 			$thisVariance = $this->variances[$i] ?? TemplateTypeVariance::createInvariant();
 			$ancestorVariance = $ancestor->variances[$i] ?? TemplateTypeVariance::createInvariant();
 			if (!$thisVariance->invariant()) {
-				$results[] = $thisVariance->isValidVariance($templateType, $this->types[$i], $ancestor->types[$i]);
+				$result = $thisVariance->isValidVariance($templateType, $this->types[$i], $ancestor->types[$i]);
+				$results[] = new IsSuperTypeOfResult($result->result, $result->reasons);
 			} else {
-				$results[] = $templateType->isValidVariance($this->types[$i], $ancestor->types[$i]);
+				$result = $templateType->isValidVariance($this->types[$i], $ancestor->types[$i]);
+				$results[] = new IsSuperTypeOfResult($result->result, $result->reasons);
 			}
 
 			$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): IsSuperTypeOfResult;
+	public function isValidVariance(Type $a, Type $b): AcceptsResult;
 
 	public function getVariance(): TemplateTypeVariance;
 

src/Type/Generic/TemplateTypeTrait.php

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

src/Type/Generic/TemplateTypeVariance.php

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