Fix collectino with template types WIP

.phpactor.json

@@ -0,0 +1,5 @@
+{
+    "$schema": "/Users/stefan/.local/share/nvim/mason/packages/phpactor/phpactor.schema.json",
+    "language_server_psalm.enabled": true,
+    "language_server_php_cs_fixer.enabled": true
+}

src/Console/ModelsCommand.php

@@ -12,6 +12,7 @@
 namespace Barryvdh\LaravelIdeHelper\Console;
 
 use Barryvdh\LaravelIdeHelper\Contracts\ModelHookInterface;
+use Barryvdh\LaravelIdeHelper\helpers\PhpDocTypeParser;
 use Barryvdh\Reflection\DocBlock;
 use Barryvdh\Reflection\DocBlock\Context;
 use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
@@ -1262,7 +1263,8 @@ class ModelsCommand extends Command
         if ($phpdoc->hasTag('return')) {
             $returnTag = $phpdoc->getTagsByName('return')[0];
 
-            if ($typeAlias = $this->extractTypeAlias($returnTag->getContent(), $context->getNamespaceAliases())) {
+            $typeParser = new PhpDocTypeParser($returnTag->getContent(), $context->getNamespaceAliases());
+            if ($typeAlias = $typeParser->parse()) {
                 return $typeAlias;
             }
 
@@ -1272,27 +1274,6 @@ class ModelsCommand extends Command
         return $type;
     }
 
-    /**
-     * @param string $typeAlias
-     * @param array $namespaceAliases
-     * @return string|null
-     */
-    private function extractTypeAlias(string $typeAlias, array $namespaceAliases): string|null {
-        $matches = [];
-        preg_match('/(\w+)(<.*>)/', $typeAlias, $matches);
-        $matchCount = count($matches);
-
-        if ($matchCount === 0 || $matchCount === 1) {
-            return null;
-        }
-
-        if (empty($namespaceAliases[$matches[1]])) {
-            return null;
-        }
-
-        return $namespaceAliases[$matches[1]].($matches[2] ?? '');
-    }
-
     protected function getReturnTypeFromReflection(\ReflectionMethod $reflection): ?string
     {
         $returnType = $reflection->getReturnType();

src/helpers/PhpDocTypeParser.php

@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Barryvdh\LaravelIdeHelper\helpers;
+
+class PhpDocTypeParser
+{
+    /**
+     * @var string
+     */
+    private $typeAlias;
+
+    /**
+     * @var array
+     */
+    private $namespaceAliases;
+
+    /**
+     * @param string $typeAlias
+     * @param array $namespaceAliases
+     */
+    public function __construct(string $typeAlias, array $namespaceAliases)
+    {
+        $this->typeAlias = $typeAlias;
+        $this->namespaceAliases = $namespaceAliases;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function parse()
+    {
+        $matches = [];
+        preg_match('/(\w+)(<.*>)/', $this->typeAlias, $matches);
+        $matchCount = count($matches);
+
+        if ($matchCount === 0 || $matchCount === 1) {
+            return null;
+        }
+
+        if (empty($this->namespaceAliases[$matches[1]])) {
+            return null;
+        }
+
+        return $this->namespaceAliases[$matches[1]] . $this->parseTemplate($matches[2] ?? null);
+    }
+
+    /**
+     * @param string|null $template
+     * @return string
+     */
+    private function parseTemplate($template): string
+    {
+        if (!$template || $template === '') {
+            return '';
+        }
+
+        $matches = [];
+        preg_match_all('/\w+/', $template, $matches);
+        $types = array_unique($matches[0]);
+        foreach ($types as $type) {
+            $typeAlias = $this->namespaceAliases[$type] ?? $type;
+
+            dump($this->namespaceAliases, $typeAlias);
+            $template = preg_replace("/\W$type\W/", $typeAlias, $template);
+        }
+
+        return $template;
+    }
+}

tests/Console/ModelsCommand/GenerateMixinCollection/Models/WithCollection.php

@@ -2,29 +2,49 @@
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\Models;
 
+use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels\CollectionModel;
+use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels\NonModel;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Collection as IntCollection;
 
 class WithCollection extends Model
 {
+//    /**
+//     * @return Collection<int, string>
+//     */
+//    public function getCollectionAttribute(): Collection
+//    {
+//        return new Collection();
+//    }
+//
+//    /**
+//     * @return Collection
+//     */
+//    public function getCollectionWithoutTemplateAttribute(): Collection
+//    {
+//        return new Collection();
+//    }
+//
+//    public function getCollectionWithoutDocBlockAttribute(): Collection
+//    {
+//        return new Collection();
+//    }
+//
+//    /**
+//     * @return Collection<int, NonModel>
+//     */
+//    public function getCollectionWithNonModelTemplateAttribute(): Collection
+//    {
+//        return new Collection();
+//    }
+//
     /**
-     * @return Collection<int, string>
+     * @return Collection<Collection, CollectionModel<IntCollection, CollectionModel<int, NonModel>>>
      */
-    public function getCollectionAttribute(): Collection
+    public function getCollectionWithNestedTemplateAttribute(): Collection
     {
         return new Collection();
-    }
 
-    /**
-     * @return Collection
-     */
-    public function getCollectionWithoutTemplateAttribute(): Collection
-    {
-        return new Collection();
-    }
-
-    public function getCollectionWithoutDocBlockAttribute(): Collection
-    {
-        return new Collection();
     }
 }

tests/Console/ModelsCommand/GenerateMixinCollection/NonModels/CollectionModel.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels;
+
+class CollectionModel
+{
+
+}

tests/Console/ModelsCommand/GenerateMixinCollection/NonModels/NonModel.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels;
+
+class NonModel
+{
+
+}

tests/Console/ModelsCommand/GenerateMixinCollection/__snapshots__/Test__test__1.php

@@ -2,33 +2,53 @@
 
 namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\Models;
 
+use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels\CollectionModel;
+use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels\NonModel;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Collection as IntCollection;
 
 /**
  * @mixin IdeHelperWithCollection
  */
 class WithCollection extends Model
 {
+//    /**
+//     * @return Collection<int, string>
+//     */
+//    public function getCollectionAttribute(): Collection
+//    {
+//        return new Collection();
+//    }
+//
+//    /**
+//     * @return Collection
+//     */
+//    public function getCollectionWithoutTemplateAttribute(): Collection
+//    {
+//        return new Collection();
+//    }
+//
+//    public function getCollectionWithoutDocBlockAttribute(): Collection
+//    {
+//        return new Collection();
+//    }
+//
+//    /**
+//     * @return Collection<int, NonModel>
+//     */
+//    public function getCollectionWithNonModelTemplateAttribute(): Collection
+//    {
+//        return new Collection();
+//    }
+//
     /**
-     * @return Collection<int, string>
+     * @return Collection<Collection, CollectionModel<IntCollection, CollectionModel<int, NonModel>>>
      */
-    public function getCollectionAttribute(): Collection
+    public function getCollectionWithNestedTemplateAttribute(): Collection
     {
         return new Collection();
-    }
 
-    /**
-     * @return Collection
-     */
-    public function getCollectionWithoutTemplateAttribute(): Collection
-    {
-        return new Collection();
-    }
-
-    public function getCollectionWithoutDocBlockAttribute(): Collection
-    {
-        return new Collection();
     }
 }
 <?php
@@ -48,9 +68,7 @@ namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCol
 /**
  * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\Models\WithCollection
  *
- * @property-read \Illuminate\Support\Collection<int, string> $collection
+ * @property-read \Illuminate\Support\Collection\Illuminate\Support\Collection\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels\CollectionModelIntCollection,\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels\CollectionModelint,\Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\NonModels\NonModel>> $collection_with_nested_template
- * @property-read \Illuminate\Support\Collection $collection_without_doc_block
- * @property-read \Illuminate\Support\Collection $collection_without_template
  * @method static \Illuminate\Database\Eloquent\Builder|WithCollection newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WithCollection newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WithCollection query()