From d50d3e0e4b55a154a3c1fbcd96c93921f79d1669 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 30 Jun 2021 08:33:11 +0200
Subject: [PATCH] Revert "Add a bit more typing to help future development and
 customizations."

This reverts commit 32ce244de551c437d8eef08edeb1fd1906036827.
---
 .../Controller/AbstractCRUDController.php     | 31 ++++++++++---------
 .../CRUD/Controller/ApiController.php         |  3 +-
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
index 55f3bda24..a1d28483d 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
@@ -10,7 +10,6 @@ use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Pagination\PaginatorInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\CRUD\Resolver\Resolver;
-use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Translation\TranslatorInterface;
@@ -70,7 +69,7 @@ class AbstractCRUDController extends AbstractController
      * @param Request $request
      * @return int
      */
-    protected function countEntities(string $action, Request $request, string $_format): int
+    protected function countEntities(string $action, Request $request, $_format): int
     {
         return $this->buildQueryEntities($action, $request)
             ->select('COUNT(e)')
@@ -90,23 +89,23 @@ class AbstractCRUDController extends AbstractController
      * It returns, by default, a query builder.
      * 
      */
-    protected function queryEntities(string $action, Request $request, string $_format, PaginatorInterface $paginator): QueryBuilder
+    protected function queryEntities(string $action, Request $request, string $_format, PaginatorInterface $paginator)
     {
-        $queryBuilder = $this->buildQueryEntities($action, $request)
+        $query = $this->buildQueryEntities($action, $request)
             ->setFirstResult($paginator->getCurrentPage()->getFirstItemNumber())
             ->setMaxResults($paginator->getItemsPerPage());
         
         // allow to order queries and return the new query
-        return $this->orderQuery($action, $queryBuilder, $request, $paginator, $_format);
+        return $this->orderQuery($action, $query, $request, $paginator, $_format);
     }
 
     /**
      * Add ordering fields in the query build by self::queryEntities
      * 
      */
-    protected function orderQuery(string $action, QueryBuilder $queryBuilder, Request $request, PaginatorInterface $paginator, string $_format): QueryBuilder
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
     {
-        return $queryBuilder;
+        return $query;
     }
 
     /**
@@ -118,8 +117,12 @@ class AbstractCRUDController extends AbstractController
      * can add some by using the method `customizeQuery`.
      *
      * The alias for the entity is "e".
+     * 
+     * @param string $action
+     * @param Request $request
+     * @return QueryBuilder
      */
-    protected function buildQueryEntities(string $action, Request $request): QueryBuilder
+    protected function buildQueryEntities(string $action, Request $request)
     {
         $qb = $this->getDoctrine()->getManager()
             ->createQueryBuilder()
@@ -132,14 +135,14 @@ class AbstractCRUDController extends AbstractController
         return $qb;
     }
 
-    protected function customizeQuery(string $action, Request $request, QueryBuilder $queryBuilder): void {}
+    protected function customizeQuery(string $action, Request $request, $query): void {}
 
     /**
      * Get the result of the query
      */
-    protected function getQueryResult(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, QueryBuilder $queryBuilder): array
+    protected function getQueryResult(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $query) 
     {
-        return $queryBuilder->getQuery()->getResult();
+        return $query->getQuery()->getResult();
     }
 
     protected function onPreIndex(string $action, Request $request, string $_format): ?Response
@@ -158,7 +161,7 @@ class AbstractCRUDController extends AbstractController
     /**
      * method used by indexAction
      */
-    protected function onPostIndexBuildQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, QueryBuilder $queryBuilder): ?Response
+    protected function onPostIndexBuildQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $query): ?Response
     {
         return null;
     }
@@ -166,7 +169,7 @@ class AbstractCRUDController extends AbstractController
     /**
      * method used by indexAction
      */
-    protected function onPostIndexFetchQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, array $entities): ?Response
+    protected function onPostIndexFetchQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $entities): ?Response
     {
         return null;
     }
@@ -185,7 +188,7 @@ class AbstractCRUDController extends AbstractController
     /**
      * called on post fetch entity 
      */
-    protected function onPostFetchEntity(string $action, Request $request, $entity, string $_format): ?Response
+    protected function onPostFetchEntity(string $action, Request $request, $entity, $_format): ?Response
     {
         return null;
     }
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
index fd55df30b..cab0bcdcb 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
@@ -305,8 +305,7 @@ class ApiController extends AbstractCRUDController
         if ($response instanceof Response) {
             return $response;
         }
-
-        // TODO: $entity is never set before
+        
         if (!isset($entity)) {
             $entity = '';
         }