Revert "Correct Psalm’s concept of string emptiness"

This reverts commit 331ce8e. It was too hasty
vimeo · Feb 3, 2021 · 03665b9 · 03665b9
1 parent 331ce8e
commit 03665b9
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 49 deletions.
diff --git a/src/Psalm/Internal/Codebase/Analyzer.php b/src/Psalm/Internal/Codebase/Analyzer.php
@@ -31,7 +31,7 @@
 use const PATHINFO_EXTENSION;
 
 /**
- * @psalm-type  TaggedCodeType = array<int, array{0: int, 1: string}>
+ * @psalm-type  TaggedCodeType = array<int, array{0: int, 1: non-empty-string}>
  *
  * @psalm-type  FileMapType = array{
  *      0: TaggedCodeType,
@@ -153,12 +153,12 @@ class Analyzer
     private $existing_issues = [];
 
     /**
-     * @var array<string, array<int, array{0: int, 1: string}>>
+     * @var array<string, array<int, array{0: int, 1: non-empty-string}>>
      */
     private $reference_map = [];
 
     /**
-     * @var array<string, array<int, array{0: int, 1: string}>>
+     * @var array<string, array<int, array{0: int, 1: non-empty-string}>>
      */
     private $type_map = [];
 
@@ -1161,7 +1161,7 @@ public function addNodeArgument(
         string $reference,
         int $argument_number
     ): void {
-        if (!$reference) {
+        if ($reference === '') {
             throw new \UnexpectedValueException('non-empty reference expected');
         }
 

diff --git a/src/Psalm/Internal/Codebase/Functions.php b/src/Psalm/Internal/Codebase/Functions.php
@@ -216,7 +216,7 @@ public function getFullyQualifiedFunctionNameFromString(string $function_name, S
         if ($function_name[0] === '\\') {
             $function_name = substr($function_name, 1);
 
-            if (!$function_name) {
+            if ($function_name === '') {
                 throw new \UnexpectedValueException('Malformed function name');
             }
 

diff --git a/src/Psalm/Internal/Type/Comparator/ScalarTypeComparator.php b/src/Psalm/Internal/Type/Comparator/ScalarTypeComparator.php
@@ -260,8 +260,7 @@ public static function isContainedBy(
 
         if ($container_type_part instanceof TNonEmptyString
             && $input_type_part instanceof TLiteralString
-            && ($input_type_part->value === ''
-                || $input_type_part->value === '0')
+            && $input_type_part->value === ''
         ) {
             return false;
         }

diff --git a/src/Psalm/Internal/Type/NegatedAssertionReconciler.php b/src/Psalm/Internal/Type/NegatedAssertionReconciler.php
@@ -362,6 +362,8 @@ private static function handleLiteralNegatedEquality(
 
                         $did_remove_type = true;
                     }
+                } elseif ($assertion === 'string()') {
+                    $existing_var_type->addType(new Type\Atomic\TNonEmptyString());
                 }
             } elseif ($scalar_type === 'string') {
                 $scalar_value = substr($assertion, $bracket_pos + 1, -1);

diff --git a/tests/Internal/Provider/FakeFileReferenceCacheProvider.php b/tests/Internal/Provider/FakeFileReferenceCacheProvider.php
@@ -47,8 +47,8 @@ class FakeFileReferenceCacheProvider extends \Psalm\Internal\Provider\FileRefere
      * @var array<
      *      string,
      *      array{
-     *          0: array<int, array{0: int, 1: string}>,
-     *          1: array<int, array{0: int, 1: string}>,
+     *          0: array<int, array{0: int, 1: non-empty-string}>,
+     *          1: array<int, array{0: int, 1: non-empty-string}>,
      *          2: array<int, array{0: int, 1: non-empty-string, 2: int}>
      *      }
      *  >
@@ -190,8 +190,8 @@ public function setAnalyzedMethodCache(array $analyzed_methods): void
      * @return array<
      *      string,
      *      array{
-     *          0: array<int, array{0: int, 1: string}>,
-     *          1: array<int, array{0: int, 1: string}>,
+     *          0: array<int, array{0: int, 1: non-empty-string}>,
+     *          1: array<int, array{0: int, 1: non-empty-string}>,
      *          2: array<int, array{0: int, 1: non-empty-string, 2: int}>
      *      }
      *  >
@@ -205,8 +205,8 @@ public function getFileMapCache(): array
      * @param array<
      *      string,
      *      array{
-     *          0: array<int, array{0: int, 1: string}>,
-     *          1: array<int, array{0: int, 1: string}>,
+     *          0: array<int, array{0: int, 1: non-empty-string}>,
+     *          1: array<int, array{0: int, 1: non-empty-string}>,
      *          2: array<int, array{0: int, 1: non-empty-string, 2: int}>
      *      }
      *  > $file_maps

diff --git a/tests/TypeReconciliation/ConditionalTest.php b/tests/TypeReconciliation/ConditionalTest.php
@@ -2411,7 +2411,7 @@ function splitDocLine($return_block)
                         return [$type];
                     }'
             ],
-            'SKIPPED-nonEmptyStringAfterLiteralCheck' => [
+            'nonEmptyStringAfterLiteralCheck' => [
                 '<?php
                     /**
                      * @param non-empty-string $greeting
@@ -2423,7 +2423,7 @@ function sayHi(string $greeting): void {
                     /** @var string */
                     $hello = "foo";
 
-                    if ($hello === "" || $hello === "0") {
+                    if ($hello === "") {
                         throw new \Exception("an empty string is not a greeting");
                     }
 

diff --git a/tests/TypeReconciliation/ValueTest.php b/tests/TypeReconciliation/ValueTest.php
@@ -1053,40 +1053,6 @@ function bar(string $s) : void {
                     }',
                 'error_message' => 'ArgumentTypeCoercion'
             ],
-            'zeroIsEmptyString' => [
-                '<?php
-                    /**
-                     * @param non-empty-string $s
-                     */
-                    function foo(string $s) : void {}
-
-                    foo("0");',
-                'error_message' => 'InvalidArgument'
-            ],
-            'notLiteralEmptyIsNotNotEmptyString' => [
-                '<?php
-                    /**
-                     * @param non-empty-string $s
-                     */
-                    function foo(string $s) : void {}
-
-                    function takesString(string $s) : void {
-                        if ($s !== "") {
-                            foo($s);
-                        }
-                    }',
-                'error_message' => 'ArgumentTypeCoercion'
-            ],
-            'nonEmptyStringCannotBeStringZero' => [
-                '<?php
-                    /**
-                     * @param non-empty-string $s
-                     */
-                    function foo(string $s) : void {
-                        if ($s === "0") {}
-                    }',
-                'error_message' => 'TypeDoesNotContainType'
-            ],
         ];
     }
 }