Skip to content

Simplified the BatchActionDto value resolver #6739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
javiereguiluz merged 1 commit into from
Jan 18, 2025
Merged

Simplified the BatchActionDto value resolver #6739

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 17 additions & 52 deletions src/ArgumentResolver/BatchActionDtoResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,70 +5,35 @@
use EasyCorp\Bundle\EasyAdminBundle\Config\Option\EA;
use EasyCorp\Bundle\EasyAdminBundle\Contracts\Provider\AdminContextProviderInterface;
use EasyCorp\Bundle\EasyAdminBundle\Dto\BatchActionDto;
use EasyCorp\Bundle\EasyAdminBundle\Provider\AdminContextProvider;
use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGeneratorInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;

/*
* @author Javier Eguiluz <javier.eguiluz@gmail.com>
*/
if (interface_exists(ValueResolverInterface::class)) {
final class BatchActionDtoResolver implements ValueResolverInterface
{
public function __construct(
private readonly AdminContextProviderInterface $adminContextProvider,
) {
}

public function resolve(Request $request, ArgumentMetadata $argument): iterable
{
if (BatchActionDto::class !== $argument->getType()) {
return [];
}

if (null === $context = $this->adminContextProvider->getContext()) {
throw new \RuntimeException(sprintf('Some of your controller actions have type-hinted an argument with the "%s" class but that\'s only available for actions run to serve EasyAdmin requests. Remove the type-hint or make sure the action is part of an EasyAdmin request.', BatchActionDto::class));
}

yield new BatchActionDto(
$context->getRequest()->request->get(EA::BATCH_ACTION_NAME),
$context->getRequest()->request->all()[EA::BATCH_ACTION_ENTITY_IDS] ?? [],
$context->getRequest()->request->get(EA::ENTITY_FQCN),
$context->getRequest()->request->get(EA::BATCH_ACTION_CSRF_TOKEN)
);
}
final class BatchActionDtoResolver implements ValueResolverInterface
{
public function __construct(
private readonly AdminContextProviderInterface $adminContextProvider,
) {
}
} else {
final class BatchActionDtoResolver implements ArgumentValueResolverInterface
{
private AdminContextProvider $adminContextProvider;

public function __construct(AdminContextProviderInterface $adminContextProvider, AdminUrlGeneratorInterface $adminUrlGenerator)
{
$this->adminContextProvider = $adminContextProvider;
$this->adminUrlGenerator = $adminUrlGenerator;
public function resolve(Request $request, ArgumentMetadata $argument): iterable
{
if (BatchActionDto::class !== $argument->getType()) {
return [];
}

public function supports(Request $request, ArgumentMetadata $argument): bool
{
return BatchActionDto::class === $argument->getType();
if (null === $context = $this->adminContextProvider->getContext()) {
throw new \RuntimeException(sprintf('Some of your controller actions have type-hinted an argument with the "%s" class but that\'s only available for actions run to serve EasyAdmin requests. Remove the type-hint or make sure the action is part of an EasyAdmin request.', BatchActionDto::class));
}

public function resolve(Request $request, ArgumentMetadata $argument): iterable
{
if (null === $context = $this->adminContextProvider->getContext()) {
throw new \RuntimeException(sprintf('Some of your controller actions have type-hinted an argument with the "%s" class but that\'s only available for actions run to serve EasyAdmin requests. Remove the type-hint or make sure the action is part of an EasyAdmin request.', BatchActionDto::class));
}

yield new BatchActionDto(
$context->getRequest()->request->get(EA::BATCH_ACTION_NAME),
$context->getRequest()->request->all()[EA::BATCH_ACTION_ENTITY_IDS] ?? [],
$context->getRequest()->request->get(EA::ENTITY_FQCN),
$context->getRequest()->request->get(EA::BATCH_ACTION_CSRF_TOKEN)
);
}
yield new BatchActionDto(
$context->getRequest()->request->get(EA::BATCH_ACTION_NAME),
$context->getRequest()->request->all()[EA::BATCH_ACTION_ENTITY_IDS] ?? [],
$context->getRequest()->request->get(EA::ENTITY_FQCN),
$context->getRequest()->request->get(EA::BATCH_ACTION_CSRF_TOKEN)
);
}
}
Loading