add nested_attributes property on tokens inside an attribute

Author: alekitto

src/Tokenizers/PHP.php

@@ -2147,6 +2147,8 @@ protected function processAdditional()
             echo "\t*** START ADDITIONAL PHP PROCESSING ***".PHP_EOL;
         }
 
+        $this->createAttributesNestingMap();
+
         $numTokens = count($this->tokens);
         for ($i = ($numTokens - 1); $i >= 0; $i--) {
             // Check for any unset scope conditions due to alternate IF/ENDIF syntax.
@@ -3209,4 +3211,41 @@ private function parsePhpAttribute(array &$tokens, $stackPtr)
     }//end parsePhpAttribute()
 
 
+    /**
+     * Creates a map for the attributes tokens that surround other tokens.
+     *
+     * @return void
+     */
+    private function createAttributesNestingMap()
+    {
+        $map = [];
+        for ($i = 0; $i < $this->numTokens; $i++) {
+            if (isset($this->tokens[$i]['attribute_opener']) === true
+                && $i === $this->tokens[$i]['attribute_opener']
+            ) {
+                if (empty($map) === false) {
+                    $this->tokens[$i]['nested_attributes'] = $map;
+                }
+
+                if (isset($this->tokens[$i]['attribute_closer']) === true) {
+                    $map[$this->tokens[$i]['attribute_opener']]
+                        = $this->tokens[$i]['attribute_closer'];
+                }
+            } else if (isset($this->tokens[$i]['attribute_closer']) === true
+                && $i === $this->tokens[$i]['attribute_closer']
+            ) {
+                array_pop($map);
+                if (empty($map) === false) {
+                    $this->tokens[$i]['nested_attributes'] = $map;
+                }
+            } else {
+                if (empty($map) === false) {
+                    $this->tokens[$i]['nested_attributes'] = $map;
+                }
+            }//end if
+        }//end for
+
+    }//end createAttributesNestingMap()
+
+
 }//end class

tests/Core/Tokenizer/AttributesTest.php

@@ -465,19 +465,33 @@ public function testNestedAttributes()
         $this->assertSame($tokens[$attribute]['attribute_opener'], $tokens[$closer]['attribute_opener']);
         $this->assertSame($tokens[$attribute]['attribute_closer'], $tokens[$closer]['attribute_closer']);
 
-        $test = function (array $tokens, $length) use ($attribute) {
+        $this->assertArrayNotHasKey('nested_attributes', $tokens[$attribute]);
+        $this->assertArrayHasKey('nested_attributes', $tokens[($attribute + 8)]);
+        $this->assertSame([$attribute => ($attribute + 24)], $tokens[($attribute + 8)]['nested_attributes']);
+
+        $test = function (array $tokens, $length, $nestedMap) use ($attribute) {
             foreach ($tokens as $token) {
                 $this->assertArrayHasKey('attribute_closer', $token);
                 $this->assertSame(($attribute + $length), $token['attribute_closer']);
+                $this->assertSame($nestedMap, $token['nested_attributes']);
             }
         };
 
-        $test(array_slice($tokens, ($attribute + 1), 7), 24);
+        $test(array_slice($tokens, ($attribute + 1), 7), 24, [$attribute => $attribute + 24]);
+        $test(array_slice($tokens, ($attribute + 8), 1), 8 + 5, [$attribute => $attribute + 24]);
 
         // Length here is 8 (nested attribute offset) + 5 (real length).
-        $test(array_slice($tokens, ($attribute + 8), 6), 8 + 5);
+        $test(
+            array_slice($tokens, ($attribute + 9), 4),
+            8 + 5,
+            [
+                $attribute     => $attribute + 24,
+                $attribute + 8 => $attribute + 13,
+            ]
+        );
 
-        $test(array_slice($tokens, ($attribute + 14), 11), 24);
+        $test(array_slice($tokens, ($attribute + 13), 1), 8 + 5, [$attribute => $attribute + 24]);
+        $test(array_slice($tokens, ($attribute + 14), 10), 24, [$attribute => $attribute + 24]);
 
         $map = array_map(
             static function ($token) {