Skip to content

Commit f6e4c9c

Browse files
committed
Simplified the AdminContext value resolver
1 parent c3c0fab commit f6e4c9c

File tree

1 file changed

+11
-34
lines changed

1 file changed

+11
-34
lines changed

src/ArgumentResolver/AdminContextResolver.php

Lines changed: 11 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,50 +6,27 @@
66
use EasyCorp\Bundle\EasyAdminBundle\Contracts\Provider\AdminContextProviderInterface;
77
use EasyCorp\Bundle\EasyAdminBundle\Provider\AdminContextProvider;
88
use Symfony\Component\HttpFoundation\Request;
9-
use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
109
use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
1110
use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
1211

1312
/*
1413
* @author Javier Eguiluz <javier.eguiluz@gmail.com>
1514
*/
16-
if (interface_exists(ValueResolverInterface::class)) {
17-
final class AdminContextResolver implements ValueResolverInterface
18-
{
19-
private AdminContextProvider $adminContextProvider;
20-
21-
public function __construct(AdminContextProviderInterface $adminContextProvider)
22-
{
23-
$this->adminContextProvider = $adminContextProvider;
24-
}
15+
final class AdminContextResolver implements ValueResolverInterface
16+
{
17+
private AdminContextProvider $adminContextProvider;
2518

26-
public function resolve(Request $request, ArgumentMetadata $argument): iterable
27-
{
28-
if (AdminContext::class !== $argument->getType()) {
29-
return [];
30-
}
31-
32-
yield $this->adminContextProvider->getContext();
33-
}
34-
}
35-
} else {
36-
final class AdminContextResolver implements ArgumentValueResolverInterface
19+
public function __construct(AdminContextProviderInterface $adminContextProvider)
3720
{
38-
private AdminContextProvider $adminContextProvider;
39-
40-
public function __construct(AdminContextProviderInterface $adminContextProvider)
41-
{
42-
$this->adminContextProvider = $adminContextProvider;
43-
}
21+
$this->adminContextProvider = $adminContextProvider;
22+
}
4423

45-
public function supports(Request $request, ArgumentMetadata $argument): bool
46-
{
47-
return AdminContext::class === $argument->getType();
24+
public function resolve(Request $request, ArgumentMetadata $argument): iterable
25+
{
26+
if (AdminContext::class !== $argument->getType()) {
27+
return [];
4828
}
4929

50-
public function resolve(Request $request, ArgumentMetadata $argument): iterable
51-
{
52-
yield $this->adminContextProvider->getContext();
53-
}
30+
yield $this->adminContextProvider->getContext();
5431
}
5532
}

0 commit comments

Comments
 (0)