Merge pull request #6064 from ElisDN/negative-numbers

Negative number literals
vimeo · Jul 8, 2021 · 04c9d60 · 04c9d60
2 parents bbbfa69 + 61b78e1
commit 04c9d60
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Type/TypeTokenizer.php b/src/Psalm/Internal/Type/TypeTokenizer.php
@@ -384,6 +384,10 @@ public static function getFullyQualifiedTokens(
                 continue;
             }
 
+            if ($string_type_token[0][0] === '-' && is_numeric($string_type_token[0])) {
+                continue;
+            }
+
             if (isset($type_tokens[$i + 1])
                 && $type_tokens[$i + 1][0] === ':'
                 && isset($type_tokens[$i - 1])

diff --git a/tests/MagicMethodAnnotationTest.php b/tests/MagicMethodAnnotationTest.php
@@ -703,6 +703,34 @@ public function __call($method, $attributes)
                         (new \Foo\G)->randomInt();
                     }'
             ],
+            'negativeInDefault' => [
+                '<?php
+                    /**
+                     * @method void foo($a = -0.1, $b = -12)
+                     */
+                    class G
+                    {
+                        public function __call(string $method, array $attributes): void
+                        {
+                        }
+                    }
+                    (new G)->foo();'
+            ],
+            'namespacedNegativeInDefault' => [
+                '<?php
+                    namespace Foo {
+                        /**
+                         * @method void foo($a = -0.1, $b = -12)
+                         */
+                        class G
+                        {
+                            public function __call(string $method, array $attributes): void
+                            {
+                            }
+                        }
+                        (new G)->foo();
+                    }'
+            ],
             'namespacedUnion' => [
                 '<?php
                     namespace Foo;

diff --git a/tests/TypeReconciliation/ValueTest.php b/tests/TypeReconciliation/ValueTest.php
@@ -607,6 +607,15 @@ class A {
                         private $type = "easy";
                     }'
             ],
+            'supportMultipleValues' => [
+                '<?php
+                    class A {
+                        /**
+                         * @var 0|-1|1
+                         */
+                        private $type = -1;
+                    }'
+            ],
             'typecastTrueToInt' => [
                 '<?php
                 /**