Simplify Identical specification, add more tests

Author: herndlm

src/Analyser/TypeSpecifier.php

@@ -303,24 +303,20 @@ public function specifyTypesInCondition(
 			}
 
 			$identicalType = $scope->getType($expr);
-			if ($identicalType instanceof ConstantBooleanType && $context->false()) {
+			if ($identicalType instanceof ConstantBooleanType && !$context->null()) {
 				$never = new NeverType();
 				$contextForTypes = $identicalType->getValue() ? $context->negate() : $context;
 				$leftTypes = $this->create($expr->left, $never, $contextForTypes, false, $scope);
 				$rightTypes = $this->create($expr->right, $never, $contextForTypes, false, $scope);
 				return $leftTypes->unionWith($rightTypes);
 			}
 
-			if (
-				$expr->left instanceof Expr\Variable || $expr->right instanceof Expr\Variable
-				|| $expr->left instanceof Node\Scalar || $expr->right instanceof Node\Scalar
-			) {
+			if ($expr->left instanceof Expr\Variable || $expr->right instanceof Expr\Variable) {
 				if ($context->true()) {
 					$type = TypeCombinator::intersect($scope->getType($expr->right), $scope->getType($expr->left));
 					$leftTypes = $this->create($expr->left, $type, $context, false, $scope);
 					$rightTypes = $this->create($expr->right, $type, $context, false, $scope);
 					return $leftTypes->unionWith($rightTypes);
-
 				}
 
 				return $this->create($expr->left, $leftType, $context, false, $scope)->normalize($scope)
@@ -445,10 +441,7 @@ public function specifyTypesInCondition(
 			$leftTypes = $this->create($expr->left, $leftType, $context, false, $scope);
 			$rightTypes = $this->create($expr->right, $rightType, $context, false, $scope);
 
-			if (
-				$expr->left instanceof Expr\Variable || $expr->right instanceof Expr\Variable
-				|| $expr->left instanceof Node\Scalar || $expr->right instanceof Node\Scalar
-			) {
+			if ($expr->left instanceof Expr\Variable || $expr->right instanceof Expr\Variable) {
 				return $context->true()
 					? $leftTypes->unionWith($rightTypes)
 					: $leftTypes->normalize($scope)->intersectWith($rightTypes->normalize($scope));

tests/PHPStan/Rules/Comparison/ImpossibleCheckTypeMethodCallRuleTest.php

@@ -88,6 +88,30 @@ public function testRule(): void
 				'Call to method ImpossibleMethodCall\Foo::isNotSame() with \'foo\' and \'foo\' will always evaluate to false.',
 				104,
 			],
+			[
+				'Call to method ImpossibleMethodCall\Foo::isSame() with array{} and array{} will always evaluate to true.',
+				113,
+			],
+			[
+				'Call to method ImpossibleMethodCall\Foo::isNotSame() with array{} and array{} will always evaluate to false.',
+				116,
+			],
+			[
+				'Call to method ImpossibleMethodCall\Foo::isSame() with array{1, 3} and array{1, 3} will always evaluate to true.',
+				119,
+			],
+			[
+				'Call to method ImpossibleMethodCall\Foo::isNotSame() with array{1, 3} and array{1, 3} will always evaluate to false.',
+				122,
+			],
+			[
+				'Call to method ImpossibleMethodCall\Foo::isSame() with 1 and stdClass will always evaluate to false.',
+				126,
+			],
+			[
+				'Call to method ImpossibleMethodCall\Foo::isNotSame() with 1 and stdClass will always evaluate to true.',
+				130,
+			],
 		]);
 	}
 

tests/PHPStan/Rules/Comparison/data/impossible-method-call.php

@@ -109,6 +109,26 @@ public function doDolor(\stdClass $std1, \stdClass $std2)
 		}
 		if ($this->isNotSame(self::createStdClass('b')->foo, self::createStdClass('b')->foo)) {
 
+		}
+		if ($this->isSame([], [])) {
+
+		}
+		if ($this->isNotSame([], [])) {
+
+		}
+		if ($this->isSame([1, 3], [1, 3])) {
+
+		}
+		if ($this->isNotSame([1, 3], [1, 3])) {
+
+		}
+		$std3 = new \stdClass();
+		if ($this->isSame(1, $std3)) {
+
+		}
+		$std4 = new \stdClass();
+		if ($this->isNotSame(1, $std4)) {
+
 		}
 	}