Merge c1f8040 into f60d048

.gitignore

@@ -23,4 +23,5 @@
 
 # cs
 /.php_cs.cache
-/.phpunit.result.cache
+/.phpunit.result.cache
+/phpstan.phar

src/Controller/Admin/GroupController.php

@@ -32,7 +32,7 @@ class GroupController extends AdminController
      */
     public function index(Request $request, Paginator $paginator)
     {
-        $page = (int) $request->query->get('p', 1);
+        $page = (int) $request->query->get('p', '1');
         $sort = $request->query->get('s');
         $direction = $request->query->get('d');
         $key = md5(sprintf('%s:%s:%s:%s:%s', __CLASS__, __METHOD__, $page, $sort, $direction));
@@ -131,7 +131,9 @@ public function findRoles(string $id, Request $request, GroupService $service, R
             throw new NotFoundHttpException();
         }
 
-        $roles = $roleService->getRolesByGroup($group, $request->query->get('q', ''));
+        /* @var string $q */
+        $q     = $request->query->get('q', '');
+        $roles = $roleService->getRolesByGroup($group, $q);
 
         return new JsonResponse([
             'table' => $this->renderView('role/table-content.html.twig', ['roles' => $roles]),

src/Controller/Admin/MenuController.php

@@ -31,7 +31,7 @@ class MenuController extends AdminController
      */
     public function index(Request $request, Paginator $paginator, MenuService $menuService)
     {
-        $page = (int) $request->query->get('p', 1);
+        $page = (int) $request->query->get('p', '1');
         $sort = $request->query->get('s');
         $direction = $request->query->get('d');
         $key = md5(sprintf('%s:%s:%s:%s:%s', __CLASS__, __METHOD__, $page, $sort, $direction));

src/Controller/Admin/QueryController.php

@@ -51,9 +51,11 @@ public function run(Request $request, QueryService $service)
      */
     public function tables(Request $request, QueryService $service)
     {
+        /** @var string $c */
+        $c = $request->query->get('c', 'default');
         return new JsonResponse([
             'status' => true,
-            'result' => $service->getTables($request->query->get('c', 'default')),
+            'result' => $service->getTables($c),
         ]);
     }
 }

src/Controller/Admin/SettingController.php

@@ -31,7 +31,7 @@ class SettingController extends AdminController
      */
     public function index(Request $request, Paginator $paginator)
     {
-        $page = (int) $request->query->get('p', 1);
+        $page = (int) $request->query->get('p', '1');
         $sort = $request->query->get('s');
         $direction = $request->query->get('d');
         $key = md5(sprintf('%s:%s:%s:%s:%s', __CLASS__, __METHOD__, $page, $sort, $direction));

src/Controller/Admin/UserController.php

@@ -33,7 +33,7 @@ class UserController extends AdminController
      */
     public function index(Request $request, Paginator $paginator, GroupService $groupService)
     {
-        $page = (int) $request->query->get('p', 1);
+        $page = (int) $request->query->get('p', '1');
         $sort = $request->query->get('s');
         $direction = $request->query->get('d');
         $key = md5(sprintf('%s:%s:%s:%s:%s', __CLASS__, __METHOD__, $page, $sort, $direction));

src/Query/SearchQuery.php

@@ -31,6 +31,7 @@ public function apply(PaginationEvent $event): void
             return;
         }
 
+        /** @var string $queryString */
         if ('' === $queryString = $request->query->get('q', '')) {
             return;
         }

src/Query/SortQuery.php

@@ -30,6 +30,7 @@ public function apply(PaginationEvent $event): void
             return;
         }
 
+        /** @var string $sortField */
         if ('' === $sortField = $request->query->get('s', '')) {
             return;
         }

tests/Menu/MenuExtensionTest.php

@@ -90,7 +90,7 @@ public function testFindMenu(MenuLoader $menuLoader, MockObject $menuService, Ur
      */
     public function testGetFunctions(MenuLoader $menuLoader, MenuService $menuService, UrlGeneratorInterface $urlGenerator)
     {
-        $this->assertCount(2, (new MenuExtension($menuLoader, $menuService, $urlGenerator))->getFunctions());
+        $this->assertCount(3, (new MenuExtension($menuLoader, $menuService, $urlGenerator))->getFunctions());
     }
 
     public function seed()