Fix array shapes with groups

sonata-project · Dec 6, 2020 · fc4c26f · fc4c26f
1 parent ad8a050
commit fc4c26f
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 8 deletions.
diff --git a/src/Admin/Pool.php b/src/Admin/Pool.php
@@ -38,6 +38,23 @@ class Pool
 
     /**
      * @var array
+     * @phpstan-var array<string, array{
+     *  label: string,
+     *  label_catalogue: string,
+     *  icon: string,
+     *  item_adds: array,
+     *  items: array<array-key, array{
+     *      admin?: string,
+     *      label?: string,
+     *      roles: list<string>,
+     *      route?: string,
+     *      router_absolute: bool,
+     *      route_params: array<string, string>
+     *  }>,
+     *  keep_open: bool,
+     *  on_top: bool,
+     *  roles: list<string>
+     * }>
      */
     protected $adminGroups = [];
 
@@ -136,9 +153,6 @@ public function __construct(
         $this->propertyAccessor = $propertyAccessor;
     }
 
-    /**
-     * @return array<string, array<string, AdminInterface>>
-     */
     public function getGroups()
     {
         $groups = $this->adminGroups;
@@ -166,6 +180,16 @@ public function hasGroup($group)
 
     /**
      * @return array
+     * @phpstan-return array<string, array{
+     *  label: string,
+     *  label_catalogue: string,
+     *  icon: string,
+     *  item_adds: array,
+     *  items: array<array-key, AdminInterface>,
+     *  keep_open: bool,
+     *  on_top: bool,
+     *  roles: list<string>
+     * }>
      */
     public function getDashboardGroups()
     {
@@ -449,6 +473,24 @@ public function getContainer()
     }
 
     /**
+     * @phpstan-param array<string, array{
+     *  label: string,
+     *  label_catalogue: string,
+     *  icon: string,
+     *  item_adds: array,
+     *  items: array<array-key, array{
+     *      admin?: string,
+     *      label?: string,
+     *      roles: list<string>,
+     *      route?: string,
+     *      router_absolute: bool,
+     *      route_params: array<string, string>
+     *  }>,
+     *  keep_open: bool,
+     *  on_top: bool,
+     *  roles: list<string>
+     * }> $adminGroups
+     *
      * @return void
      */
     public function setAdminGroups(array $adminGroups)

diff --git a/src/Twig/Extension/GroupExtension.php b/src/Twig/Extension/GroupExtension.php
@@ -44,13 +44,16 @@ public function getFunctions(): array
     }
 
     /**
-     * @phpstan-return array{array{
-     *  roles: list<string>,
-     *  icon: string,
+     * @phpstan-return array<array{
      *  label: string,
      *  label_catalogue: string,
-     *  items: AdminInterface[]
-     * }}
+     *  icon: string,
+     *  item_adds: array,
+     *  items: AdminInterface[],
+     *  keep_open: bool,
+     *  on_top: bool,
+     *  roles: list<string>
+     * }>
      */
     public function getDashboardGroupsWithCreatableAdmins(): array
     {