Use ExprHandler to resolve expr type

Author: ondrejmirtes

src/Analyser/DirectInternalScopeFactory.php

@@ -4,6 +4,7 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Fiber\FiberScope;
+use PHPStan\DependencyInjection\Container;
 use PHPStan\DependencyInjection\Type\DynamicReturnTypeExtensionRegistryProvider;
 use PHPStan\DependencyInjection\Type\ExpressionTypeResolverExtensionRegistryProvider;
 use PHPStan\Node\Printer\ExprPrinter;
@@ -24,6 +25,7 @@ final class DirectInternalScopeFactory implements InternalScopeFactory
 	 * @param callable(Node $node, Scope $scope): void|null $nodeCallback
 	 */
 	public function __construct(
+		private Container $container,
 		private ReflectionProvider $reflectionProvider,
 		private InitializerExprTypeResolver $initializerExprTypeResolver,
 		private DynamicReturnTypeExtensionRegistryProvider $dynamicReturnTypeExtensionRegistryProvider,
@@ -69,6 +71,7 @@ public function create(
 		}
 
 		return new $className(
+			$this->container,
 			$this,
 			$this->reflectionProvider,
 			$this->initializerExprTypeResolver,
@@ -107,6 +110,7 @@ public function create(
 	public function toFiberFactory(): InternalScopeFactory
 	{
 		return new self(
+			$this->container,
 			$this->reflectionProvider,
 			$this->initializerExprTypeResolver,
 			$this->dynamicReturnTypeExtensionRegistryProvider,
@@ -129,6 +133,7 @@ public function toFiberFactory(): InternalScopeFactory
 	public function toMutatingFactory(): InternalScopeFactory
 	{
 		return new self(
+			$this->container,
 			$this->reflectionProvider,
 			$this->initializerExprTypeResolver,
 			$this->dynamicReturnTypeExtensionRegistryProvider,

src/Analyser/DirectInternalScopeFactoryFactory.php

@@ -3,6 +3,7 @@
 namespace PHPStan\Analyser;
 
 use PhpParser\Node;
+use PHPStan\DependencyInjection\Container;
 use PHPStan\DependencyInjection\Type\DynamicReturnTypeExtensionRegistryProvider;
 use PHPStan\DependencyInjection\Type\ExpressionTypeResolverExtensionRegistryProvider;
 use PHPStan\Node\Printer\ExprPrinter;
@@ -20,6 +21,7 @@ final class DirectInternalScopeFactoryFactory implements InternalScopeFactoryFac
 	 * @param int|array{min: int, max: int}|null $configPhpVersion
 	 */
 	public function __construct(
+		private Container $container,
 		private ReflectionProvider $reflectionProvider,
 		private InitializerExprTypeResolver $initializerExprTypeResolver,
 		private DynamicReturnTypeExtensionRegistryProvider $dynamicReturnTypeExtensionRegistryProvider,
@@ -44,6 +46,7 @@ public function __construct(
 	public function create(?callable $nodeCallback): DirectInternalScopeFactory
 	{
 		return new DirectInternalScopeFactory(
+			$this->container,
 			$this->reflectionProvider,
 			$this->initializerExprTypeResolver,
 			$this->dynamicReturnTypeExtensionRegistryProvider,

src/Analyser/ExprHandler/ExitHandler.php

@@ -13,6 +13,8 @@
 use PHPStan\Analyser\MutatingScope;
 use PHPStan\Analyser\NodeScopeResolver;
 use PHPStan\DependencyInjection\AutowiredService;
+use PHPStan\Type\NonAcceptingNeverType;
+use PHPStan\Type\Type;
 use function array_merge;
 
 /**
@@ -56,4 +58,12 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 		);
 	}
 
+	/**
+	 * @param Exit_ $expr
+	 */
+	public function resolveType(MutatingScope $scope, Expr $expr): Type
+	{
+		return new NonAcceptingNeverType();
+	}
+
 }

src/Analyser/ExprHandler/ThrowHandler.php

@@ -13,6 +13,8 @@
 use PHPStan\Analyser\MutatingScope;
 use PHPStan\Analyser\NodeScopeResolver;
 use PHPStan\DependencyInjection\AutowiredService;
+use PHPStan\Type\NonAcceptingNeverType;
+use PHPStan\Type\Type;
 
 /**
  * @implements ExprHandler<Throw_>
@@ -43,4 +45,12 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 		);
 	}
 
+	/**
+	 * @param Throw_ $expr
+	 */
+	public function resolveType(MutatingScope $scope, Expr $expr): Type
+	{
+		return new NonAcceptingNeverType();
+	}
+
 }

src/Analyser/LazyInternalScopeFactory.php

@@ -106,6 +106,7 @@ public function create(
 		$this->attributeReflectionFactory ??= $this->container->getByType(AttributeReflectionFactory::class);
 
 		return new $className(
+			$this->container,
 			$this,
 			$this->reflectionProvider,
 			$this->initializerExprTypeResolver,

src/Analyser/MutatingScope.php

@@ -35,6 +35,7 @@
 use PHPStan\Analyser\Traverser\InstanceOfClassTypeTraverser;
 use PHPStan\Analyser\Traverser\TransformStaticTypeTraverser;
 use PHPStan\Analyser\Traverser\VoidToNullTraverser;
+use PHPStan\DependencyInjection\Container;
 use PHPStan\Node\ExecutionEndNode;
 use PHPStan\Node\Expr\AlwaysRememberedExpr;
 use PHPStan\Node\Expr\ExistingArrayDimFetch;
@@ -168,6 +169,7 @@
 use function is_string;
 use function ltrim;
 use function md5;
+use function method_exists;
 use function sprintf;
 use function str_decrement;
 use function str_increment;
@@ -221,6 +223,7 @@ class MutatingScope implements Scope, NodeCallbackInvoker
 	 * @param list<array{MethodReflection|FunctionReflection|null, ParameterReflection|null}> $inFunctionCallsStack
 	 */
 	public function __construct(
+		private Container $container,
 		protected InternalScopeFactory $scopeFactory,
 		private ReflectionProvider $reflectionProvider,
 		private InitializerExprTypeResolver $initializerExprTypeResolver,
@@ -1083,8 +1086,17 @@ private function resolveType(string $exprString, Expr $node): Type
 			}
 		}
 
-		if ($node instanceof Expr\Exit_ || $node instanceof Expr\Throw_) {
-			return new NonAcceptingNeverType();
+		/** @var ExprHandler<Expr> $exprHandler */
+		foreach ($this->container->getServicesByTag(ExprHandler::EXTENSION_TAG) as $exprHandler) {
+			if (!$exprHandler->supports($node)) {
+				continue;
+			}
+
+			if (!method_exists($exprHandler, 'resolveType')) {
+				continue;
+			}
+
+			return $exprHandler->resolveType($this, $node);
 		}
 
 		if (

src/Testing/PHPStanTestCase.php

@@ -155,6 +155,7 @@ public static function createScopeFactory(ReflectionProvider $reflectionProvider
 
 		return new ScopeFactory(
 			new DirectInternalScopeFactoryFactory(
+				$container,
 				$reflectionProvider,
 				$initializerExprTypeResolver,
 				$container->getByType(DynamicReturnTypeExtensionRegistryProvider::class),