FIX Parse negative numbers in class spec

Before negative numbers was interpreted as possitive numbers.

Author: beerbohmdo

src/Core/ClassInfo.php

@@ -423,6 +423,7 @@ public static function parse_class_spec($classSpec)
         $bucketStack = [];
         $lastTokenWasNSSeparator = false;
         $currentKey = null;
+        $factor = 1;
 
         foreach ($tokens as $token) {
             // $forceResult used to allow null result to be detected
@@ -444,6 +445,8 @@ public static function parse_class_spec($classSpec)
                 // Treat service name separator as NS separator
                 $class .= '.';
                 $lastTokenWasNSSeparator = true;
+            } elseif ($token === '-') {
+                $factor = -1;
             } elseif ($lastTokenWasNSSeparator && is_array($token) && $token[0] === T_STRING) {
                 // Found another section of a namespaced class
                 $class .= $token[1];
@@ -471,11 +474,11 @@ public static function parse_class_spec($classSpec)
                         break;
 
                     case T_DNUMBER:
-                        $result = (double)$token[1];
+                        $result = ((double)$token[1]) * $factor;
                         break;
 
                     case T_LNUMBER:
-                        $result = (int)$token[1];
+                        $result = ((int)$token[1]) * $factor;
                         break;
 
                     case T_DOUBLE_ARROW:
@@ -550,6 +553,8 @@ public static function parse_class_spec($classSpec)
                     // Set the active bucket to be our newly-pushed, empty array
                     $bucket = &$bucket[$key];
                 }
+
+                $factor = 1;
             }
         }
 

tests/php/Core/ClassInfoTest.php

@@ -366,6 +366,30 @@ public function provideClassSpecCases()
                 'Foo\\Bar\\NamespacedClass.withmodifier(["and-arg" => true])',
                 ['Foo\\Bar\\NamespacedClass.withmodifier', [["and-arg" => true]]],
             ],
+            'Number' => [
+                'Foo(1)',
+                ['Foo', [1]]
+            ],
+            'Negative integer' => [
+                'Foo(-1)',
+                ['Foo', [-1]]
+            ],
+            'Negative integer in array' => [
+                'Foo([-1])',
+                ['Foo', [[-1]]]
+            ],
+            'Multiple integers' => [
+                'Foo(-1, 5, 4, -2)',
+                ['Foo', [-1, 5, 4, -2]]
+            ],
+            'Negative double' => [
+                'Foo(-1.5)',
+                ['Foo', [-1.5]]
+            ],
+            'Minus in strings' => [
+                'Foo("-")',
+                ['Foo', ['-']]
+            ],
         ];
     }
 }