minor #6739 Simplified the BatchActionDto value resolver (javiereguiluz)

javiereguiluz · javiereguiluz · commit 4bfe80445bf8 · 2025-01-18T20:28:22.000+01:00
This PR was merged into the 5.x branch. Discussion ---------- Simplified the BatchActionDto value resolver The `ValueResolverInterface` was introduced in Symfony 6.2 (see symfony/symfony#47363), so we don't need to take care of the previous interface. Commits ------- 1d69f8d Simplified the BatchActionDto value resolver
diff --git a/src/ArgumentResolver/BatchActionDtoResolver.php b/src/ArgumentResolver/BatchActionDtoResolver.php
@@ -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)
+        );
     }
 }
