Support namespaced classes for REDAXO 6

redaxo · May 19, 2024 · 4b3f6ec · 4b3f6ec
1 parent a9038eb
commit 4b3f6ec
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/psalm.xml b/psalm.xml
@@ -15,4 +15,12 @@
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
+    <issueHandlers>
+        <UndefinedClass>
+            <errorLevel type="suppress">
+                <referencedClass name="Redaxo\Core\Http\Request" />
+                <referencedClass name="Redaxo\Core\Util\Type" />
+            </errorLevel>
+        </UndefinedClass>
+    </issueHandlers>
 </psalm>
diff --git a/src/Provider/RexTypeReturnProvider.php b/src/Provider/RexTypeReturnProvider.php
@@ -20,6 +20,8 @@
 use Psalm\Type\Atomic\TNull;
 use Psalm\Type\Atomic\TString;
 use Psalm\Type\Union;
+use Redaxo\Core\Http\Request;
+use Redaxo\Core\Util\Type as RedaxoType;
 use rex_request;
 use rex_type;
 
@@ -33,7 +35,7 @@ final class RexTypeReturnProvider implements MethodReturnTypeProviderInterface,
 {
     public static function getClassLikeNames(): array
     {
-        return [rex_type::class, rex_request::class];
+        return [rex_type::class, rex_request::class, RedaxoType::class, Request::class];
     }
 
     public static function getFunctionIds(): array
@@ -43,7 +45,7 @@ public static function getFunctionIds(): array
 
     public static function getMethodReturnType(MethodReturnTypeProviderEvent $event): ?Union
     {
-        if (rex_type::class === $event->getFqClasslikeName()) {
+        if (in_array($event->getFqClasslikeName(), [rex_type::class, RedaxoType::class], true)) {
             if ('cast' === $event->getMethodNameLowercase()) {
                 return self::resolveType($event->getCallArgs()[1]->value);
             }