BinaryPlusHandler

Author: ondrejmirtes

src/Analyser/Generator/ExprHandler/BinaryPlusHandler.php

@@ -0,0 +1,53 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Analyser\Generator\ExprHandler;
+
+use Generator;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\BinaryOp\Plus;
+use PhpParser\Node\Stmt;
+use PHPStan\Analyser\ExpressionContext;
+use PHPStan\Analyser\Generator\ExprAnalysisRequest;
+use PHPStan\Analyser\Generator\ExprAnalysisResult;
+use PHPStan\Analyser\Generator\ExprHandler;
+use PHPStan\Analyser\Generator\GeneratorScope;
+use PHPStan\Analyser\SpecifiedTypes;
+use PHPStan\DependencyInjection\AutowiredService;
+use PHPStan\Reflection\InitializerExprTypeResolver;
+use function array_merge;
+
+/**
+ * @implements ExprHandler<Plus>
+ */
+#[AutowiredService]
+final class BinaryPlusHandler implements ExprHandler
+{
+
+	public function __construct(private InitializerExprTypeResolver $initializerExprTypeResolver)
+	{
+	}
+
+	public function supports(Expr $expr): bool
+	{
+		return $expr instanceof Plus;
+	}
+
+	public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context, ?callable $alternativeNodeCallback): Generator
+	{
+		$leftResult = yield new ExprAnalysisRequest($stmt, $expr->left, $scope, $context, $alternativeNodeCallback);
+		$rightResult = yield new ExprAnalysisRequest($stmt, $expr->right, $leftResult->scope, $context, $alternativeNodeCallback);
+
+		return new ExprAnalysisResult(
+			$this->initializerExprTypeResolver->getPlusTypeFromTypes($expr->left, $expr->right, $leftResult->type, $rightResult->type),
+			$this->initializerExprTypeResolver->getPlusTypeFromTypes($expr->left, $expr->right, $leftResult->nativeType, $rightResult->nativeType),
+			$rightResult->scope,
+			hasYield: $leftResult->hasYield || $rightResult->hasYield,
+			isAlwaysTerminating: $leftResult->isAlwaysTerminating || $rightResult->isAlwaysTerminating,
+			throwPoints: array_merge($leftResult->throwPoints, $rightResult->throwPoints),
+			impurePoints: array_merge($leftResult->impurePoints, $rightResult->impurePoints),
+			specifiedTruthyTypes: new SpecifiedTypes(),
+			specifiedFalseyTypes: new SpecifiedTypes(),
+		);
+	}
+
+}

src/Reflection/InitializerExprTypeResolver.php

@@ -1337,6 +1337,11 @@ public function getPlusType(Expr $left, Expr $right, callable $getTypeCallback):
 		$leftType = $getTypeCallback($left);
 		$rightType = $getTypeCallback($right);
 
+		return $this->getPlusTypeFromTypes($left, $right, $leftType, $rightType);
+	}
+
+	public function getPlusTypeFromTypes(Expr $left, Expr $right, Type $leftType, Type $rightType): Type
+	{
 		if ($leftType instanceof NeverType || $rightType instanceof NeverType) {
 			return $this->getNeverType($leftType, $rightType);
 		}

tests/PHPStan/Analyser/Generator/data/gnsr.php

@@ -2,6 +2,7 @@
 
 namespace GeneratorNodeScopeResolverTest;
 
+use function PHPStan\Testing\assertNativeType;
 use function PHPStan\Testing\assertType;
 
 class Foo
@@ -18,6 +19,21 @@ public function doImplicitArrayCreation(): void
 		assertType('array{bla: 1}', $a);
 	}
 
+	/**
+	 * @param int $a
+	 * @param int $b
+	 * @return void
+	 */
+	public function doPlus($a, $b, int $c, int $d): void
+	{
+		assertType('int', $a + $b);
+		assertNativeType('(array|float|int)', $a + $b);
+		assertType('2', 1 + 1);
+		assertNativeType('2', 1 + 1);
+		assertType('int', $c + $d);
+		assertNativeType('int', $c + $d);
+	}
+
 }
 
 function (): void {