Type juggle a bit more in the factories

The conversion from PHP-Parser's node to an Expression needs to take
into account whether the provided parser is an Expression parser or the
usual Standard parser.

If it is an ExpressionParser, we can create a real Expression out of it

Author: mvriel

src/phpDocumentor/Reflection/Php/Argument.php

@@ -86,6 +86,10 @@ public function getType(): ?Type
      */
     public function getDefault(bool $asString = true)
     {
+        if ($this->default === null) {
+            return null;
+        }
+
         if ($asString) {
             trigger_error(
                 'The Default value will become of type Expression by default',

src/phpDocumentor/Reflection/Php/Constant.php

@@ -81,6 +81,10 @@ public function __construct(
      */
     public function getValue(bool $asString = true)
     {
+        if ($this->value === null) {
+            return null;
+        }
+
         if ($asString) {
             trigger_error(
                 'The expression value will become of type Expression by default',

src/phpDocumentor/Reflection/Php/EnumCase.php

@@ -90,6 +90,10 @@ public function getEndLocation(): Location
      */
     public function getValue(bool $asString = true)
     {
+        if ($this->value === null) {
+            return null;
+        }
+
         if ($asString) {
             trigger_error(
                 'The enum case value will become of type Expression by default',

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

@@ -75,19 +75,27 @@ protected function doCreate(
             ]
         );
 
-        $default = $object->default !== null ? $this->valueConverter->prettyPrintExpr($object->default) : null;
-        if ($this->valueConverter instanceof ExpressionPrinter) {
-            $default = new Expression($default, $this->valueConverter->getParts());
-        }
-
         $method->addArgument(
             new ArgumentDescriptor(
                 (string) $object->var->name,
                 (new Type())->fromPhpParser($object->type),
-                $default,
+                $this->determineDefault($object),
                 $object->byRef,
                 $object->variadic
             )
         );
     }
+
+    private function determineDefault(Param $value): ?Expression
+    {
+        $expression = $value->default !== null ? $this->valueConverter->prettyPrintExpr($value->default) : null;
+        if ($this->valueConverter instanceof ExpressionPrinter) {
+            $expression = new Expression($expression, $this->valueConverter->getParts());
+        }
+        if (is_string($expression)) {
+            $expression = new Expression($expression, []);
+        }
+
+        return $expression;
+    }
 }

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

@@ -76,17 +76,12 @@ protected function doCreate(
 
         $iterator = new PropertyIterator($object);
         foreach ($iterator as $stmt) {
-            $default = $object->default !== null ? $this->valueConverter->prettyPrintExpr($object->default) : null;
-            if ($this->valueConverter instanceof ExpressionPrinter) {
-                $default = new Expression($default, $this->valueConverter->getParts());
-            }
-
             $propertyContainer->addProperty(
                 new PropertyDescriptor(
                     $stmt->getFqsen(),
                     $this->buildVisibility($stmt),
                     $this->createDocBlock($stmt->getDocComment(), $context->getTypeContext()),
-                    $default,
+                    $this->determineDefault($stmt),
                     $stmt->isStatic(),
                     new Location($stmt->getLine()),
                     new Location($stmt->getEndLine()),
@@ -97,6 +92,21 @@ protected function doCreate(
         }
     }
 
+    private function determineDefault(PropertyIterator $value): ?Expression
+    {
+        $expression = $value->getDefault() !== null
+            ? $this->valueConverter->prettyPrintExpr($value->getDefault())
+            : null;
+        if ($this->valueConverter instanceof ExpressionPrinter) {
+            $expression = new Expression($expression, $this->valueConverter->getParts());
+        }
+        if (is_string($expression)) {
+            $expression = new Expression($expression, []);
+        }
+
+        return $expression;
+    }
+
     /**
      * Converts the visibility of the property to a valid Visibility object.
      */

src/phpDocumentor/Reflection/Php/Property.php

@@ -90,6 +90,10 @@ public function __construct(
      */
     public function getDefault(bool $asString = true)
     {
+        if ($this->default === null) {
+            return null;
+        }
+
         if ($asString) {
             trigger_error(
                 'The Default value will become of type Expression by default',

tests/unit/phpDocumentor/Reflection/Php/Factory/ArgumentTest.php

@@ -16,6 +16,7 @@
 use Mockery as m;
 use phpDocumentor\Reflection\Fqsen;
 use phpDocumentor\Reflection\Php\Argument as ArgumentDescriptor;
+use phpDocumentor\Reflection\Php\Expression\ExpressionPrinter;
 use phpDocumentor\Reflection\Php\Method as MethodElement;
 use phpDocumentor\Reflection\Php\ProjectFactoryStrategies;
 use PhpParser\Node\Expr\Variable;
@@ -40,7 +41,7 @@ class ArgumentTest extends TestCase
 {
     protected function setUp(): void
     {
-        $this->fixture = new Argument(new PrettyPrinter());
+        $this->fixture = new Argument(new ExpressionPrinter());
     }
 
     /**

tests/unit/phpDocumentor/Reflection/Php/Factory/PropertyTest.php

@@ -33,14 +33,16 @@
 use function next;
 
 /**
- * @uses \phpDocumentor\Reflection\Php\Factory\PropertyIterator
- * @uses \phpDocumentor\Reflection\Php\Property
+ * @uses PropertyIterator
+ * @uses PropertyDescriptor
  * @uses \phpDocumentor\Reflection\Php\Visibility
- * @uses \phpDocumentor\Reflection\Php\ProjectFactoryStrategies
- * @uses \phpDocumentor\Reflection\Php\Factory\Type
+ * @uses ProjectFactoryStrategies
+ * @uses Type
  *
  * @covers \phpDocumentor\Reflection\Php\Factory\Property
  * @covers \phpDocumentor\Reflection\Php\Factory\AbstractFactory
+ *
+ * @extends TestCase<Property>
  */
 final class PropertyTest extends TestCase
 {
@@ -63,9 +65,9 @@ public function testMatches(): void
     /** @dataProvider visibilityProvider */
     public function testCreateWithVisibility(int $input, string $expectedVisibility): void
     {
-        $constantStub = $this->buildPropertyMock($input);
+        $propertyStub = $this->buildPropertyMock($input);
 
-        $class = $this->performCreate($constantStub);
+        $class = $this->performCreate($propertyStub);
 
         $property = current($class->getProperties());
         $this->assertProperty($property, $expectedVisibility);

tests/unit/phpDocumentor/Reflection/Php/Factory/TestCase.php

@@ -27,8 +27,7 @@
  */
 abstract class TestCase extends MockeryTestCase
 {
-    /** @var ProjectFactoryStrategy */
-    protected $fixture;
+    protected ProjectFactoryStrategy $fixture;
 
     public static function createContext(?Context $typeContext = null): ContextStack
     {