Rework

Author: VincentLanglet

src/Rules/RuleLevelHelper.php

@@ -93,25 +93,25 @@ private function transformAcceptedType(Type $acceptingType, Type $acceptedType):
 					return $acceptedType;
 				}
 
-				return new CallableType(
+				return $this->transformCommonType(new CallableType(
 					$acceptedType->getParameters(),
-					$traverse($this->transformCommonType($acceptedType->getReturnType())),
+					$traverse($acceptedType->getReturnType()),
 					$acceptedType->isVariadic(),
 					$acceptedType->getTemplateTypeMap(),
 					$acceptedType->getResolvedTemplateTypeMap(),
 					$acceptedType->getTemplateTags(),
 					$acceptedType->isPure(),
-				);
+				));
 			}
 
 			if ($acceptedType instanceof ClosureType) {
 				if ($acceptedType->isCommonCallable()) {
 					return $acceptedType;
 				}
 
-				return new ClosureType(
+				return $this->transformCommonType(new ClosureType(
 					$acceptedType->getParameters(),
-					$traverse($this->transformCommonType($acceptedType->getReturnType())),
+					$traverse($acceptedType->getReturnType()),
 					$acceptedType->isVariadic(),
 					$acceptedType->getTemplateTypeMap(),
 					$acceptedType->getResolvedTemplateTypeMap(),
@@ -123,7 +123,7 @@ private function transformAcceptedType(Type $acceptingType, Type $acceptedType):
 					$acceptedType->getUsedVariables(),
 					$acceptedType->acceptsNamedArguments(),
 					$acceptedType->mustUseReturnValue(),
-				);
+				));
 			}
 
 			if (

src/Type/Generic/TemplateTypeVariance.php

@@ -177,15 +177,6 @@ public function isValidVariance(TemplateType $templateType, Type $a, Type $b): I
 
 		if ($this->invariant()) {
 			$result = $a->equals($b);
-			if (
-				!$result
-				&& $a instanceof TemplateType
-				&& $b instanceof TemplateType
-				&& $a->getScope()->equals($b->getScope())
-				&& $a->getName() === $b->getName()
-			) {
-				$result = true;
-			}
 			$reasons = [];
 			if (!$result) {
 				if (