Allow empty string parsing

vimeo · Dec 11, 2019 · 79f3a5d · 79f3a5d
1 parent 3a7dd61
commit 79f3a5d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/src/Psalm/Type.php b/src/Psalm/Type.php
@@ -812,7 +812,7 @@ public static function tokenize($string_type, $ignore_space = true)
             }
 
             if ($quote_char) {
-                if ($char === $quote_char && $i > 1 && !$escaped) {
+                if ($char === $quote_char && $i > 0 && !$escaped) {
                     $quote_char = null;
 
                     $type_tokens[$rtc][0] .= $char;

diff --git a/tests/TypeParseTest.php b/tests/TypeParseTest.php
@@ -834,6 +834,39 @@ public function testEnum()
         $this->assertSame($resolved_type->getId(), $docblock_type->getId());
     }
 
+    public function testEmptyString()
+    {
+        $docblock_type = Type::parseString('""|"admin"|"fun"');
+
+        $resolved_type = new Type\Union([
+            new Type\Atomic\TLiteralString(''),
+            new Type\Atomic\TLiteralString('admin'),
+            new Type\Atomic\TLiteralString('fun'),
+        ]);
+
+        $this->assertSame($resolved_type->getId(), $docblock_type->getId());
+
+        $docblock_type = Type::parseString('"admin"|""|"fun"');
+
+        $resolved_type = new Type\Union([
+            new Type\Atomic\TLiteralString('admin'),
+            new Type\Atomic\TLiteralString(''),
+            new Type\Atomic\TLiteralString('fun'),
+        ]);
+
+        $this->assertSame($resolved_type->getId(), $docblock_type->getId());
+
+        $docblock_type = Type::parseString('"admin"|"fun"|""');
+
+        $resolved_type = new Type\Union([
+            new Type\Atomic\TLiteralString('admin'),
+            new Type\Atomic\TLiteralString('fun'),
+            new Type\Atomic\TLiteralString(''),
+        ]);
+
+        $this->assertSame($resolved_type->getId(), $docblock_type->getId());
+    }
+
     /**
      * @return void
      */