Added a new index for the end token of the type, which helps with nam…

…espaced types
Mattlk13 · Aug 23, 2019 · abf7417 · abf7417
1 parent 19b7cc9
commit abf7417
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/Files/File.php b/src/Files/File.php
@@ -1627,6 +1627,8 @@ public function getMethodProperties($stackPtr)
      *    'type'            => string,  // The type of the var (empty if no type specifed).
      *    'type_token'      => integer, // The stack pointer to the start of the type
      *                                  // or FALSE if there is no type.
+     *    'type_end_token'  => integer, // The stack pointer to the end of the type
+     *                                  // or FALSE if there is no type.
      *    'nullable_type'   => boolean, // TRUE if the type is nullable.
      *   );
      * </code>
@@ -1732,6 +1734,7 @@ public function getMemberProperties($stackPtr)
 
         $type         = '';
         $typeToken    = false;
+        $typeEndToken = false;
         $nullableType = false;
 
         if ($i < $stackPtr) {
@@ -1755,6 +1758,7 @@ public function getMemberProperties($stackPtr)
                 }
 
                 if (isset($valid[$this->tokens[$i]['code']]) === true) {
+                    $typeEndToken = $i;
                     if ($typeToken === false) {
                         $typeToken = $i;
                     }
@@ -1774,6 +1778,7 @@ public function getMemberProperties($stackPtr)
             'is_static'       => $isStatic,
             'type'            => $type,
             'type_token'      => $typeToken,
+            'type_end_token'  => $typeEndToken,
             'nullable_type'   => $nullableType,
         ];
 

diff --git a/tests/Core/File/GetMemberPropertiesTest.php b/tests/Core/File/GetMemberPropertiesTest.php
@@ -83,6 +83,7 @@ public function testGetMemberProperties($identifier, $expected)
 
         $result = $this->phpcsFile->getMemberProperties($variable);
         unset($result['type_token']);
+        unset($result['type_end_token']);
         $this->assertSame($expected, $result);
 
     }//end testGetMemberProperties()