Skip to content

Commit 4b3f6ec

Browse files
committed
Support namespaced classes for REDAXO 6
1 parent a9038eb commit 4b3f6ec

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

psalm.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,12 @@
1515
<directory name="vendor" />
1616
</ignoreFiles>
1717
</projectFiles>
18+
<issueHandlers>
19+
<UndefinedClass>
20+
<errorLevel type="suppress">
21+
<referencedClass name="Redaxo\Core\Http\Request" />
22+
<referencedClass name="Redaxo\Core\Util\Type" />
23+
</errorLevel>
24+
</UndefinedClass>
25+
</issueHandlers>
1826
</psalm>

src/Provider/RexTypeReturnProvider.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
use Psalm\Type\Atomic\TNull;
2121
use Psalm\Type\Atomic\TString;
2222
use Psalm\Type\Union;
23+
use Redaxo\Core\Http\Request;
24+
use Redaxo\Core\Util\Type as RedaxoType;
2325
use rex_request;
2426
use rex_type;
2527

@@ -33,7 +35,7 @@ final class RexTypeReturnProvider implements MethodReturnTypeProviderInterface,
3335
{
3436
public static function getClassLikeNames(): array
3537
{
36-
return [rex_type::class, rex_request::class];
38+
return [rex_type::class, rex_request::class, RedaxoType::class, Request::class];
3739
}
3840

3941
public static function getFunctionIds(): array
@@ -43,7 +45,7 @@ public static function getFunctionIds(): array
4345

4446
public static function getMethodReturnType(MethodReturnTypeProviderEvent $event): ?Union
4547
{
46-
if (rex_type::class === $event->getFqClasslikeName()) {
48+
if (in_array($event->getFqClasslikeName(), [rex_type::class, RedaxoType::class], true)) {
4749
if ('cast' === $event->getMethodNameLowercase()) {
4850
return self::resolveType($event->getCallArgs()[1]->value);
4951
}

0 commit comments

Comments
 (0)