Fix GenericObjectType::isSuperTypeOf() for covariant template types

src/Type/Generic/GenericObjectType.php

@@ -162,9 +162,8 @@ private function isSuperTypeOfInternal(Type $type, bool $acceptsContext): Trinar
 			if (!$templateType instanceof TemplateType) {
 				throw new \PHPStan\ShouldNotHappenException();
 			}
-			if (!$templateType->isValidVariance($this->types[$i], $ancestor->types[$i])) {
-				return TrinaryLogic::createNo();
-			}
+
+			return $templateType->isValidVariance($this->types[$i], $ancestor->types[$i])->and($nakedSuperTypeOf);
 		}
 
 		return $nakedSuperTypeOf;

src/Type/Generic/TemplateMixedType.php

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

src/Type/Generic/TemplateObjectType.php

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

src/Type/Generic/TemplateObjectWithoutClassType.php

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

src/Type/Generic/TemplateType.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\Type\Generic;
 
+use PHPStan\TrinaryLogic;
 use PHPStan\Type\CompoundType;
 use PHPStan\Type\Type;
 
@@ -18,7 +19,7 @@ public function toArgument(): TemplateType;
 
 	public function isArgument(): bool;
 
-	public function isValidVariance(Type $a, Type $b): bool;
+	public function isValidVariance(Type $a, Type $b): TrinaryLogic;
 
 	public function getVariance(): TemplateTypeVariance;
 

src/Type/Generic/TemplateTypeVariance.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\Type\Generic;
 
+use PHPStan\TrinaryLogic;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
 
@@ -94,26 +95,26 @@ public function compose(self $other): self
 		return $other;
 	}
 
-	public function isValidVariance(Type $a, Type $b): bool
+	public function isValidVariance(Type $a, Type $b): TrinaryLogic
 	{
 		if ($a instanceof MixedType && !$a instanceof TemplateType) {
-			return true;
+			return TrinaryLogic::createYes();
 		}
 
 		if ($b instanceof MixedType && !$b instanceof TemplateType) {
-			return true;
+			return TrinaryLogic::createYes();
 		}
 
 		if ($this->invariant()) {
-			return $a->equals($b);
+			return TrinaryLogic::createFromBoolean($a->equals($b));
 		}
 
 		if ($this->covariant()) {
-			return $a->isSuperTypeOf($b)->yes();
+			return $a->isSuperTypeOf($b);
 		}
 
 		if ($this->contravariant()) {
-			return $b->isSuperTypeOf($a)->yes();
+			return $b->isSuperTypeOf($a);
 		}
 
 		throw new \PHPStan\ShouldNotHappenException();

tests/PHPStan/Rules/Properties/TypesAssignedToPropertiesRuleTest.php

@@ -174,10 +174,6 @@ public function testBug3777(): void
 				'Property Bug3777\Ipsum::$ipsum (Bug3777\Lorem<stdClass, Exception>) does not accept Bug3777\Lorem<Exception, stdClass>.',
 				95,
 			],
-			[
-				'Property Bug3777\Ipsum2::$lorem2 (Bug3777\Lorem2<stdClass, Exception>) does not accept Bug3777\Lorem2<stdClass, object>.',
-				129,
-			],
 			[
 				'Property Bug3777\Ipsum2::$ipsum2 (Bug3777\Lorem2<stdClass, Exception>) does not accept Bug3777\Lorem2<Exception, object>.',
 				131,

tests/PHPStan/Type/Generic/GenericObjectTypeTest.php

@@ -7,6 +7,7 @@
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
+use PHPStan\Type\ObjectWithoutClassType;
 use PHPStan\Type\Test\A;
 use PHPStan\Type\Test\B;
 use PHPStan\Type\Test\C;
@@ -84,7 +85,39 @@ public function dataIsSuperTypeOf(): array
 			'covariant with super type' => [
 				new GenericObjectType(C\Covariant::class, [new ObjectType('DateTime')]),
 				new GenericObjectType(C\Covariant::class, [new ObjectType('DateTimeInterface')]),
-				TrinaryLogic::createNo(),
+				TrinaryLogic::createMaybe(),
+			],
+			[
+				new ObjectType(\ReflectionClass::class),
+				new GenericObjectType(\ReflectionClass::class, [
+					new ObjectType(\stdClass::class),
+				]),
+				TrinaryLogic::createYes(),
+			],
+			[
+				new GenericObjectType(\ReflectionClass::class, [
+					new ObjectType(\stdClass::class),
+				]),
+				new ObjectType(\ReflectionClass::class),
+				TrinaryLogic::createMaybe(),
+			],
+			[
+				new GenericObjectType(\ReflectionClass::class, [
+					new ObjectWithoutClassType(),
+				]),
+				new GenericObjectType(\ReflectionClass::class, [
+					new ObjectType(\stdClass::class),
+				]),
+				TrinaryLogic::createYes(),
+			],
+			[
+				new GenericObjectType(\ReflectionClass::class, [
+					new ObjectType(\stdClass::class),
+				]),
+				new GenericObjectType(\ReflectionClass::class, [
+					new ObjectWithoutClassType(),
+				]),
+				TrinaryLogic::createMaybe(),
 			],
 		];
 	}