Rework

Author: VincentLanglet

src/Rules/RuleLevelHelper.php

@@ -62,6 +62,44 @@ private function transformCommonType(Type $type): Type
 		}
 
 		return TypeTraverser::map($type, function (Type $type, callable $traverse) {
+			if ($type instanceof CallableType) {
+				if ($type->isCommonCallable()) {
+					return $type;
+				}
+
+				return new CallableType(
+					$type->getParameters(),
+					$traverse($this->transformCommonType($type->getReturnType())),
+					$type->isVariadic(),
+					$type->getTemplateTypeMap(),
+					$type->getResolvedTemplateTypeMap(),
+					$type->getTemplateTags(),
+					$type->isPure(),
+				);
+			}
+
+			if ($type instanceof ClosureType) {
+				if ($type->isCommonCallable()) {
+					return $type;
+				}
+
+				return new ClosureType(
+					$type->getParameters(),
+					$traverse($this->transformCommonType($type->getReturnType())),
+					$type->isVariadic(),
+					$type->getTemplateTypeMap(),
+					$type->getResolvedTemplateTypeMap(),
+					$type->getCallSiteVarianceMap(),
+					$type->getTemplateTags(),
+					$type->getThrowPoints(),
+					$type->getImpurePoints(),
+					$type->getInvalidateExpressions(),
+					$type->getUsedVariables(),
+					$type->acceptsNamedArguments(),
+					$type->mustUseReturnValue(),
+				);
+			}
+
 			if ($type instanceof TemplateMixedType) {
 				if ($this->checkExplicitMixed) {
 					return $type->toStrictMixedType();

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 (