Fix parsing global imports and grouped imports containing aliases

Author: thekid

ChangeLog.md

@@ -3,6 +3,11 @@ XP Reflection ChangeLog
 
 ## ?.?.? / ????-??-??
 
+* Fixed parsing global imports and grouped imports containing aliases,
+  which surfaced as either *Syntax error, unexpected token `as`* or
+  *Cannot use object of type PhpToken as array* errors
+  (@thekid)
+
 ### 2.13.3 / 2023-06-04
 
 * Fixed `lang.reflection.Constant::modifiers()` return type - @thekid

src/main/php/lang/meta/FromAttributes.class.php

@@ -1,5 +1,6 @@
 <?php namespace lang\meta;
 
+use PhpToken;
 use lang\reflection\Annotation;
 
 /**
@@ -61,43 +62,55 @@ public function ofParameter($method, $reflect) {
    * @return [:string]
    */
   public function imports($reflect) {
-    static $break= [T_CLASS => true, T_INTERFACE => true, T_TRAIT => true];
+    static $break= [T_CLASS => true, T_INTERFACE => true, T_TRAIT => true, 372 /* T_ENUM */ => true];
+    static $types= [T_WHITESPACE => true, 44 => true, 59 => true, 123 => true];
 
-    $tokens= \PhpToken::tokenize(file_get_contents($reflect->getFileName()));
+    $tokens= PhpToken::tokenize(file_get_contents($reflect->getFileName()));
     $imports= [];
     for ($i= 0, $s= sizeof($tokens); $i < $s; $i++) {
       if (isset($break[$tokens[$i]->id])) break;
       if (T_USE !== $tokens[$i]->id) continue;
 
-      $type= '';
-      for ($i+= 2; $i < $s, !(59 === $tokens[$i]->id || 123 === $tokens[$i]->id || T_WHITESPACE === $tokens[$i]->id); $i++) {
-        $type.= $tokens[$i]->text;
-      }
+      do {
+        $type= '';
+        for ($i+= 2; $i < $s, !isset($types[$tokens[$i]->id]); $i++) {
+          $type.= $tokens[$i]->text;
+        }
+
+        // Skip over whitespace
+        if (T_WHITESPACE === $tokens[$i]->id) $i++;
 
-      // use `lang\{Type, Primitive as P}` vs. `use lang\Primitive as P;` vs. `use lang\Primitive`
-      if (123 === $tokens[$i]->id) {
-        $alias= null;
-        $group= '';
-        for ($i+= 1; $i < $s; $i++) {
-          if (44 === $tokens[$i]->id) {
-            $imports[$alias ?? $group]= $type.$group;
-            $alias= null;
-            $group= '';
-          } else if (125 === $tokens[$i]->id) {
-            $imports[$alias ?? $group]= $type.$group;
-            break;
-          } else if (T_AS === $tokens[$i]->id) {
-            $i+= 2;
-            $alias= $tokens[$i][1];
-          } else if (T_WHITESPACE !== $tokens[$i]->id) {
-            $group.= $tokens[$i]->text;
+        // use `lang\{Type, Primitive as P}` vs. `use lang\Primitive as P;` vs. `use lang\Primitive`
+        if (123 === $tokens[$i]->id) {
+          $alias= null;
+          $group= '';
+          for ($i+= 1; $i < $s; $i++) {
+            if (44 === $tokens[$i]->id) {
+              $imports[$alias ?? $group]= $type.$group;
+              $alias= null;
+              $group= '';
+            } else if (125 === $tokens[$i]->id) {
+              $imports[$alias ?? $group]= $type.$group;
+              break;
+            } else if (T_AS === $tokens[$i]->id) {
+              $i+= 2;
+              $alias= $tokens[$i]->text;
+            } else if (T_WHITESPACE !== $tokens[$i]->id) {
+              $group.= $tokens[$i]->text;
+            }
           }
+        } else if (T_AS === $tokens[$i]->id) {
+          $i+= 2;
+          $imports[$tokens[$i]->text]= $type;
+        } else if (false === ($p= strrpos($type, '\\'))) {
+          $imports[$type]= null;
+        } else {
+          $imports[substr($type, strrpos($type, '\\') + 1)]= $type;
         }
-      } else if (T_AS === $tokens[++$i]->id) {
-        $imports[$tokens[$i + 2]->text]= $type;
-      } else {
-        $imports[substr($type, strrpos($type, '\\') + 1)]= $type;
-      }
+
+        // Skip over whitespace
+        if (T_WHITESPACE === $tokens[$i]->id) $i++;
+      } while (44 === $tokens[$i]->id);
     }
     return $imports;
   }
@@ -108,7 +121,7 @@ public function evaluate($reflect, $code) {
       $header.= 'namespace '.$namespace.';';
     }
     foreach ($this->imports($reflect) as $import => $type) {
-      $header.= 'use '.$type.' as '.$import.';';
+      $header.= $type ? "use {$type} as {$import};" : "use {$import};";
     }
 
     $f= eval($header.' return static function() { return '.$code.'; };');

src/test/php/lang/reflection/unittest/FromAttributesTest.class.php

@@ -0,0 +1,46 @@
+<?php namespace lang\reflection\unittest;
+
+use ReflectionClass, StdClass as Dynamic;
+use lang\meta\FromAttributes;
+use test\{Assert, Test, Ignore as Skip};
+use util\Comparison as WithComparison;
+
+class FromAttributesTest {
+
+  #[Test]
+  public function can_create() {
+    new FromAttributes();
+  }
+
+  #[Test]
+  public function imports() {
+    Assert::equals(
+      [
+        'ReflectionClass' => null,
+        'FromAttributes'  => FromAttributes::class,
+        'Dynamic'         => Dynamic::class,
+        'Assert'          => Assert::class,
+        'Test'            => Test::class,
+        'WithComparison'  => WithComparison::class,
+        'Skip'            => Skip::class,
+      ],
+      (new FromAttributes())->imports(new ReflectionClass(self::class))
+    );
+  }
+
+  #[Test]
+  public function evaluate_constant() {
+    Assert::equals(
+      ReflectionClass::IS_FINAL,
+      (new FromAttributes())->evaluate(new ReflectionClass(self::class), 'ReflectionClass::IS_FINAL')
+    );
+  }
+
+  #[Test]
+  public function evaluate_alias() {
+    Assert::equals(
+      new Dynamic(),
+      (new FromAttributes())->evaluate(new ReflectionClass(self::class), 'new Dynamic()')
+    );
+  }
+}