GeneratorTypeSpecifier

Author: ondrejmirtes

src/Analyser/Generator/GeneratorTypeSpecifier.php

@@ -0,0 +1,49 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Analyser\Generator;
+
+use Fiber;
+use PhpParser\Node\Expr;
+use PHPStan\Analyser\Scope;
+use PHPStan\Analyser\SpecifiedTypes;
+use PHPStan\Analyser\TypeSpecifier;
+use PHPStan\Analyser\TypeSpecifierContext;
+use PHPStan\ShouldNotHappenException;
+use PHPStan\Type\Type;
+
+final class GeneratorTypeSpecifier implements TypeSpecifier
+{
+
+	public function __construct(
+		private SpecifiedTypesHelper $specifiedTypesHelper,
+	)
+	{
+	}
+
+	public function specifyTypesInCondition(Scope $scope, Expr $expr, TypeSpecifierContext $context): SpecifiedTypes
+	{
+		if (!$scope instanceof GeneratorScope) {
+			throw new ShouldNotHappenException();
+		}
+
+		/** @var ExprAnalysisResult $result */
+		$result = Fiber::suspend(ExprAnalysisRequest::createNoopRequest($expr, $scope));
+		if ($context->null()) {
+			return $result->specifiedNullTypes;
+		}
+		if ($context->truthy()) {
+			return $result->specifiedTruthyTypes;
+		}
+		if ($context->falsey()) {
+			return $result->specifiedFalseyTypes;
+		}
+
+		throw new ShouldNotHappenException('Unknown TypeSpecifierContext');
+	}
+
+	public function create(Expr $expr, Type $type, TypeSpecifierContext $context, Scope $scope): SpecifiedTypes
+	{
+		return $this->specifiedTypesHelper->create($expr, $type, $context);
+	}
+
+}

src/Analyser/Generator/SpecifiedTypesHelper.php

@@ -34,7 +34,7 @@ public function createDefaultSpecifiedFalseyTypes(Expr $expr): SpecifiedTypes
 		return $this->create($expr, $type, TypeSpecifierContext::createFalse())->setRootExpr($expr);
 	}
 
-	private function create(
+	public function create(
 		Expr $expr,
 		Type $type,
 		TypeSpecifierContext $context,

src/Analyser/TypeSpecifierFactory.php

@@ -2,6 +2,8 @@
 
 namespace PHPStan\Analyser;
 
+use PHPStan\Analyser\Generator\GeneratorTypeSpecifier;
+use PHPStan\Analyser\Generator\SpecifiedTypesHelper;
 use PHPStan\Broker\BrokerFactory;
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\Container;
@@ -18,7 +20,7 @@ final class TypeSpecifierFactory
 	public const METHOD_TYPE_SPECIFYING_EXTENSION_TAG = 'phpstan.typeSpecifier.methodTypeSpecifyingExtension';
 	public const STATIC_METHOD_TYPE_SPECIFYING_EXTENSION_TAG = 'phpstan.typeSpecifier.staticMethodTypeSpecifyingExtension';
 
-	public function __construct(private Container $container)
+	public function __construct(private Container $container, private bool $gnsr = false)
 	{
 	}
 
@@ -27,15 +29,22 @@ public function create(): TypeSpecifier
 		$functionTypeSpecifying = $this->container->getServicesByTag(self::FUNCTION_TYPE_SPECIFYING_EXTENSION_TAG);
 		$methodTypeSpecifying = $this->container->getServicesByTag(self::METHOD_TYPE_SPECIFYING_EXTENSION_TAG);
 		$staticMethodTypeSpecifying = $this->container->getServicesByTag(self::STATIC_METHOD_TYPE_SPECIFYING_EXTENSION_TAG);
-		$typeSpecifier = new LegacyTypeSpecifier(
-			$this->container->getByType(ExprPrinter::class),
-			$this->container->getByType(ReflectionProvider::class),
-			$this->container->getByType(PhpVersion::class),
-			$functionTypeSpecifying,
-			$methodTypeSpecifying,
-			$staticMethodTypeSpecifying,
-			$this->container->getParameter('rememberPossiblyImpureFunctionValues'),
-		);
+
+		if ($this->gnsr) {
+			$typeSpecifier = new GeneratorTypeSpecifier(
+				$this->container->getByType(SpecifiedTypesHelper::class),
+			);
+		} else {
+			$typeSpecifier = new LegacyTypeSpecifier(
+				$this->container->getByType(ExprPrinter::class),
+				$this->container->getByType(ReflectionProvider::class),
+				$this->container->getByType(PhpVersion::class),
+				$functionTypeSpecifying,
+				$methodTypeSpecifying,
+				$staticMethodTypeSpecifying,
+				$this->container->getParameter('rememberPossiblyImpureFunctionValues'),
+			);
+		}
 
 		foreach (array_merge(
 			$this->container->getServicesByTag(BrokerFactory::PROPERTIES_CLASS_REFLECTION_EXTENSION_TAG),

src/DependencyInjection/GnsrExtension.php

@@ -8,6 +8,7 @@
 use PHPStan\Analyser\Analyser;
 use PHPStan\Analyser\FileAnalyser;
 use PHPStan\Analyser\Generator\GeneratorNodeScopeResolver;
+use PHPStan\Analyser\Generator\GeneratorTypeSpecifier;
 use PHPStan\ShouldNotHappenException;
 use function getenv;
 
@@ -34,6 +35,18 @@ public function beforeCompile()
 			throw new ShouldNotHappenException();
 		}
 		$fileAnalyserDef->setArgument('nodeScopeResolver', '@' . GeneratorNodeScopeResolver::class);
+
+		$typeSpecifierDef = $builder->getDefinition('typeSpecifier');
+		if (!$typeSpecifierDef instanceof ServiceDefinition) {
+			throw new ShouldNotHappenException();
+		}
+		$typeSpecifierDef->setType(GeneratorTypeSpecifier::class);
+
+		$typeSpecifierFactoryDef = $builder->getDefinition('typeSpecifierFactory');
+		if (!$typeSpecifierFactoryDef instanceof ServiceDefinition) {
+			throw new ShouldNotHappenException();
+		}
+		$typeSpecifierFactoryDef->setArgument('gnsr', true);
 	}
 
 }