Merge pull request #68 from svandervlugt/types

Support nullable type declarations

Author: svandervlugt

src/Reflection/ReflectionClass.php

@@ -316,8 +316,8 @@ public function getProperties(): array
                 // otherwise final private $foo would be parsed and private final $bar
                 // would not be parsed.
                 //
-                // 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]);
+                // Skip T_STRING and "?" because if it exists, it must be 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/Reflection/ReflectionClassTest.php

@@ -111,6 +111,7 @@ public function fileProvider(): array
                     'public $nerf;',
                     'private $riet;',
                     'private $touw;',
+                    'private $sap;',
                 ],
             ],
             [
@@ -239,7 +240,7 @@ public function testClassNotFoundException(): void
         $class = new ReflectionClass(__DIR__ . '/fixtures/no_class.php');
         self::assertEquals('ThisNamespace', $class->getNamespace());
 
-        self::expectException(ClassDefinitionNotFoundException::class);
+        $this->expectException(ClassDefinitionNotFoundException::class);
 
         $class->getName();
     }
@@ -249,7 +250,7 @@ public function testEmptyFileClassNotFoundException(): void
         $class = new ReflectionClass(__DIR__ . '/fixtures/empty.php');
         self::assertEquals('', $class->getNamespace());
 
-        self::expectException(ClassDefinitionNotFoundException::class);
+        $this->expectException(ClassDefinitionNotFoundException::class);
 
         $class->getName();
     }
@@ -258,7 +259,7 @@ public function testBroken(): void
     {
         $class = new ReflectionClass(__DIR__ . '/fixtures/broken.php');
 
-        self::expectException(ClassDefinitionNotFoundException::class);
+        $this->expectException(ClassDefinitionNotFoundException::class);
 
         $class->getUseStatements();
     }

test/Reflection/fixtures/modifiers.php

@@ -19,4 +19,5 @@ class Boom {
     var $nerf;
     public static private final protected private $riet;
     private string $touw;
-}
+    private ?int $sap;
+}