Fix code style and tests

Author: jaapio

phpstan.neon

@@ -6,7 +6,6 @@ parameters:
     ignoreErrors:
 
         - '#Method phpDocumentor\\Reflection\\File\\LocalFile::md5\(\) should return string but returns string\|false\.#'
-        - '#Else branch is unreachable because ternary operator condition is always true\.#'
         #
         # all these $fqsen errors indicate the need for a decorator class around PhpParser\Node to hold the public $fqsen that Reflection is giving it)
         #

psalm-baseline.xml

@@ -29,6 +29,10 @@
     </MixedArgumentTypeCoercion>
   </file>
   <file src="src/phpDocumentor/Reflection/NodeVisitor/ElementNameResolver.php">
+    <DeprecatedClass>
+      <code><![CDATA[PropertyProperty::class]]></code>
+      <code><![CDATA[PropertyProperty::class]]></code>
+    </DeprecatedClass>
     <ImplicitToStringCast>
       <code><![CDATA[$node->name]]></code>
       <code><![CDATA[$node->name]]></code>
@@ -53,9 +57,6 @@
     <PossiblyUndefinedMethod>
       <code><![CDATA[addConstant]]></code>
     </PossiblyUndefinedMethod>
-    <RedundantCondition>
-      <code><![CDATA[$const->getValue() !== null]]></code>
-    </RedundantCondition>
   </file>
   <file src="src/phpDocumentor/Reflection/Php/Factory/ClassConstantIterator.php">
     <MixedReturnStatement>
@@ -115,11 +116,6 @@
       <code><![CDATA[$object->getAttribute('fqsen')]]></code>
     </MixedArgument>
   </file>
-  <file src="src/phpDocumentor/Reflection/Php/Factory/GlobalConstant.php">
-    <RedundantCondition>
-      <code><![CDATA[$const->getValue() !== null]]></code>
-    </RedundantCondition>
-  </file>
   <file src="src/phpDocumentor/Reflection/Php/Factory/GlobalConstantIterator.php">
     <MixedReturnStatement>
       <code><![CDATA[$this->constant->consts[$this->index]->getAttribute('fqsen')]]></code>

src/phpDocumentor/Reflection/NodeVisitor/ElementNameResolver.php

@@ -17,6 +17,7 @@
 use phpDocumentor\Reflection\Fqsen;
 use PhpParser\Node;
 use PhpParser\Node\Const_;
+use PhpParser\Node\PropertyItem;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassConst;
 use PhpParser\Node\Stmt\ClassMethod;
@@ -72,6 +73,7 @@ public function leaveNode(Node $node)
             case ClassMethod::class:
             case Trait_::class:
             case PropertyProperty::class:
+            case PropertyItem::class:
             case Node\PropertyItem::class:
             case ClassConst::class:
             case Const_::class:

src/phpDocumentor/Reflection/Php/Argument.php

@@ -38,7 +38,7 @@ public function __construct(
         /** @var string name of the Argument */
         private readonly string $name,
         Type|null $type = null,
-        /** @var string|null the default value for an argument or null if none is provided */
+        /** @var Expression|string|null the default value for an argument or null if none is provided */
         private Expression|string|null $default = null,
         /** @var bool whether the argument passes the parameter by reference instead of by value */
         private readonly bool $byReference = false,
@@ -53,7 +53,7 @@ public function __construct(
             trigger_error(
                 'Default values for arguments should be of type Expression, support for strings will be '
                 . 'removed in 7.x',
-                E_USER_DEPRECATED
+                E_USER_DEPRECATED,
             );
             $this->default = new Expression($this->default, []);
         }
@@ -74,8 +74,7 @@ public function getType(): Type|null
         return $this->type;
     }
 
-    /** */
-    public function getDefault(bool $asString = true): string|null
+    public function getDefault(bool $asString = true): Expression|string|null
     {
         if ($this->default === null) {
             return null;
@@ -84,7 +83,7 @@ public function getDefault(bool $asString = true): string|null
         if ($asString) {
             trigger_error(
                 'The Default value will become of type Expression by default',
-                E_USER_DEPRECATED
+                E_USER_DEPRECATED,
             );
 
             return (string) $this->default;

src/phpDocumentor/Reflection/Php/Constant.php

@@ -43,8 +43,6 @@ final class Constant implements Element, MetaDataContainerInterface, AttributeCo
 
     /**
      * Initializes the object.
-     *
-     * @param Expression|string|null $value
      */
     public function __construct(
         private readonly Fqsen $fqsen,
@@ -59,14 +57,16 @@ public function __construct(
         $this->endLocation = $endLocation ?: new Location(-1);
         $this->visibility = $visibility ?: new Visibility(Visibility::PUBLIC_);
 
-        if (is_string($this->value)) {
-            trigger_error(
-                'Constant values should be of type Expression, support for strings will be '
-                . 'removed in 6.x',
-                E_USER_DEPRECATED
-            );
-            $this->value = new Expression($this->value, []);
+        if (!is_string($this->value)) {
+            return;
         }
+
+        trigger_error(
+            'Constant values should be of type Expression, support for strings will be '
+            . 'removed in 6.x',
+            E_USER_DEPRECATED,
+        );
+        $this->value = new Expression($this->value, []);
     }
 
     /**
@@ -81,7 +81,7 @@ public function getValue(bool $asString = true): Expression|string|null
         if ($asString) {
             trigger_error(
                 'The expression value will become of type Expression by default',
-                E_USER_DEPRECATED
+                E_USER_DEPRECATED,
             );
 
             return (string) $this->value;

src/phpDocumentor/Reflection/Php/EnumCase.php

@@ -47,14 +47,16 @@ public function __construct(
 
         $this->location = $location;
         $this->endLocation = $endLocation;
-        if (is_string($this->value)) {
-            trigger_error(
-                'Expression values for enum cases should be of type Expression, support for strings will be '
-                . 'removed in 7.x',
-                E_USER_DEPRECATED
-            );
-            $this->value = new Expression($this->value, []);
+        if (!is_string($this->value)) {
+            return;
         }
+
+        trigger_error(
+            'Expression values for enum cases should be of type Expression, support for strings will be '
+            . 'removed in 7.x',
+            E_USER_DEPRECATED,
+        );
+        $this->value = new Expression($this->value, []);
     }
 
     #[Override]
@@ -96,7 +98,7 @@ public function getValue(bool $asString = true): Expression|string|null
         if ($asString) {
             trigger_error(
                 'The enum case value will become of type Expression by default',
-                E_USER_DEPRECATED
+                E_USER_DEPRECATED,
             );
 
             return (string) $this->value;

src/phpDocumentor/Reflection/Php/Expression.php

@@ -49,6 +49,8 @@
  *     for the definition of expressions in PHP.
  * @link https://www.rfc-editor.org/rfc/rfc6570 for more information on URI Templates.
  * @see ExpressionPrinter how an expression coming from PHP-Parser is transformed into an expression.
+ *
+ * @api
  */
 final class Expression
 {
@@ -82,9 +84,7 @@ public static function generatePlaceholder(string $name): string
         return '{{ PHPDOC' . md5($name) . ' }}';
     }
 
-    /**
-     * @param array<string, Fqsen|Type> $parts
-     */
+    /** @param array<string, Fqsen|Type> $parts */
     public function __construct(string $expression, array $parts = [])
     {
         Assert::notEmpty($expression);

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

@@ -16,6 +16,7 @@
 use phpDocumentor\Reflection\Fqsen;
 use phpDocumentor\Reflection\Php\Expression;
 use phpDocumentor\Reflection\Type;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Name;
 use PhpParser\PrettyPrinter\Standard;
 
@@ -50,9 +51,20 @@ protected function pName_FullyQualified(Name\FullyQualified $node): string
         return $placeholder;
     }
 
-    /**
-     * @return array<string, Fqsen|Type>
-     */
+    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+    protected function pExpr_ClassConstFetch(Expr\ClassConstFetch $node): string
+    {
+        $renderedName = parent::pObjectProperty($node->name);
+        $className = $node->class instanceof Name ? parent::pName($node->class) : $this->p($node->class);
+        $placeholder = Expression::generatePlaceholder($renderedName);
+        $this->parts[$placeholder] = new Fqsen(
+            '\\' . $className . '::' . $renderedName,
+        );
+
+        return $placeholder;
+    }
+
+    /** @return array<string, Fqsen|Type> */
     public function getParts(): array
     {
         return $this->parts;

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

@@ -19,9 +19,9 @@
 use phpDocumentor\Reflection\Php\Class_;
 use phpDocumentor\Reflection\Php\Constant as ConstantElement;
 use phpDocumentor\Reflection\Php\Enum_;
-use phpDocumentor\Reflection\Php\Factory\Reducer\Reducer;
 use phpDocumentor\Reflection\Php\Expression;
 use phpDocumentor\Reflection\Php\Expression\ExpressionPrinter;
+use phpDocumentor\Reflection\Php\Factory\Reducer\Reducer;
 use phpDocumentor\Reflection\Php\Interface_;
 use phpDocumentor\Reflection\Php\StrategyContainer;
 use phpDocumentor\Reflection\Php\Trait_;
@@ -109,7 +109,7 @@ protected function doCreate(
         return null;
     }
 
-    private function determineValue(ClassConstantIterator $value): Expression|null
+    private function determineValue(ClassConstantIterator $value): Expression
     {
         $expression = $this->valueConverter->prettyPrintExpr($value->getValue());
         if ($this->valueConverter instanceof ExpressionPrinter) {