Fix

sonata-project · Dec 7, 2024 · 810d183 · 810d183
1 parent 3898fbb
commit 810d183
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/Event/BatchActionEvent.php b/src/Event/BatchActionEvent.php
@@ -32,11 +32,6 @@ final class BatchActionEvent extends Event
 {
     public const TYPE_PRE_BATCH_ACTION = 'pre_batch_action';
 
-    /**
-     * @var mixed[]
-     */
-    private readonly array $idx;
-
     /**
      * @param mixed[] $idx
      *
@@ -49,10 +44,9 @@ public function __construct(
         private readonly string $type,
         private readonly string $actionName,
         private readonly ProxyQueryInterface $proxyQuery,
-        array &$idx,
+        private array &$idx,
         private readonly bool $allElements,
     ) {
-        $this->idx = &$idx;
     }
 
     /**

diff --git a/src/EventListener/ConfigureCRUDControllerListener.php b/src/EventListener/ConfigureCRUDControllerListener.php
@@ -29,6 +29,13 @@ public function onKernelController(ControllerEvent $event): void
 
         if (\is_array($controller)) {
             $controller = $controller[0];
+        } else {
+            try {
+                $reflection = new \ReflectionFunction($controller(...));
+                $controller = $reflection->getClosureThis();
+            } catch (\ReflectionException) {
+                return;
+            }
         }
 
         if (!$controller instanceof CRUDController) {

diff --git a/src/Util/AdminObjectAclData.php b/src/Util/AdminObjectAclData.php
@@ -45,7 +45,7 @@ final class AdminObjectAclData
     /**
      * @param AdminInterface<object>             $admin
      * @param \Traversable<UserInterface|string> $aclUsers
-     * @param \Traversable<string>|null          $aclRoles
+     * @param \Traversable<string>               $aclRoles
      *
      * @phpstan-param class-string $maskBuilderClass
      */