Make error message for truthy/falsy more accurate

vimeo · Feb 10, 2022 · b49b5f1 · b49b5f1
1 parent 547f11e
commit b49b5f1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Block/IfConditionalAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Block/IfConditionalAnalyzer.php
@@ -333,7 +333,7 @@ public static function handleParadoxicalCondition(
                 if ($type->from_docblock) {
                     IssueBuffer::maybeAdd(
                         new DocblockTypeContradiction(
-                            'Operand of type ' . $type->getId() . ' is always false',
+                            'Operand of type ' . $type->getId() . ' is always falsy',
                             new CodeLocation($statements_analyzer, $stmt),
                             $type->getId() . ' falsy'
                         ),
@@ -342,7 +342,7 @@ public static function handleParadoxicalCondition(
                 } else {
                     IssueBuffer::maybeAdd(
                         new TypeDoesNotContainType(
-                            'Operand of type ' . $type->getId() . ' is always false',
+                            'Operand of type ' . $type->getId() . ' is always falsy',
                             new CodeLocation($statements_analyzer, $stmt),
                             $type->getId() . ' falsy'
                         ),
@@ -355,7 +355,7 @@ public static function handleParadoxicalCondition(
                 if ($type->from_docblock) {
                     IssueBuffer::maybeAdd(
                         new RedundantConditionGivenDocblockType(
-                            'Operand of type ' . $type->getId() . ' is always true',
+                            'Operand of type ' . $type->getId() . ' is always truthy',
                             new CodeLocation($statements_analyzer, $stmt),
                             $type->getId() . ' falsy'
                         ),
@@ -364,7 +364,7 @@ public static function handleParadoxicalCondition(
                 } else {
                     IssueBuffer::maybeAdd(
                         new RedundantCondition(
-                            'Operand of type ' . $type->getId() . ' is always true',
+                            'Operand of type ' . $type->getId() . ' is always truthy',
                             new CodeLocation($statements_analyzer, $stmt),
                             $type->getId() . ' falsy'
                         ),

diff --git a/tests/JsonOutputTest.php b/tests/JsonOutputTest.php
@@ -144,7 +144,7 @@ function fooFoo(?string $a, ?string $b): void {
                         }
                     }',
                 'error_count' => 1,
-                'message' => 'Operand of type non-falsy-string is always true',
+                'message' => 'Operand of type non-falsy-string is always truthy',
                 'line' => 4,
                 'error' => '$b',
             ],

diff --git a/tests/TypeReconciliation/InArrayTest.php b/tests/TypeReconciliation/InArrayTest.php
@@ -313,7 +313,7 @@ function assertInArray($x, $y) {
 
                         return $x;
                     }',
-                'error_message' => 'DocblockTypeContradiction - src' . DIRECTORY_SEPARATOR . 'somefile.php:8:29 - Operand of type false is always false',
+                'error_message' => 'DocblockTypeContradiction - src' . DIRECTORY_SEPARATOR . 'somefile.php:8:29 - Operand of type false is always falsy',
             ],
             'assertNegatedInArrayOfNotIntersectingTypeTriggersRedundantCondition' => [
                 'code' => '<?php
@@ -329,7 +329,7 @@ function assertInArray($x, $y) {
 
                         throw new \Exception();
                     }',
-                'error_message' => 'RedundantConditionGivenDocblockType - src' . DIRECTORY_SEPARATOR . 'somefile.php:8:29 - Operand of type true is always true',
+                'error_message' => 'RedundantConditionGivenDocblockType - src' . DIRECTORY_SEPARATOR . 'somefile.php:8:29 - Operand of type true is always truthy',
             ],
             'assertInArrayOfNotIntersectingTypeTriggersDocblockTypeContradiction' => [
                 'code' => '<?php
@@ -345,7 +345,7 @@ function assertInArray($x, $y) {
 
                         throw new \Exception();
                     }',
-                'error_message' => 'DocblockTypeContradiction - src' . DIRECTORY_SEPARATOR . 'somefile.php:8:29 - Operand of type false is always false',
+                'error_message' => 'DocblockTypeContradiction - src' . DIRECTORY_SEPARATOR . 'somefile.php:8:29 - Operand of type false is always falsy',
             ],
             'assertInArrayOfNotIntersectingTypeReturnsTriggersDocblockTypeContradiction' => [
                 'code' => '<?php
@@ -361,7 +361,7 @@ function assertInArray($x, $y) {
 
                         throw new \Exception();
                     }',
-                'error_message' => 'DocblockTypeContradiction - src' . DIRECTORY_SEPARATOR . 'somefile.php:8:29 - Operand of type false is always false',
+                'error_message' => 'DocblockTypeContradiction - src' . DIRECTORY_SEPARATOR . 'somefile.php:8:29 - Operand of type false is always falsy',
                 'ignored_issues' => ['RedundantConditionGivenDocblockType'],
             ],
             'inArrayDetectType' => [