Only for bleeding edge

phpstan · Dec 11, 2023 · bbe8522 · bbe8522
1 parent 8b926b1
commit bbe8522
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -5083,14 +5083,11 @@ private function exactInstantiation(New_ $node, string $className): ?Type
 		$typeMap = $parametersAcceptor->getResolvedTemplateTypeMap();
 		foreach ($resolvedPhpDoc->getTemplateTags() as $tag) {
 			$templateType = $typeMap->getType($tag->getName());
-			$bound = $tag->getBound();
 			if ($templateType !== null) {
-				if ($templateType->isConstantValue()->yes() && (!$bound->isScalar()->yes() || $bound->describe(VerbosityLevel::precise()) === '(int|string)')) {
-					$templateType = $templateType->generalize(GeneralizePrecision::templateArgument());
-				}
 				$list[] = $templateType;
 				continue;
 			}
+			$bound = $tag->getBound();
 			if ($bound instanceof MixedType && $bound->isExplicitMixed()) {
 				$bound = new MixedType(false);
 			}

diff --git a/src/Reflection/ResolvedFunctionVariant.php b/src/Reflection/ResolvedFunctionVariant.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Reflection;
 
+use PHPStan\DependencyInjection\BleedingEdgeToggle;
 use PHPStan\Reflection\Php\DummyParameterWithPhpDocs;
 use PHPStan\Type\ConditionalTypeForParameter;
 use PHPStan\Type\ErrorType;
@@ -217,7 +218,7 @@ private function resolveResolvableTemplateTypes(Type $type, TemplateTypeVariance
 		};
 
 		return TypeTraverser::map($type, function (Type $type, callable $traverse) use ($references, $objectCb): Type {
-			if ($type instanceof GenericObjectType) {
+			if (BleedingEdgeToggle::isBleedingEdge() && $type instanceof GenericObjectType) {
 				return TypeTraverser::map($type, $objectCb);
 			}
 

diff --git a/src/Type/Generic/TemplateTypeTrait.php b/src/Type/Generic/TemplateTypeTrait.php
@@ -2,10 +2,12 @@
 
 namespace PHPStan\Type\Generic;
 
+use PHPStan\DependencyInjection\BleedingEdgeToggle;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\AcceptsResult;
+use PHPStan\Type\GeneralizePrecision;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
@@ -264,6 +266,13 @@ public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 			TemplateTypeVariance::createStatic(),
 		));
 		if ($resolvedBound->isSuperTypeOf($receivedType)->yes()) {
+			if (!BleedingEdgeToggle::isBleedingEdge() && $this->shouldGeneralizeInferredType()) {
+				$generalizedType = $receivedType->generalize(GeneralizePrecision::templateArgument());
+				if ($resolvedBound->isSuperTypeOf($generalizedType)->yes()) {
+					$receivedType = $generalizedType;
+				}
+			}
+
 			return (new TemplateTypeMap([
 				$this->name => $receivedType,
 			]))->union($map);

diff --git a/tests/PHPStan/Reflection/GenericParametersAcceptorResolverTest.php b/tests/PHPStan/Reflection/GenericParametersAcceptorResolverTest.php
@@ -21,7 +21,7 @@
 use function get_class;
 use function sprintf;
 
-class GenericParametersAcceptorResolverTest  extends PHPStanTestCase
+class GenericParametersAcceptorResolverTest extends PHPStanTestCase
 {
 
 	/**
@@ -427,6 +427,7 @@ public function dataResolve(): array
 	 */
 	public function testResolve(array $argTypes, ParametersAcceptor $parametersAcceptor, ParametersAcceptor $expectedResult): void
 	{
+		self::getContainer(); // to initialize bleeding edge
 		$result = GenericParametersAcceptorResolver::resolve(
 			$argTypes,
 			$parametersAcceptor,
@@ -462,4 +463,11 @@ public function testResolve(array $argTypes, ParametersAcceptor $parametersAccep
 		}
 	}
 
+	public static function getAdditionalConfigFiles(): array
+	{
+		return [
+			__DIR__ . '/../../../conf/bleedingEdge.neon',
+		];
+	}
+
 }