[BE] Infer explicit mixed when instantiating generic class with unknown template types

Author: ondrejmirtes

changelog-2.0.md

@@ -11,7 +11,6 @@ Major new features 🚀
 Bleeding edge (TODO move to other sections)
 =====================
 
-* Infer explicit mixed when instantiating generic class with unknown template types (https://github.com/phpstan/phpstan-src/commit/089d4c6fb6eb709c44123548d33990113d174b86), #6398
 * Report useless `array_filter()` calls ([#1077](https://github.com/phpstan/phpstan-src/pull/1077)), #6840, thanks @leongersen!
 * Specify explicit mixed array type via `is_array` ([#1191](https://github.com/phpstan/phpstan-src/pull/1191)), thanks @herndlm!
 * Lower memory consumption thanks to breaking up of reference cycles
@@ -140,6 +139,7 @@ Improvements 🔧
     * Learn more: [Using RuleErrorBuilder to enrich reported errors in custom rules](https://phpstan.org/blog/using-rule-error-builder)
 * Require identifier in custom rules (https://github.com/phpstan/phpstan-src/commit/969e6fa31d5484d42dab902703cfc6820a983cfd)
 * New `RuleLevelHelper::accepts()` behaviour (https://github.com/phpstan/phpstan-src/commit/941fc815db49315b8783dc466cf593e0d8a85d23)
+* Infer explicit mixed when instantiating generic class with unknown template types (https://github.com/phpstan/phpstan-src/commit/089d4c6fb6eb709c44123548d33990113d174b86), #6398
 
 Bugfixes 🐛
 =====================

conf/bleedingEdge.neon

@@ -2,7 +2,6 @@ parameters:
 	featureToggles:
 		bleedingEdge: true
 		skipCheckGenericClasses!: []
-		explicitMixedInUnknownGenericNew: true
 		explicitMixedForGlobalVariables: true
 		explicitMixedViaIsArray: true
 		arrayFilter: true

conf/config.neon

@@ -36,7 +36,6 @@ parameters:
 			- CachingIterator
 			- RegexIterator
 			- ReflectionEnum
-		explicitMixedInUnknownGenericNew: false
 		explicitMixedForGlobalVariables: false
 		explicitMixedViaIsArray: false
 		arrayFilter: false

conf/parametersSchema.neon

@@ -31,7 +31,6 @@ parametersSchema:
 		bleedingEdge: bool(),
 		disableRuntimeReflectionProvider: bool(),
 		skipCheckGenericClasses: listOf(string()),
-		explicitMixedInUnknownGenericNew: bool(),
 		explicitMixedForGlobalVariables: bool(),
 		explicitMixedViaIsArray: bool(),
 		arrayFilter: bool(),

src/Analyser/DirectInternalScopeFactory.php

@@ -35,7 +35,6 @@ public function __construct(
 		private Parser $parser,
 		private NodeScopeResolver $nodeScopeResolver,
 		private PhpVersion $phpVersion,
-		private bool $explicitMixedInUnknownGenericNew,
 		private bool $explicitMixedForGlobalVariables,
 		private ConstantResolver $constantResolver,
 	)
@@ -103,7 +102,6 @@ public function create(
 			$afterExtractCall,
 			$parentScope,
 			$nativeTypesPromoted,
-			$this->explicitMixedInUnknownGenericNew,
 			$this->explicitMixedForGlobalVariables,
 		);
 	}

src/Analyser/LazyInternalScopeFactory.php

@@ -20,8 +20,6 @@
 final class LazyInternalScopeFactory implements InternalScopeFactory
 {
 
-	private bool $explicitMixedInUnknownGenericNew;
-
 	private bool $explicitMixedForGlobalVariables;
 
 	/**
@@ -32,7 +30,6 @@ public function __construct(
 		private Container $container,
 	)
 	{
-		$this->explicitMixedInUnknownGenericNew = $this->container->getParameter('featureToggles')['explicitMixedInUnknownGenericNew'];
 		$this->explicitMixedForGlobalVariables = $this->container->getParameter('featureToggles')['explicitMixedForGlobalVariables'];
 	}
 
@@ -97,7 +94,6 @@ public function create(
 			$afterExtractCall,
 			$parentScope,
 			$nativeTypesPromoted,
-			$this->explicitMixedInUnknownGenericNew,
 			$this->explicitMixedForGlobalVariables,
 		);
 	}

src/Analyser/MutatingScope.php

@@ -220,7 +220,6 @@ public function __construct(
 		private bool $afterExtractCall = false,
 		private ?Scope $parentScope = null,
 		private bool $nativeTypesPromoted = false,
-		private bool $explicitMixedInUnknownGenericNew = false,
 		private bool $explicitMixedForGlobalVariables = false,
 	)
 	{
@@ -5549,49 +5548,22 @@ private function exactInstantiation(New_ $node, string $className): ?Type
 			$constructorMethod->getNamedArgumentsVariants(),
 		);
 
-		if ($this->explicitMixedInUnknownGenericNew) {
-			$resolvedTemplateTypeMap = $parametersAcceptor->getResolvedTemplateTypeMap();
-			return TypeTraverser::map(new GenericObjectType(
-				$resolvedClassName,
-				$classReflection->typeMapToList($classReflection->getTemplateTypeMap()),
-			), static function (Type $type, callable $traverse) use ($resolvedTemplateTypeMap): Type {
-				if ($type instanceof TemplateType && !$type->isArgument()) {
-					$newType = $resolvedTemplateTypeMap->getType($type->getName());
-					if ($newType === null || $newType instanceof ErrorType) {
-						return $type->getBound();
-					}
-
-					return TemplateTypeHelper::generalizeInferredTemplateType($type, $newType);
+		$resolvedTemplateTypeMap = $parametersAcceptor->getResolvedTemplateTypeMap();
+		return TypeTraverser::map(new GenericObjectType(
+			$resolvedClassName,
+			$classReflection->typeMapToList($classReflection->getTemplateTypeMap()),
+		), static function (Type $type, callable $traverse) use ($resolvedTemplateTypeMap): Type {
+			if ($type instanceof TemplateType && !$type->isArgument()) {
+				$newType = $resolvedTemplateTypeMap->getType($type->getName());
+				if ($newType === null || $newType instanceof ErrorType) {
+					return $type->getBound();
 				}
 
-				return $traverse($type);
-			});
-		}
-
-		$resolvedPhpDoc = $classReflection->getResolvedPhpDoc();
-		if ($resolvedPhpDoc === null) {
-			return $objectType;
-		}
-
-		$list = [];
-		$typeMap = $parametersAcceptor->getResolvedTemplateTypeMap();
-		foreach ($resolvedPhpDoc->getTemplateTags() as $tag) {
-			$templateType = $typeMap->getType($tag->getName());
-			if ($templateType !== null) {
-				$list[] = $templateType;
-				continue;
+				return TemplateTypeHelper::generalizeInferredTemplateType($type, $newType);
 			}
-			$bound = $tag->getBound();
-			if ($bound instanceof MixedType && $bound->isExplicitMixed()) {
-				$bound = new MixedType(false);
-			}
-			$list[] = $bound;
-		}
 
-		return new GenericObjectType(
-			$resolvedClassName,
-			$list,
-		);
+			return $traverse($type);
+		});
 	}
 
 	private function filterTypeWithMethod(Type $typeWithMethod, string $methodName): ?Type

src/Testing/PHPStanTestCase.php

@@ -188,7 +188,6 @@ public static function createScopeFactory(ReflectionProvider $reflectionProvider
 				self::getParser(),
 				$container->getByType(NodeScopeResolver::class),
 				$container->getByType(PhpVersion::class),
-				$container->getParameter('featureToggles')['explicitMixedInUnknownGenericNew'],
 				$container->getParameter('featureToggles')['explicitMixedForGlobalVariables'],
 				$constantResolver,
 			),