PHP annotations should override typehints in generic @template

Author: kubk

src/Ast/DtoVisitor.php

@@ -108,7 +108,7 @@ private function createDtoType(Class_|Enum_ $node): void
                     $paramType = $param->type;
                     $paramName = $param->var->name;
 
-                    if ($paramType === null && $classMethodComments) {
+                    if ($classMethodComments) {
                         if ($classMethodCommentsParsed === null) {
                             $classMethodCommentsParsed = $this->phpDocTypeParser->parseMethodParams($classMethodComments);
                         }

tests/TypeScriptGeneratorTest.php

@@ -685,6 +685,41 @@ public function nestedGenericsSimpleType() {}
         $this->assertMatchesGeneratedTypeScriptApi($result);
     }
 
+    public function testGenericDtoWithArrayField(): void
+    {
+        $code = <<<'CODE'
+<?php
+
+use \Riverwaysoft\PhpConverter\ClassFilter\DtoEndpoint;
+use \Riverwaysoft\PhpConverter\ClassFilter\Dto;
+
+/**
+ * @template T
+ */
+#[Dto]
+class Paginated
+{
+    /**
+     * @param T[] $items
+     */
+    public function __construct(
+        public array $items,
+        public int $totalCount,
+        public int $pagesCount,
+        public int $page,
+    )
+    {
+    }
+}
+CODE;
+
+        $converter = new Converter([
+            new DtoVisitor(new PhpAttributeFilter('Dto')),
+        ]);
+        $result = $converter->convert([$code]);
+        $this->assertMatchesGeneratedTypeScriptApi($result);
+    }
+
     public function testApiClientGenerationWithApiPlatformLegacyResource(): void
     {
         $code = <<<'CODE'

tests/__snapshots__/TypeScriptGeneratorTest__testGenericDtoWithArrayField__1.ts

@@ -0,0 +1,18 @@
+// THE FILE WAS AUTOGENERATED USING PHP-CONVERTER. PLEASE DO NOT EDIT IT!
+
+import axios from 'axios';
+
+export type Paginated<T> = {
+  items: T[];
+  totalCount: number;
+  pagesCount: number;
+  page: number;
+};
+
+export type CollectionResponse<Resource extends {id: string}> = {
+  'hydra:member': Resource[];
+  'hydra:totalItems': number;
+  'hydra:view': { '@id': string; 'hydra:last': string };
+  'hydra:search': { 'hydra:mapping': any[] };
+  'hydra:last': string;
+};