Retain left and right types in equal expression

phpstan · Mar 3, 2022 · 3dc9167 · 3dc9167
1 parent 2d52a5b
commit 3dc9167
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -434,6 +434,10 @@ public function specifyTypesInCondition(
 			) {
 				return $this->specifyTypesInCondition($scope, new Expr\BinaryOp\Identical($expr->left, $expr->right), $context);
 			}
+
+			$leftTypes = $this->create($expr->left, $leftType, $context, false, $scope);
+			$rightTypes = $this->create($expr->right, $rightType, $context, false, $scope);
+			return $context->true() ? $leftTypes->unionWith($rightTypes) : $leftTypes->normalize($scope)->intersectWith($rightTypes->normalize($scope));
 		} elseif ($expr instanceof Node\Expr\BinaryOp\NotEqual) {
 			return $this->specifyTypesInCondition(
 				$scope,

diff --git a/tests/PHPStan/Analyser/TypeSpecifierTest.php b/tests/PHPStan/Analyser/TypeSpecifierTest.php
@@ -22,7 +22,9 @@
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\ClassStringType;
 use PHPStan\Type\Constant\ConstantBooleanType;
+use PHPStan\Type\FloatType;
 use PHPStan\Type\Generic\GenericClassStringType;
+use PHPStan\Type\IntegerType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectType;
@@ -68,6 +70,8 @@ protected function setUp(): void
 		$this->scope = $this->scope->assignVariable('classString', new ClassStringType());
 		$this->scope = $this->scope->assignVariable('genericClassString', new GenericClassStringType(new ObjectType('Bar')));
 		$this->scope = $this->scope->assignVariable('object', new ObjectWithoutClassType());
+		$this->scope = $this->scope->assignVariable('int', new IntegerType());
+		$this->scope = $this->scope->assignVariable('float', new FloatType());
 	}
 
 	/**
@@ -1120,6 +1124,34 @@ public function dataCondition(): array
 					'$foo' => 'mixed~non-empty-string',
 				],
 			],
+			[
+				new Expr\BinaryOp\BooleanAnd(
+					$this->createFunctionCall('is_numeric', 'int'),
+					new Expr\BinaryOp\Equal(
+						new Variable('int'),
+						new Expr\Cast\Int_(new Variable('int')),
+					),
+				),
+				[
+					'$int' => 'int',
+					'(int) $int' => 'int',
+				],
+				[],
+			],
+			[
+				new Expr\BinaryOp\BooleanAnd(
+					$this->createFunctionCall('is_numeric', 'float'),
+					new Expr\BinaryOp\Equal(
+						new Variable('float'),
+						new Expr\Cast\Int_(new Variable('float')),
+					),
+				),
+				[
+					'$float' => 'float',
+					'(int) $float' => 'int',
+				],
+				[],
+			],
 		];
 	}