Support type declarations on class properties (#67)

* Support type declarations on class properties
* PHP 7.4 and above do not round to -0

Author: janlam7

src/Reflection/ReflectionClass.php

@@ -311,11 +311,13 @@ public function getProperties(): array
                 // Seek forward, skipping static, if it was found and check if we
                 // really have a property here, otherwise confine and try to find more
                 // properties.
-
-                // We also skip final, to improve error handling and consistent behaviour,
+                //
+                // Skip final, to improve error handling and consistent behaviour,
                 // otherwise final private $foo would be parsed and private final $bar
                 // would not be parsed.
-                $var_loc = $tokens->next($vis_loc, [T_COMMENT, T_WHITESPACE, T_STATIC, T_FINAL]);
+                //
+                // Skip T_STRING because if it exists, it must contain a type declaration.
+                $var_loc = $tokens->next($vis_loc, [T_COMMENT, T_WHITESPACE, T_STATIC, T_FINAL, T_STRING]);
                 if ($tokens->type($var_loc) !== T_VARIABLE) {
                     continue;
                 }

test/Generator/DecimalTest.php

@@ -18,7 +18,6 @@ public function setup(): void
     {
         $this->inflector = InflectorFactory::create()->build();
     }
-
     private function getTestValues($scale, $precision): iterable
     {
         $values    = [];
@@ -179,7 +178,21 @@ public function roundProvider(): iterable
     {
         $huge = str_repeat('1', 35) . '.' . str_repeat('5', 29);
 
-        return [
+        if (version_compare(PHP_VERSION, '7.4.0') >= 0) {
+            $test_set = [
+                ['decimal_18_20', -1.0E-30, '0.000000000000000000'],
+                ['decimal_19_20', -1.0E-20, '0.0000000000000000000'],
+                ['decimal_30_65', -1.6E-130, '0.000000000000000000000000000000'],
+            ];
+        } else { // before php 7.4.0
+            $test_set = [
+                ['decimal_18_20', -1.0E-30, '-0.000000000000000000'],
+                ['decimal_19_20', -1.0E-20, '-0.0000000000000000000'],
+                ['decimal_30_65', -1.6E-130, '-0.000000000000000000000000000000'],
+            ];
+        }
+
+        $test_set = array_merge($test_set, [
             ['decimal_0_10', .5, '1'],
             ['decimal_0_10', .499, '0'],
             ['decimal_0_10',  1, '1'],
@@ -204,22 +217,21 @@ public function roundProvider(): iterable
             ['decimal_10_10', 1.0E-30, '0.0000000000'],
 
             ['decimal_18_20',  1.0E-30, '0.000000000000000000'],
-            ['decimal_18_20',  -1.0E-30, '-0.000000000000000000'],
             ['decimal_18_20',  '12.3456789012345678915', '12.345678901234567892'],
             ['decimal_18_20',  '-12.3456789012345678915', '-12.345678901234567892'],
 
             ['decimal_19_20',  1.0E-30, '0.0000000000000000000'],
-            ['decimal_19_20',  -1.0E-20, '-0.0000000000000000000'],
             ['decimal_19_20',  '1.23456789012345678915', '1.2345678901234567892'],
             ['decimal_19_20',  '-1.23456789012345678915', '-1.2345678901234567892'],
 
             ['decimal_30_65',  1.0E-20, '0.000000000000000000010000000000'],
             ['decimal_30_65',  1.6E-130, '0.000000000000000000000000000000'],
-            ['decimal_30_65',  -1.6E-130, '-0.000000000000000000000000000000'],
             ['decimal_30_65',  $huge . '54', $huge . '5'],
             ['decimal_30_65',  $huge . '55', $huge . '6'],
             ['decimal_30_65',  '-' . $huge . '55', '-' . $huge . '6'],
-        ];
+        ]);
+
+        return $test_set;
     }
 
    /**

test/Reflection/ReflectionClassTest.php

@@ -110,6 +110,7 @@ public function fileProvider(): array
                     'public $kruin;',
                     'public $nerf;',
                     'private $riet;',
+                    'private $touw;',
                 ],
             ],
             [

test/Reflection/fixtures/modifiers.php

@@ -18,4 +18,5 @@ class Boom {
     public $kruin static;
     var $nerf;
     public static private final protected private $riet;
+    private string $touw;
 }