incompatible-binary-operands

vimeo · May 21, 2024 · 149bfdc · 149bfdc
1 parent e0f3f8b
commit 149bfdc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOpAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOpAnalyzer.php
@@ -32,7 +32,6 @@
 use Psalm\Type\Atomic\TLiteralInt;
 use Psalm\Type\Atomic\TLiteralString;
 use Psalm\Type\Atomic\TNamedObject;
-use Psalm\Type\Atomic\TObject;
 use Psalm\Type\Union;
 use UnexpectedValueException;
 
@@ -261,8 +260,7 @@ public static function analyze(
             }
 
 
-            if (
-                $stmt instanceof PhpParser\Node\Expr\BinaryOp\Equal
+            if ($stmt instanceof PhpParser\Node\Expr\BinaryOp\Equal
                 || $stmt instanceof PhpParser\Node\Expr\BinaryOp\NotEqual
                 || $stmt instanceof PhpParser\Node\Expr\BinaryOp\Greater
                 || $stmt instanceof PhpParser\Node\Expr\BinaryOp\GreaterOrEqual
@@ -272,8 +270,7 @@ public static function analyze(
                 && $stmt_left_type
                 && $stmt_right_type
             ) {
-                if (
-                    ($stmt_left_type->hasObjectType() || $stmt_right_type->hasObjectType())
+                if (($stmt_left_type->hasObjectType() || $stmt_right_type->hasObjectType())
                     && (
                         !UnionTypeComparator::isContainedBy($codebase, $stmt_left_type, $stmt_right_type)
                         || !UnionTypeComparator::isContainedBy($codebase, $stmt_right_type, $stmt_left_type)

diff --git a/tests/PureAnnotationTest.php b/tests/PureAnnotationTest.php
@@ -225,6 +225,7 @@ public function __toString() {
                      * @psalm-pure
                      */
                     function foo(string $s, A $a) : string {
+                        /** @psalm-suppress InvalidOperand */
                         if ($a == $s) {}
                         return $s;
                     }',
@@ -778,6 +779,7 @@ public function __toString() {
                      * @psalm-pure
                      */
                     function foo(string $s, A $a) : string {
+                        /** @psalm-suppress InvalidOperand */
                         if ($a == $s) {}
                         return $s;
                     }',

diff --git a/tests/TypeReconciliation/ConditionalTest.php b/tests/TypeReconciliation/ConditionalTest.php
@@ -3283,6 +3283,7 @@ function getStrings(): array {
             'preventWeakEqualityToObject' => [
                 'code' => '<?php
                     function foo(int $i, stdClass $s) : void {
+                        /** @psalm-suppress InvalidOperand */
                         if ($i == $s) {}
                     }',
                 'error_message' => 'TypeDoesNotContainType',

diff --git a/tests/TypeReconciliation/RedundantConditionTest.php b/tests/TypeReconciliation/RedundantConditionTest.php
@@ -1346,6 +1346,7 @@ class A {}
                      * @param  A $a
                      */
                     function foo($a, $b) : void {
+                        /** @psalm-suppress InvalidOperand */
                         if ([] == $a) {}
                     }',
                 'error_message' => 'DocblockTypeContradiction',