Merge pull request #334 from thekid/fix/original-attribute-names

Store original attribute names in DETAIL_TARGET_ANNO
xp-framework · Jul 22, 2023 · b114f3a · b114f3a
2 parents 5877fcf + e7afd6c
commit b114f3a
Show file tree

Hide file tree

Showing 4 changed files with 150 additions and 65 deletions.
diff --git a/src/main/php/lang/reflect/ClassParser.class.php b/src/main/php/lang/reflect/ClassParser.class.php
@@ -318,6 +318,7 @@ public function parseAnnotations($bytes, $context, $imports= [], $line= -1) {
           } else {
             $type= $this->type($tokens, $i, $context, $imports);
             $annotation= lcfirst(false === ($p= strrpos($type, '.')) ? $type : substr($type, $p + 1));
+            $annotations[1][$annotation]= $type;
             $param= null;
             $value= null;
             $state= 1;
@@ -582,7 +583,8 @@ public function parseDetails($bytes) {
               4,                              // "/**\n"
               strpos($comment, '* @')- 2      // position of first details token
             ))),
-            DETAIL_ANNOTATIONS  => $annotations[0]
+            DETAIL_ANNOTATIONS  => $annotations[0],
+            DETAIL_TARGET_ANNO  => $annotations[1]
           ];
           $annotations= [0 => [], 1 => []];
           $comment= '';
@@ -599,7 +601,7 @@ public function parseDetails($bytes) {
             $parsed= '';
           }
           $f= substr($tokens[$i][1], 1);
-          $details[0][$f]= [DETAIL_ANNOTATIONS => $annotations[0]];
+          $details[0][$f]= [DETAIL_ANNOTATIONS => $annotations[0], DETAIL_TARGET_ANNO  => $annotations[1]];
           $annotations= [0 => [], 1 => []];
           $matches= null;
           if ('' === $comment) break;
@@ -673,12 +675,14 @@ public function parseDetails($bytes) {
                 }
               }
             } else if (T_VARIABLE === $tokens[$i][0] && null !== $parsed) {
-              $details[1][$m][DETAIL_TARGET_ANNO][$tokens[$i][1]]= $this->parseAnnotations(
+              $annotations= $this->parseAnnotations(
                 $parsed,
                 $context,
                 $imports,
                 $tokens[$i][2] ?? -1
-              )[0];
+              );
+              $details[1][$m][DETAIL_TARGET_ANNO][$tokens[$i][1]]= $annotations[0];
+              $details[1][$m][DETAIL_TARGET_ANNO]+= $annotations[1];
               $parsed= null;
             }
           }

diff --git a/src/test/php/lang/unittest/AnnotationParsingTest.class.php b/src/test/php/lang/unittest/AnnotationParsingTest.class.php
@@ -213,7 +213,7 @@ public function multi_line_annotation() {
         'lang.unittest.SecondInterceptor',
       ]]], 1 => []],
       $this->parse("
-        #[Interceptors(['classes' => [
+        #[@interceptors(['classes' => [
           'lang.unittest.FirstInterceptor',
           'lang.unittest.SecondInterceptor',
         ]])]