From e50979080583f88ab24bc0e8ace06f18e3ebe028 Mon Sep 17 00:00:00 2001
From: "Barry vd. Heuvel" <barry@fruitcake.nl>
Date: Mon, 30 Dec 2024 12:03:45 +0100
Subject: [PATCH] Use forked ContextFactory (#1643)

* Use forked ContextFactory

* composer fix-style

* Trim slashes

---------

Co-authored-by: laravel-ide-helper <laravel-ide-helper@users.noreply.github.com>
---
 composer.json                 | 5 ++---
 src/Console/ModelsCommand.php | 6 ++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 23fad815b..edd6ef7e0 100644
--- a/composer.json
+++ b/composer.json
@@ -22,14 +22,13 @@
     "require": {
         "php": "^8.2",
         "ext-json": "*",
-        "barryvdh/reflection-docblock": "^2.2",
+        "barryvdh/reflection-docblock": "^2.3",
         "composer/class-map-generator": "^1.0",
         "illuminate/console": "^11.15",
         "illuminate/database": "^11.15",
         "illuminate/filesystem": "^11.15",
         "illuminate/support": "^11.15",
-        "nikic/php-parser": "^4.18 || ^5",
-        "phpdocumentor/type-resolver": "^1.1.0"
+        "nikic/php-parser": "^4.18 || ^5"
     },
     "require-dev": {
         "ext-pdo_sqlite": "*",
diff --git a/src/Console/ModelsCommand.php b/src/Console/ModelsCommand.php
index 1de5b91e9..aa9928284 100644
--- a/src/Console/ModelsCommand.php
+++ b/src/Console/ModelsCommand.php
@@ -16,6 +16,7 @@
 use Barryvdh\LaravelIdeHelper\Parsers\PhpDocReturnTypeParser;
 use Barryvdh\Reflection\DocBlock;
 use Barryvdh\Reflection\DocBlock\Context;
+use Barryvdh\Reflection\DocBlock\ContextFactory;
 use Barryvdh\Reflection\DocBlock\Serializer as DocBlockSerializer;
 use Barryvdh\Reflection\DocBlock\Tag;
 use Composer\ClassMapGenerator\ClassMapGenerator;
@@ -49,7 +50,6 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Illuminate\View\Factory as ViewFactory;
-use phpDocumentor\Reflection\Types\ContextFactory;
 use ReflectionClass;
 use ReflectionNamedType;
 use ReflectionObject;
@@ -1571,7 +1571,9 @@ protected function getClassNameInDestinationFile(object $model, string $classNam
      */
     protected function getUsedClassNames(ReflectionClass $reflection): array
     {
-        $namespaceAliases = array_flip((new ContextFactory())->createFromReflector($reflection)->getNamespaceAliases());
+        $namespaceAliases = array_flip(array_map(function ($alias) {
+            return ltrim($alias, '\\');
+        }, (new ContextFactory())->createFromReflector($reflection)->getNamespaceAliases()));
         $namespaceAliases[$reflection->getName()] = $reflection->getShortName();
 
         return $namespaceAliases;