Merge branch 'master' into support-phpstan-syntax

Author: mspirkov

CHANGELOG.md

@@ -4,7 +4,8 @@ Yii Framework 2 apidoc extension Change Log
 3.0.9 under development
 -----------------------
 
-- no changes in this release.
+- Bug #338: Fix deprecation error `Using null as an array offset is deprecated, use an empty string instead` (mspirkov)
+- Enh #337: Log invalid tags (mspirkov)
 
 
 3.0.8 November 24, 2025

models/BaseDoc.php

@@ -11,6 +11,7 @@
 use phpDocumentor\Reflection\DocBlock\Tag;
 use phpDocumentor\Reflection\DocBlock\Tags\Deprecated;
 use phpDocumentor\Reflection\DocBlock\Tags\Generic;
+use phpDocumentor\Reflection\DocBlock\Tags\InvalidTag;
 use phpDocumentor\Reflection\DocBlock\Tags\Since;
 use phpDocumentor\Reflection\DocBlock\Tags\Template;
 use phpDocumentor\Reflection\FqsenResolver;
@@ -287,6 +288,19 @@ public function __construct($parent = null, $reflector = null, $context = null,
                     $this->psalmTypeImports[(string) $fqsen] = $psalmTypeImport;
                     unset($this->tags[$i]);
                 }
+            } elseif ($tag instanceof InvalidTag && $context !== null) {
+                $exception = $tag->getException();
+                $message = 'Invalid tag: ' . $tag->render() . '.';
+
+                if ($exception !== null) {
+                    $message .= ' Exception message: ' . $exception->getMessage();
+                }
+
+                $context->errors[] = [
+                    'line' => $this->startLine,
+                    'file' => $this->sourceFile,
+                    'message' => $message,
+                ];
             }
         }
 

models/Context.php

@@ -113,12 +113,8 @@ public function updateReferences()
     {
         // update all subclass references
         foreach ($this->classes as $class) {
-            if ($class->parentClass === null) {
-                continue;
-            }
-
             $className = $class->name;
-            while (isset($this->classes[$class->parentClass])) {
+            while ($class->parentClass !== null && isset($this->classes[$class->parentClass])) {
                 $class = $this->classes[$class->parentClass];
                 $class->subclasses[] = $className;
             }

tests/commands/ApiControllerTest.php

@@ -100,5 +100,15 @@ public function testGenerateBootstrap()
         $sourceFilesCount = count(FileHelper::findFiles($sourceFilesDir, ['recursive' => true]));
 
         $this->assertSame($sourceFilesCount, $filesCount);
+
+        $warningsContent = file_get_contents("{$outputPath}/warnings.txt");
+        // Remove the dynamic parts of the file paths
+        $warningsContent = preg_replace('/(\s*\[file\] => ).*(\/tests\/.*\.php)/', '$1$2', $warningsContent);
+        $this->assertMatchesTextSnapshot($warningsContent);
+
+        $errorsContent = file_get_contents("{$outputPath}/errors.txt");
+        // Remove the dynamic parts of the file paths
+        $errorsContent = preg_replace('/(\s*\[file\] => ).*(\/tests\/.*\.php)/', '$1$2', $errorsContent);
+        $this->assertMatchesTextSnapshot($errorsContent);
     }
 }