Skip to content

Commit 1d1b0c9

Browse files
committed
Adjusted Resolver supports method
1 parent e1c5513 commit 1d1b0c9

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/bundle/Controller/Content/ContentTreeController.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
use Ibexa\Contracts\Core\Repository\Values\Content\Content;
2424
use Ibexa\Contracts\Core\Repository\Values\Content\Location;
2525
use Ibexa\Contracts\Core\Repository\Values\Content\Query;
26-
use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;
2726
use Ibexa\Contracts\Core\Repository\Values\User\Limitation;
2827
use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
2928
use Ibexa\Rest\Message;

src/bundle/ControllerArgumentResolver/ContentTreeChildrenQueryArgumentResolver.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
namespace Ibexa\Bundle\AdminUi\ControllerArgumentResolver;
1010

11-
use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;
1211
use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalAnd;
12+
use Ibexa\Contracts\Core\Repository\Values\Content\Query\CriterionInterface;
1313
use Ibexa\Contracts\Rest\Input\Parser\Query\Criterion\CriterionProcessorInterface;
1414
use Symfony\Component\HttpFoundation\Request;
1515
use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
@@ -34,7 +34,11 @@ public function __construct(
3434

3535
public function supports(Request $request, ArgumentMetadata $argument): bool
3636
{
37-
return Criterion::class === $argument->getType()
37+
if ($argument->getType() === null) {
38+
return false;
39+
}
40+
41+
return is_a($argument->getType(), CriterionInterface::class, true)
3842
&& 'filter' === $argument->getName();
3943
}
4044

0 commit comments

Comments
 (0)