Object names may not be present for all objects

moodlehq · Apr 2, 2024 · de8408f · de8408f
1 parent 95d2abd
commit de8408f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 5 deletions.
diff --git a/moodle/Tests/Util/TokenUtilTest.php b/moodle/Tests/Util/TokenUtilTest.php
@@ -38,9 +38,9 @@ class TokenUtilTest extends MoodleCSBaseTestCase
      */
     public function testGetObjectProperties(
         string $content,
-        int $type,
-        string $expectedType,
-        string $expectedName
+        $type,
+        ?string $expectedType,
+        ?string $expectedName
     ): void {
         $config = new Config([]);
         $ruleset = new Ruleset($config);
@@ -90,6 +90,19 @@ public static function objectPropertiesProvider(): array {
                 'function',
                 'exampleFunction',
             ],
+            'Unnamed anonymous class' => [
+                <<<EOF
+                <?php
+
+                return new class extends phpunit_coverage_info {
+                    /** @var array The list of folders relative to the plugin root to include in coverage generation. */
+                    protected \$includelistfolders = ['classes'];
+                };
+                EOF,
+                T_ANON_CLASS,
+                'class',
+                'anonymous class',
+            ],
         ];
 
         if (version_compare(PHP_VERSION, '8.1.0') >= 0) {

diff --git a/moodle/Util/TokenUtil.php b/moodle/Util/TokenUtil.php
@@ -46,17 +46,29 @@ public static function getObjectType(
      *
      * @param File $phpcsFile
      * @param int $stackPtr
-     * @return string
+     * @return null|string
      */
     public static function getObjectName(
         File $phpcsFile,
         int $stackPtr
-    ): string {
+    ): ?string {
         $tokens = $phpcsFile->getTokens();
+        if (!isset($tokens[$stackPtr])) {
+            return '';
+        }
+
         if ($tokens[$stackPtr]['code'] === T_OPEN_TAG) {
             return basename($phpcsFile->getFilename());
         }
 
+        if ($tokens[$stackPtr]['code'] === T_ANON_CLASS) {
+            return 'anonymous class';
+        }
+
+        if ($tokens[$stackPtr]['code'] === T_CLOSURE) {
+            return 'closure';
+        }
+
         return ObjectDeclarations::getName($phpcsFile, $stackPtr);
     }