PhpReflection: fixed expanding to FQCN in bracketed namespace

Author: milo

src/DI/PhpReflection.php

@@ -188,7 +188,7 @@ public static function parseUseStatemenets($code, $forClass = NULL)
 		while (list(, $token) = each($tokens)) {
 			switch (is_array($token) ? $token[0] : $token) {
 				case T_NAMESPACE:
-					$namespace = self::fetch($tokens, [T_STRING, T_NS_SEPARATOR]) . '\\';
+					$namespace = ltrim(self::fetch($tokens, [T_STRING, T_NS_SEPARATOR]) . '\\', '\\');
 					$uses = [];
 					break;
 

tests/DI/PhpReflection.expandClassName.phpt

@@ -11,9 +11,11 @@ require __DIR__ . '/../bootstrap.php';
 
 
 require __DIR__ . '/files/expandClass.noNamespace.php';
+require __DIR__ . '/files/expandClass.inBracketedNamespace.php';
 require __DIR__ . '/files/expandClass.inNamespace.php';
 
 $rcTest = new \ReflectionClass(Test::class);
+$rcBTest = new \ReflectionClass(BTest::class);
 $rcFoo = new \ReflectionClass(Test\Space\Foo::class);
 $rcBar = new \ReflectionClass(Test\Space\Bar::class);
 
@@ -26,6 +28,8 @@ Assert::exception(function () use ($rcTest) {
 Assert::same('A', PhpReflection::expandClassName('A', $rcTest));
 Assert::same('A\B', PhpReflection::expandClassName('C', $rcTest));
 
+Assert::same('BTest', PhpReflection::expandClassName('BTest', $rcBTest));
+
 Assert::same('Test\Space\Foo', PhpReflection::expandClassName('self', $rcFoo));
 Assert::same('Test\Space\Foo', PhpReflection::expandClassName('Self', $rcFoo));
 Assert::same('Test\Space\Foo', PhpReflection::expandClassName('static', $rcFoo));

tests/DI/files/expandClass.inBracketedNamespace.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace {
+	class BTest {}
+}