Merge pull request #736 from lacatoire/feat/typed-constants-support-6x

Add support for PHP 8.3 typed class constants

Author: jaapio

.github/workflows/dependabot-auto-merge.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: "Dependabot metadata"
         id: "metadata"
-        uses: "dependabot/fetch-metadata@v2.4.0"
+        uses: "dependabot/fetch-metadata@v2.5.0"
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: "Enable auto-merge for Dependabot PRs"

.github/workflows/documentation.yaml

@@ -19,7 +19,7 @@ jobs:
 
       - name: "Deploy"
         if: "${{ github.event_name == 'push' && github.ref == 'refs/heads/6.x' }}"
-        uses: "actions/upload-artifact@v5"
+        uses: "actions/upload-artifact@v7"
         with:
           name: "documentation"
           path: "build/docs"

composer.lock

@@ -225,8 +225,5 @@
     <ClassMustBeFinal>
       <code><![CDATA[NamespaceNodeToContext]]></code>
     </ClassMustBeFinal>
-    <MixedArgumentTypeCoercion>
-      <code><![CDATA[$this->aliasesToFullyQualifiedNames($namespace)]]></code>
-    </MixedArgumentTypeCoercion>
   </file>
 </files>

psalm-baseline.xml

@@ -19,6 +19,7 @@
 use phpDocumentor\Reflection\Fqsen;
 use phpDocumentor\Reflection\Location;
 use phpDocumentor\Reflection\Metadata\MetaDataContainer as MetaDataContainerInterface;
+use phpDocumentor\Reflection\Type;
 
 use function is_string;
 use function trigger_error;
@@ -52,6 +53,7 @@ public function __construct(
         Location|null $endLocation = null,
         Visibility|null $visibility = null,
         private readonly bool $final = false,
+        private readonly Type|null $type = null,
     ) {
         $this->location = $location ?: new Location(-1);
         $this->endLocation = $endLocation ?: new Location(-1);
@@ -135,4 +137,9 @@ public function isFinal(): bool
     {
         return $this->final;
     }
+
+    public function getType(): Type|null
+    {
+        return $this->type;
+    }
 }

src/phpDocumentor/Reflection/Php/Constant.php

@@ -86,7 +86,10 @@ protected function pExpr_ClassConstFetch(Expr\ClassConstFetch $node): string
     {
         $renderedName = parent::pObjectProperty($node->name);
 
-        if ($node->class instanceof Name) {
+        if ($node->class instanceof Name\FullyQualified) {
+            $className = parent::pName_FullyQualified($node->class);
+            $className = $this->typeResolver->resolve($className, $this->context);
+        } elseif ($node->class instanceof Name) {
             $className = parent::pName($node->class);
             $className = $this->typeResolver->resolve($className, $this->context);
         } else {

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

@@ -93,6 +93,7 @@ protected function doCreate(
                 new Location($const->getEndLine()),
                 $this->buildVisibility($const),
                 $const->isFinal(),
+                (new Type())->fromPhpParser($const->getType(), $context->getTypeContext()),
             );
 
             foreach ($this->reducers as $reducer) {