Context aware fqsen resolving on parameters

Author: jaapio

src/phpDocumentor/Reflection/Php/Expression/ExpressionPrinter.php

@@ -14,8 +14,10 @@
 namespace phpDocumentor\Reflection\Php\Expression;
 
 use phpDocumentor\Reflection\Fqsen;
+use phpDocumentor\Reflection\FqsenResolver;
 use phpDocumentor\Reflection\Php\Expression;
 use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\Types\Context;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Name;
 use PhpParser\PrettyPrinter\Standard;
@@ -24,6 +26,15 @@ final class ExpressionPrinter extends Standard
 {
     /** @var array<string, Fqsen|Type> */
     private array $parts = [];
+    private Context|null $context = null;
+    private FqsenResolver $fqsenResolver;
+
+    public function __construct(array $options = [])
+    {
+        parent::__construct($options);
+
+        $this->fqsenResolver = new FqsenResolver();
+    }
 
     protected function resetState(): void
     {
@@ -32,11 +43,18 @@ protected function resetState(): void
         $this->parts = [];
     }
 
+    public function prettyPrintExpr(Expr $node, Context|null $context = null): string
+    {
+        $this->context = $context;
+
+        return parent::prettyPrintExpr($node);
+    }
+
     protected function pName(Name $node): string
     {
-        $renderedName = parent::pName($node);
-        $placeholder = Expression::generatePlaceholder($renderedName);
-        $this->parts[$placeholder] = new Fqsen('\\' . $renderedName);
+        $renderedName = $this->fqsenResolver->resolve(parent::pName($node), $this->context);
+        $placeholder = Expression::generatePlaceholder((string) $renderedName);
+        $this->parts[$placeholder] = $renderedName;
 
         return $placeholder;
     }

src/phpDocumentor/Reflection/Php/Factory/PropertyBuilder.php

@@ -16,6 +16,7 @@
 use phpDocumentor\Reflection\Php\PropertyHook;
 use phpDocumentor\Reflection\Php\StrategyContainer;
 use phpDocumentor\Reflection\Php\Visibility;
+use phpDocumentor\Reflection\Types\Context;
 use PhpParser\Comment\Doc;
 use PhpParser\Modifiers;
 use PhpParser\Node;
@@ -163,7 +164,7 @@ public function build(ContextStack $context): PropertyElement
             $this->fqsen,
             $this->visibility,
             $this->docblock !== null ? $this->docBlockFactory->create($this->docblock->getText(), $context->getTypeContext()) : null,
-            $this->determineDefault(),
+            $this->determineDefault($context->getTypeContext()),
             $this->static,
             $this->startLocation,
             $this->endLocation,
@@ -346,9 +347,14 @@ private function buildHookVisibility(string $hookName, Visibility $propertyVisib
         };
     }
 
-    private function determineDefault(): Expression|null
+    private function determineDefault(Context|null $context): Expression|null
     {
-        $expression = $this->default !== null ? $this->valueConverter->prettyPrintExpr($this->default) : null;
+        if ($this->valueConverter instanceof ExpressionPrinter) {
+            $expression = $this->default !== null ? $this->valueConverter->prettyPrintExpr($this->default, $context) : null;
+        } else {
+            $expression = $this->default !== null ? $this->valueConverter->prettyPrintExpr($this->default) : null;
+        }
+
         if ($expression === null) {
             return null;
         }

src/phpDocumentor/Reflection/Php/Factory/Reducer/Parameter.php

@@ -14,6 +14,7 @@
 use phpDocumentor\Reflection\Php\Method;
 use phpDocumentor\Reflection\Php\PropertyHook;
 use phpDocumentor\Reflection\Php\StrategyContainer;
+use phpDocumentor\Reflection\Types\Context;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\FunctionLike;
 use PhpParser\Node\Param;
@@ -50,7 +51,7 @@ public function reduce(
                 new ArgumentDescriptor(
                     is_string($param->var->name) ? $param->var->name : $this->valueConverter->prettyPrintExpr($param->var->name),
                     (new Type())->fromPhpParser($param->type),
-                    $this->determineDefault($param),
+                    $this->determineDefault($param, $context->getTypeContext()),
                     $param->byRef,
                     $param->variadic,
                 ),
@@ -60,9 +61,14 @@ public function reduce(
         return $carry;
     }
 
-    private function determineDefault(Param $value): Expression|null
+    private function determineDefault(Param $value, Context|null $context): Expression|null
     {
-        $expression = $value->default !== null ? $this->valueConverter->prettyPrintExpr($value->default) : null;
+        if ($this->valueConverter instanceof ExpressionPrinter) {
+            $expression = $value->default !== null ? $this->valueConverter->prettyPrintExpr($value->default, $context) : null;
+        } else {
+            $expression = $value->default !== null ? $this->valueConverter->prettyPrintExpr($value->default) : null;
+        }
+
         if ($expression === null) {
             return null;
         }