Merge branch 'master' into update-gitattributes

Author: samdark

CHANGELOG.md

@@ -11,6 +11,7 @@ Yii Framework 2 apidoc extension Change Log
 - Bug #339: Fix the mechanism for replacing `static` with FQCN (mspirkov)
 - Bug #339: Fix processing of multidimensional arrays (mspirkov)
 - Enh #342: Remove unnecessary files from Composer package (mspirkov)
+- Enh #341: Add support for nullable types (mspirkov)
 
 
 3.0.8 November 24, 2025

renderers/BaseRenderer.php

@@ -30,6 +30,8 @@
 use phpDocumentor\Reflection\Types\InterfaceString;
 use phpDocumentor\Reflection\Types\Intersection;
 use phpDocumentor\Reflection\Types\Iterable_;
+use phpDocumentor\Reflection\Types\Null_;
+use phpDocumentor\Reflection\Types\Nullable;
 use phpDocumentor\Reflection\Types\Object_;
 use phpDocumentor\Reflection\Types\Self_;
 use phpDocumentor\Reflection\Types\Static_;
@@ -291,6 +293,11 @@ public function createTypeLink(
                     continue;
                 }
 
+                if ($type instanceof Nullable) {
+                    $links[] = $this->createTypeLink([$type->getActualType(), new Null_()]);
+                    continue;
+                }
+
                 if (($link = $this->createLinkByTypeWithGenerics($type, $context, $title, $options, $currentTypeDoc)) !== null) {
                     $links[] = $link;
                     continue;

tests/commands/__snapshots__/ApiControllerTest__testGenerateBootstrap__3.html

@@ -377,6 +377,11 @@ <h2>Public Methods</h2>
                     <td><a href="yiiunit-apidoc-data-api-animal-dog.html#getNonEmptyListWithoutGenerics()-detail">getNonEmptyListWithoutGenerics()</a></td>
                     <td></td>
                     <td><a href="yiiunit-apidoc-data-api-animal-dog.html">yiiunit\apidoc\data\api\animal\Dog</a></td>
+                </tr>
+                                                <tr class="">
+                    <td><a href="yiiunit-apidoc-data-api-animal-dog.html#getNullableString()-detail">getNullableString()</a></td>
+                    <td>Some description</td>
+                    <td><a href="yiiunit-apidoc-data-api-animal-dog.html">yiiunit\apidoc\data\api\animal\Dog</a></td>
                 </tr>
                                                 <tr class="">
                     <td><a href="yiiunit-apidoc-data-api-animal-dog.html#getObjectShapeWithStaticGeneric()-detail">getObjectShapeWithStaticGeneric()</a></td>
@@ -1102,6 +1107,51 @@ <h2>Method Details</h2>
 </span>{
     <span class="hljs-keyword">return</span> [];
 }
+</code>
+            </pre>
+        </div>
+    </div>
+            
+        </div>
+            <div class="">
+            <div class="detail-header h3">
+                <a class="tool-link" title="go to top"><span class="glyphicon glyphicon-arrow-up"></span></a>
+                <a class="tool-link hash" href="yiiunit-apidoc-data-api-animal-dog.html#getNullableString()-detail" title="direct link to this method"><span class="glyphicon icon-hash"></span></a>
+                
+                getNullableString()
+
+                <span class="detail-header-tag small">
+                    public                                                            method
+                                    </span>
+            </div>
+
+            
+            <div class="doc-description">
+                
+                <p><strong>Some description</strong></p>
+                                            </div>
+
+            <table class="detail-table table table-striped table-bordered table-hover">
+                <tr><td colspan="3" class="signature">
+<span class="signature-defs">public</span><span class="signature-type"><a href="https://www.php.net/language.types.string">string</a>|<a href="https://www.php.net/language.types.null">null</a></span><strong><a href="yiiunit-apidoc-data-api-animal-dog.html#getNullableString()-detail">getNullableString</a></strong> ( )</td></tr>
+
+                            </table>
+
+            
+            
+
+    <p>
+        <a class="btn btn-link" data-toggle="collapse" role="button" aria-expanded="false" aria-controls="collapseGetNullableString">
+            Source code
+        </a>
+    </p>
+    <div class="collapse">
+        <div class="card card-body">
+            <pre>
+                <code class="hljs php language-php"><span class="hljs-keyword">public</span><span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-title">getNullableString</span><span class="hljs-params">()</span>: ?<span class="hljs-title">string</span>
+</span>{
+    <span class="hljs-keyword">return</span><span class="hljs-keyword">null</span>;
+}
 </code>
             </pre>
         </div>

tests/data/api/animal/Dog.php

@@ -123,4 +123,12 @@ public function getObjectShapeWithStaticGeneric()
     public function getStaticOrNull()
     {
     }
+
+    /**
+     * Some description
+     */
+    public function getNullableString(): ?string
+    {
+        return null;
+    }
 }