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

@@ -72,6 +72,10 @@ public function getType(): Type|null
     /** */
     public function getDefault(bool $asString = true): string|null
     {
+        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

@@ -67,6 +67,10 @@ public function __construct(
      */
     public function getValue(bool $asString = true): Expression|string|null
     {
+        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

@@ -84,6 +84,10 @@ public function getEndLocation(): Location
      */
     public function getValue(bool $asString = true): Expression|string|null
     {
+        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/Property.php

@@ -20,7 +20,6 @@
 use phpDocumentor\Reflection\Php\Factory\Reducer\Reducer;
 use phpDocumentor\Reflection\Php\Expression;
 use phpDocumentor\Reflection\Php\Expression\ExpressionPrinter;
-use phpDocumentor\Reflection\Php\ProjectFactoryStrategy;
 use phpDocumentor\Reflection\Php\Property as PropertyDescriptor;
 use phpDocumentor\Reflection\Php\StrategyContainer;
 use phpDocumentor\Reflection\Php\Trait_;
@@ -77,11 +76,6 @@ 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());
-            }
-
             $property = PropertyBuilder::create(
                 $this->valueConverter,
                 $this->docBlockFactory,
@@ -92,7 +86,7 @@ protected function doCreate(
                 ->visibility($stmt)
                 ->type($stmt->getType())
                 ->docblock($stmt->getDocComment())
-                ->default($default)
+                ->default($this->determineDefault($stmt))
                 ->static($stmt->isStatic())
                 ->startLocation(new Location($stmt->getLine()))
                 ->endLocation(new Location($stmt->getEndLine()))
@@ -109,8 +103,24 @@ protected function doCreate(
             }
 
             $propertyContainer->addProperty($property);
+
+        }
+    }
+
+    private function determineDefault(PropertyIterator $value): Expression|null
+    {
+        $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 null;
+        return $expression;
     }
 }

src/phpDocumentor/Reflection/Php/Property.php

@@ -76,6 +76,10 @@ public function __construct(
      */
     public function getDefault(bool $asString = true): Expression|string|null
     {
+        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/PropertyTest.php

@@ -63,9 +63,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);