Allow special names in use statements

fixes #2
hhvm · Jun 23, 2017 · b94f265 · b94f265
1 parent ed8c88b
commit b94f265
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/consumers/ScopeConsumer.php b/src/consumers/ScopeConsumer.php
@@ -506,7 +506,7 @@ private function consumeUseStatement(): ImmMap<string, string> {
       $this->consumeWhitespace();
       list($token, $type) = $this->tq->shift();
 
-      if ($type === T_STRING) {
+      if (StringishTokens::isValid($type)) {
         $parts[] = $token;
         continue;
       } else if ($type === T_NS_SEPARATOR) {
@@ -641,7 +641,7 @@ private function consumeAlias(): string {
     }
 
     list($name, $type) = $this->tq->shift();
-    if($type !== T_STRING) {
+    if (!StringishTokens::isValid($type)) {
       invariant_violation(
         'Unexpected token %s',
         var_export($name, true),

diff --git a/tests/NamingTest.php b/tests/NamingTest.php
@@ -79,6 +79,22 @@ public function testSpecialNameAsNamespaceName(string $type): void {
     $this->assertNotNull($class);
   }
 
+  /** @dataProvider specialNameProvider */
+  public function testSpecialNameAsUsedName(string $type): void {
+    $data = '<?hh use Foo\\'.$type.'; class Herp extends '.$type.' { }';
+    $parser = FileParser::FromData($data);
+    $class = $parser->getClass('Herp');
+    $this->assertNotNull($class);
+  }
+
+  /** @dataProvider specialNameProvider */
+  public function testSpecialNameAsUsedAsName(string $type): void {
+    $data = '<?hh use Foo\\Bar as '.$type.'; class Herp extends '.$type.' { }';
+    $parser = FileParser::FromData($data);
+    $class = $parser->getClass('Herp');
+    $this->assertNotNull($class);
+  }
+
   public function testConstantCalledOn(): void {
     $data = '<?hh class Foo { const ON = 0; }';