Merge remote-tracking branch 'origin/master' into doc/authorizaton-documentation-update

src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\CRUD\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -14,94 +16,77 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 
-class AbstractCRUDController extends AbstractController
+abstract class AbstractCRUDController extends AbstractController
 {
     /**
-     * The crud configuration 
+     * The crud configuration
      *
      * This configuration si defined by `chill_main['crud']` or `chill_main['apis']`
-     *
-     * @var array
      */
     protected array $crudConfig = [];
 
     /**
      * get the instance of the entity with the given id
-     * 
-     * @param string $id
-     * @return object
+     *
      * @throw Symfony\Component\HttpKernel\Exception\NotFoundHttpException if the object is not found
      */
-    protected function getEntity($action, $id, Request $request): object
+    protected function getEntity($action, string $id, Request $request): object
     {
-        $e = $this->getDoctrine()
+        $e = $this
+            ->getDoctrine()
             ->getRepository($this->getEntityClass())
             ->find($id);
 
-        if (NULL === $e) {
+        if (null === $e) {
             throw $this->createNotFoundException(sprintf("The object %s for id %s is not found", $this->getEntityClass(), $id));
         }
 
         return $e;
     }
 
-    /**
-     * Create an entity.
-     * 
-     * @param string $action
-     * @param Request $request
-     * @return object
-     */
     protected function createEntity(string $action, Request $request): object
     {
-        $type = $this->getEntityClass();
-        
-        return new $type;
+        $class = $this->getEntityClass();
+
+        return new $class;
     }
 
     /**
      * Count the number of entities
      *
-     * By default, count all entities. You can customize the query by 
+     * By default, count all entities. You can customize the query by
      * using the method `customizeQuery`.
-     * 
-     * @param string $action
-     * @param Request $request
-     * @return int
      */
     protected function countEntities(string $action, Request $request, $_format): int
     {
         return $this->buildQueryEntities($action, $request)
             ->select('COUNT(e)')
             ->getQuery()
-            ->getSingleScalarResult()
-            ;
+            ->getSingleScalarResult();
     }
 
     /**
      * Query the entity.
-     * 
+     *
      * By default, get all entities. You can customize the query by using the
      * method `customizeQuery`.
-     * 
+     *
      * The method `orderEntity` is called internally to order entities.
-     * 
+     *
      * It returns, by default, a query builder.
-     * 
      */
     protected function queryEntities(string $action, Request $request, string $_format, PaginatorInterface $paginator)
     {
         $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, $query, $request, $paginator, $_format);
     }
 
     /**
      * Add ordering fields in the query build by self::queryEntities
-     * 
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
     {
@@ -112,14 +97,12 @@ class AbstractCRUDController extends AbstractController
      * Build the base query for listing all entities.
      *
      * This method is used internally by `countEntities` `queryEntities`
-     * 
+     *
      * This base query does not contains any `WHERE` or `SELECT` clauses. You
      * 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)
@@ -127,8 +110,7 @@ class AbstractCRUDController extends AbstractController
         $qb = $this->getDoctrine()->getManager()
             ->createQueryBuilder()
             ->select('e')
-            ->from($this->getEntityClass(), 'e')
-            ;
+            ->from($this->getEntityClass(), 'e');
 
         $this->customizeQuery($action, $request, $qb);
 
@@ -138,55 +120,54 @@ class AbstractCRUDController extends AbstractController
     protected function customizeQuery(string $action, Request $request, $query): void {}
 
     /**
-     * Get the result of the query
+     * Get the result of the query.
      */
-    protected function getQueryResult(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $query) 
+    protected function getQueryResult(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $query)
     {
         return $query->getQuery()->getResult();
     }
 
     protected function onPreIndex(string $action, Request $request, string $_format): ?Response
-    { 
-        return null; 
-    }
-    
-    /**
-     * method used by indexAction
-     */
-    protected function onPreIndexBuildQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator): ?Response
-    { 
+    {
         return null;
     }
 
     /**
-     * method used by indexAction
+     * Method used by indexAction.
+     */
+    protected function onPreIndexBuildQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator): ?Response
+    {
+        return null;
+    }
+
+    /**
+     * Method used by indexAction.
      */
     protected function onPostIndexBuildQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $query): ?Response
     {
         return null;
     }
-    
+
     /**
-     * method used by indexAction
+     * Method used by indexAction.
      */
     protected function onPostIndexFetchQuery(string $action, Request $request, string $_format, int $totalItems, PaginatorInterface $paginator, $entities): ?Response
     {
         return null;
     }
-    
 
     /**
-     * Get the complete FQDN of the class
-     * 
-     * @return string the complete fqdn of the class
+     * Get the FQDN of the class.
+     *
+     * @return class-string The FQDN of the class
      */
     protected function getEntityClass(): string
     {
         return $this->crudConfig['class'];
     }
-    
+
     /**
-     * called on post fetch entity 
+     * Called on post fetch entity.
      */
     protected function onPostFetchEntity(string $action, Request $request, $entity, $_format): ?Response
     {
@@ -194,7 +175,7 @@ class AbstractCRUDController extends AbstractController
     }
 
     /**
-     * Called on post check ACL
+     * Called on post check ACL.
      */
     protected function onPostCheckACL(string $action, Request $request, string $_format, $entity): ?Response
     {
@@ -203,23 +184,23 @@ class AbstractCRUDController extends AbstractController
 
     /**
      * check the acl. Called by every action.
-     * 
-     * By default, check the role given by `getRoleFor` for the value given in 
+     *
+     * By default, check the role given by `getRoleFor` for the value given in
      * $entity.
-     * 
+     *
      * Throw an \Symfony\Component\Security\Core\Exception\AccessDeniedHttpException
      * if not accessible.
-     * 
+     *
      * @throws \Symfony\Component\Security\Core\Exception\AccessDeniedHttpException
      */
     protected function checkACL(string $action, Request $request, string $_format, $entity = null)
     {
+        // @TODO: Implements abstract getRoleFor method or do it in the interface.
         $this->denyAccessUnlessGranted($this->getRoleFor($action, $request, $entity, $_format), $entity);
     }
 
     /**
-     * 
-     * @return string the crud name
+     * @return string The crud name.
      */
     protected function getCrudName(): string
     {
@@ -230,7 +211,7 @@ class AbstractCRUDController extends AbstractController
     {
         return $this->crudConfig['actions'][$action];
     }
-    
+
     /**
      * Set the crud configuration
      *
@@ -241,9 +222,6 @@ class AbstractCRUDController extends AbstractController
         $this->crudConfig = $config;
     }
 
-    /**
-     * @return PaginatorFactory
-     */
     protected function getPaginatorFactory(): PaginatorFactory
     {
         return $this->container->get('chill_main.paginator_factory');
@@ -254,9 +232,6 @@ class AbstractCRUDController extends AbstractController
         return $this->get('validator');
     }
 
-    /**
-     * @return array
-     */
     public static function getSubscribedServices(): array
     {
         return \array_merge(

src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\CRUD\Controller;
 
 use Symfony\Component\HttpFoundation\Request;
@@ -17,36 +19,36 @@ class ApiController extends AbstractCRUDController
 {
     /**
      * The view action.
-     * 
+     *
      * Some steps may be overriden during this process of rendering:
-     * 
+     *
      * This method:
-     * 
+     *
      * 1.  fetch the entity, using `getEntity`
      * 2.  launch `onPostFetchEntity`. If postfetch is an instance of Response,
      *     this response is returned.
      * 2.  throw an HttpNotFoundException if entity is null
      * 3.  check ACL using `checkACL` ;
-     * 4.  launch `onPostCheckACL`. If the result is an instance of Response, 
+     * 4.  launch `onPostCheckACL`. If the result is an instance of Response,
      *     this response is returned ;
      * 5.  Serialize the entity and return the result. The serialization context is given by `getSerializationContext`
-     * 
+     *
      */
     protected function entityGet(string $action, Request $request, $id, $_format = 'html'): Response
     {
-        $entity = $this->getEntity($action, $id, $request, $_format);
-        
+        $entity = $this->getEntity($action, $id, $request);
+
         $postFetch = $this->onPostFetchEntity($action, $request, $entity, $_format);
-        
+
         if ($postFetch instanceof Response) {
             return $postFetch;
         }
-        
+
         $response = $this->checkACL($action, $request, $_format, $entity);
         if ($response instanceof Response) {
             return $response;
         }
-        
+
         $response = $this->onPostCheckACL($action, $request, $_format, $entity);
         if ($response instanceof Response) {
             return $response;
@@ -86,7 +88,7 @@ class ApiController extends AbstractCRUDController
             case Request::METHOD_PATCH:
                 return $this->entityPut('_entity', $request, $id, $_format);
             case Request::METHOD_POST:
-                return $this->entityPostAction('_entity', $request, $id, $_format);
+                return $this->entityPostAction('_entity', $request, $id);
             case Request::METHOD_DELETE:
                 return $this->entityDelete('_entity', $request, $id, $_format);
             default:
@@ -112,9 +114,9 @@ class ApiController extends AbstractCRUDController
         } catch (NotEncodableValueException $e) {
             throw new BadRequestException("invalid json", 400, $e);
         }
-        
+
         $errors = $this->validate($action, $request, $_format, $entity);
-        
+
         $response = $this->onAfterValidation($action, $request, $_format, $entity, $errors);
         if ($response instanceof Response) {
             return $response;
@@ -126,12 +128,12 @@ class ApiController extends AbstractCRUDController
 
             return $response;
         }
-        
+
         $response = $this->checkACL($action, $request, $_format, $entity);
         if ($response instanceof Response) {
             return $response;
         }
-        
+
         $response = $this->onPostCheckACL($action, $request, $_format, $entity);
         if ($response instanceof Response) {
             return $response;
@@ -148,33 +150,33 @@ class ApiController extends AbstractCRUDController
         if ($response instanceof Response) {
             return $response;
         }
-        
+
         return $this->json(
             $entity,
             Response::HTTP_OK,
-            [], 
+            [],
             $this->getContextForSerializationPostAlter($action, $request, $_format, $entity)
         );
     }
     public function entityPut($action, Request $request, $id, string $_format): Response
     {
-        $entity = $this->getEntity($action, $id, $request, $_format);
-        
+        $entity = $this->getEntity($action, $id, $request);
+
         $postFetch = $this->onPostFetchEntity($action, $request, $entity, $_format);
         if ($postFetch instanceof Response) {
             return $postFetch;
         }
-        
+
         if (NULL === $entity) {
             throw $this->createNotFoundException(sprintf("The %s with id %s "
                 . "is not found", $this->getCrudName(), $id));
         }
-        
+
         $response = $this->checkACL($action, $request, $_format, $entity);
         if ($response instanceof Response) {
             return $response;
         }
-        
+
         $response = $this->onPostCheckACL($action, $request, $_format, $entity);
         if ($response instanceof Response) {
             return $response;
@@ -184,7 +186,7 @@ class ApiController extends AbstractCRUDController
         if ($response instanceof Response) {
             return $response;
         }
-        
+
         try {
             $entity = $this->deserialize($action, $request, $_format, $entity);
         } catch (NotEncodableValueException $e) {
@@ -215,13 +217,13 @@ class ApiController extends AbstractCRUDController
         return $this->json(
             $entity,
             Response::HTTP_OK,
-            [], 
+            [],
             $this->getContextForSerializationPostAlter($action, $request, $_format, $entity)
         );
     }
     public function entityDelete($action, Request $request, $id, string $_format): Response
     {
-        $entity = $this->getEntity($action, $id, $request, $_format);
+        $entity = $this->getEntity($action, $id, $request);
 
         if (NULL === $entity) {
             throw $this->createNotFoundException(sprintf("The %s with id %s "
@@ -287,7 +289,7 @@ class ApiController extends AbstractCRUDController
     protected function validate(string $action, Request $request, string $_format, $entity, array $more = []): ConstraintViolationListInterface
     {
         $validationGroups = $this->getValidationGroups($action, $request, $_format, $entity);
-        
+
         return $this->getValidator()->validate($entity, null, $validationGroups);
     }
 
@@ -309,7 +311,7 @@ class ApiController extends AbstractCRUDController
 
         return $this->getSerializer()->deserialize($request->getContent(), $this->getEntityClass(), $_format, $context);
     }
-    
+
 
     /**
      * Base action for indexing entities
@@ -327,11 +329,11 @@ class ApiController extends AbstractCRUDController
 
     /**
      * Build an index page.
-     * 
+     *
      * Some steps may be overriden during this process of rendering.
-     * 
+     *
      * This method:
-     * 
+     *
      * 1.  Launch `onPreIndex`
      * x.  check acl. If it does return a response instance, return it
      * x.  launch `onPostCheckACL`. If it does return a response instance, return it
@@ -342,58 +344,60 @@ class ApiController extends AbstractCRUDController
      * x.  fetch the results, using `getQueryResult`
      * x.  Launch `onPostIndexFetchQuery`. If it does return a response instance, return it
      * 4.  Serialize the entities in a Collection, using `SerializeCollection`
-     * 
+     *
      * @param string $action
      * @param Request $request
-     * @return type
      */
     protected function indexApiAction($action, Request $request, $_format)
     {
         $this->onPreIndex($action, $request, $_format);
-        
+
         $response = $this->checkACL($action, $request, $_format);
         if ($response instanceof Response) {
             return $response;
         }
-        
-        if (!isset($entity)) {
-            $entity = '';
-        }
-        
+
+        $entity = '';
+
         $response = $this->onPostCheckACL($action, $request, $_format, $entity);
         if ($response instanceof Response) {
             return $response;
         }
-        
+
         $totalItems = $this->countEntities($action, $request, $_format);
         $paginator = $this->getPaginatorFactory()->create($totalItems);
-        
-        $response = $this->onPreIndexBuildQuery($action, $request, $_format, $totalItems, 
-            $paginator);
-        
+
+        $response = $this->onPreIndexBuildQuery(
+            $action,
+            $request,
+            $_format,
+            $totalItems,
+            $paginator
+        );
+
         if ($response instanceof Response) {
             return $response;
         }
-        
+
         $query = $this->queryEntities($action, $request, $_format, $paginator);
-        
-        $response = $this->onPostIndexBuildQuery($action, $request, $_format, $totalItems, 
+
+        $response = $this->onPostIndexBuildQuery($action, $request, $_format, $totalItems,
             $paginator, $query);
-        
+
         if ($response instanceof Response) {
             return $response;
         }
-        
+
         $entities = $this->getQueryResult($action, $request, $_format, $totalItems, $paginator, $query);
-        
-        $response = $this->onPostIndexFetchQuery($action, $request, $_format, $totalItems, 
+
+        $response = $this->onPostIndexFetchQuery($action, $request, $_format, $totalItems,
             $paginator, $entities);
-        
+
         if ($response instanceof Response) {
             return $response;
         }
-        
-        return $this->serializeCollection($action, $request, $_format, $paginator, $entities);    
+
+        return $this->serializeCollection($action, $request, $_format, $paginator, $entities);
     }
 
     /**
@@ -402,7 +406,7 @@ class ApiController extends AbstractCRUDController
      * This method:
      *
      * 1. Fetch the base entity (throw 404 if not found)
-     * 2. checkACL, 
+     * 2. checkACL,
      * 3. run onPostCheckACL, return response if any,
      * 4. deserialize posted data into the entity given by $postedDataType, with the context in $postedDataContext
      * 5. run 'add+$property' for POST method, or 'remove+$property' for DELETE method
@@ -410,7 +414,7 @@ class ApiController extends AbstractCRUDController
      * 7. run onAfterValidation
      * 8. if errors, return a 422 response with errors
      * 9. if $forcePersist === true, persist the entity
-     * 10. flush the data 
+     * 10. flush the data
      * 11. run onAfterFlush
      * 12. return a 202 response for DELETE with empty body, or HTTP 200 for post with serialized posted entity
      *
@@ -425,7 +429,7 @@ class ApiController extends AbstractCRUDController
      * @throw BadRequestException if unable to deserialize the posted data
      * @throw BadRequestException if the method is not POST or DELETE
      *
-     */ 
+     */
     protected function addRemoveSomething(string $action, $id, Request $request, string $_format, string $property, string $postedDataType, array $postedDataContext = [], bool $forcePersist = false): Response
     {
         $entity = $this->getEntity($action, $id, $request);
@@ -500,12 +504,14 @@ class ApiController extends AbstractCRUDController
                 return $this->json(
                     $postedData,
                     Response::HTTP_OK,
-                    [], 
+                    [],
                     $this->getContextForSerializationPostAlter($action, $request, $_format, $entity, [$postedData])
                 );
         }
+
+        throw new \Exception('Unable to handle such request method.');
     }
-    
+
     /**
      * Serialize collections
      *
@@ -518,7 +524,7 @@ class ApiController extends AbstractCRUDController
 
         return $this->json($model, Response::HTTP_OK, [], $context);
     }
-    
+
 
     protected function getContextForSerialization(string $action, Request $request, string $_format, $entity): array
     {
@@ -535,7 +541,7 @@ class ApiController extends AbstractCRUDController
     }
 
     /**
-     * Get the context for serialization post alter query (in case of 
+     * Get the context for serialization post alter query (in case of
      * PATCH, PUT, or POST method)
      *
      * This is called **after** the entity was altered.
@@ -563,7 +569,7 @@ class ApiController extends AbstractCRUDController
         throw new \RuntimeException(sprintf("the config does not have any role for the ".
             "method %s nor a global role for the whole action. Add those to your ".
             "configuration or override the required method", $request->getMethod()));
-        
+
     }
 
     protected function getSerializer(): SerializerInterface

src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php

@@ -1,22 +1,4 @@
 <?php
-/*
- * Chill is a software for social workers
- *
- * Copyright (C) 2019, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 
 namespace Chill\MainBundle\CRUD\Controller;
 
@@ -37,60 +19,40 @@ use Chill\MainBundle\Pagination\PaginatorInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Serializer\SerializerInterface;
 
-/**
- * Class CRUDController
- *
- * @package Chill\MainBundle\CRUD\Controller
- */
 class CRUDController extends AbstractController
 {
-
     /**
      * The crud configuration
      *
      * This configuration si defined by `chill_main['crud']`.
-     *
-     * @var array
      */
-    protected $crudConfig;
+    protected array $crudConfig;
 
-    /**
-     * @param array $config
-     */
-    public function setCrudConfig(array $config)
+    public function setCrudConfig(array $config): void
     {
         $this->crudConfig = $config;
     }
 
-    /**
-     * @param $parameter
-     * @return Response
-     */
-    public function CRUD($parameter)
+    public function CRUD(?string $parameter): Response
     {
         return new Response($parameter);
     }
 
     /**
-     * @param Request $request
      * @param $id
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
      */
-    public function delete(Request $request, $id)
+    public function delete(Request $request, $id): Response
     {
         return $this->deleteAction('delete', $request, $id);
     }
 
     /**
-     * @param string $action
-     * @param Request $request
      * @param $id
      * @param null $formClass
-     * @return null|\Symfony\Component\HttpFoundation\RedirectResponse|Response|void
      */
-    protected function deleteAction(string $action, Request $request, $id, $formClass = null)
+    protected function deleteAction(string $action, Request $request, $id, $formClass = null): Response
     {
-        $this->onPreDelete($action, $request, $id);
+        $this->onPreDelete($action, $request);
 
         $entity = $this->getEntity($action, $id, $request);
 
@@ -101,8 +63,13 @@ class CRUDController extends AbstractController
         }
 
         if (NULL === $entity) {
-            throw $this->createNotFoundException(sprintf("The %s with id %s "
-                . "is not found"), $this->getCrudName(), $id);
+            throw $this->createNotFoundException(
+                sprintf(
+                    'The %s with id %s is not found',
+                    $this->getCrudName(),
+                    $id
+                )
+            );
         }
 
         $response = $this->checkACL($action, $entity);
@@ -141,7 +108,9 @@ class CRUDController extends AbstractController
 
             return $this->redirectToRoute('chill_crud_'.$this->getCrudName().'_view', ['id' => $entity->getId()]);
 
-        } elseif ($form->isSubmitted()) {
+        }
+
+        if ($form->isSubmitted()) {
             $this->addFlash('error', $this->generateFormErrorMessage($action, $form));
         }
 
@@ -233,7 +202,6 @@ class CRUDController extends AbstractController
      *
      * @param string $action
      * @param Request $request
-     * @return type
      */
     protected function indexEntityAction($action, Request $request)
     {
@@ -244,9 +212,7 @@ class CRUDController extends AbstractController
             return $response;
         }
 
-        if (!isset($entity)) {
-            $entity = '';
-        }
+        $entity = '';
 
         $response = $this->onPostCheckACL($action, $request, $entity);
         if ($response instanceof Response) {
@@ -342,11 +308,12 @@ class CRUDController extends AbstractController
      */
     protected function buildQueryEntities(string $action, Request $request)
     {
-        $query =  $this->getDoctrine()->getManager()
+        $query =  $this
+            ->getDoctrine()
+            ->getManager()
             ->createQueryBuilder()
             ->select('e')
-            ->from($this->getEntityClass(), 'e')
-            ;
+            ->from($this->getEntityClass(), 'e');
 
         $this->customizeQuery($action, $request, $query);
 
@@ -371,7 +338,7 @@ class CRUDController extends AbstractController
      */
     protected function queryEntities(string $action, Request $request, PaginatorInterface $paginator, ?FilterOrderHelper $filterOrder = null)
     {
-        $query = $this->buildQueryEntities($action, $request, $filterOrder)
+        $query = $this->buildQueryEntities($action, $request)
             ->setFirstResult($paginator->getCurrentPage()->getFirstItemNumber())
             ->setMaxResults($paginator->getItemsPerPage());
 
@@ -420,7 +387,7 @@ class CRUDController extends AbstractController
      */
     protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
     {
-        return $this->buildQueryEntities($action, $request, $filterOrder)
+        return $this->buildQueryEntities($action, $request)
             ->select('COUNT(e)')
             ->getQuery()
             ->getSingleScalarResult()
@@ -505,8 +472,13 @@ class CRUDController extends AbstractController
         }
 
         if (NULL === $entity) {
-            throw $this->createNotFoundException(sprintf("The %s with id %s "
-                . "is not found", $this->getCrudName(), $id));
+            throw $this->createNotFoundException(
+                sprintf(
+                    'The %s with id %s is not found',
+                    $this->getCrudName(),
+                    $id
+                )
+            );
         }
 
         $response = $this->checkACL($action, $entity);
@@ -598,8 +570,13 @@ class CRUDController extends AbstractController
         $entity = $this->getEntity($action, $id, $request);
 
         if (NULL === $entity) {
-            throw $this->createNotFoundException(sprintf("The %s with id %s "
-                . "is not found", $this->getCrudName(), $id));
+            throw $this->createNotFoundException(
+                sprintf(
+                    'The %s with id %s is not found',
+                    $this->getCrudName(),
+                    $id
+                )
+            );
         }
 
         $response = $this->checkACL($action, $entity);

src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php

@@ -1,22 +1,6 @@
 <?php
-/*
- * Chill is a software for social workers
- *
- * Copyright (C) 2019, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+
+declare(strict_types=1);
 
 namespace Chill\MainBundle\CRUD\Routing;
 
@@ -27,22 +11,13 @@ use Symfony\Component\HttpFoundation\Request;
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 
-/**
- * Class CRUDRoutesLoader
- * Load the route for CRUD
- *
- * @package Chill\MainBundle\CRUD\Routing
- */
 class CRUDRoutesLoader extends Loader
 {
     protected array $crudConfig = [];
 
     protected array $apiCrudConfig = [];
-    
-    /**
-     * @var bool
-     */
-    private $isLoaded = false;
+
+    private bool $isLoaded = false;
 
     private const ALL_SINGLE_METHODS = [
         Request::METHOD_GET,
@@ -52,19 +27,15 @@ class CRUDRoutesLoader extends Loader
     ];
 
     private const ALL_INDEX_METHODS = [ Request::METHOD_GET, Request::METHOD_HEAD ];
-    
-    /**
-     * CRUDRoutesLoader constructor.
-     *
-     * @param $crudConfig the config from cruds
-     * @param $apicrudConfig the config from api_crud
-     */
-    public function __construct(array $crudConfig, array $apiConfig)
+
+    public function __construct(array $crudConfig, array $apiCrudConfig)
     {
         $this->crudConfig = $crudConfig;
-        $this->apiConfig = $apiConfig;
+        $this->apiCrudConfig = $apiCrudConfig;
+
+        parent::__construct();
     }
-    
+
     /**
      * @param mixed $resource
      * @param null $type
@@ -74,7 +45,7 @@ class CRUDRoutesLoader extends Loader
     {
         return 'CRUD' === $type;
     }
-    
+
     /**
      * Load routes for CRUD and CRUD Api
      */
@@ -85,17 +56,17 @@ class CRUDRoutesLoader extends Loader
         }
 
         $collection = new RouteCollection();
-        
+
         foreach ($this->crudConfig as $crudConfig) {
             $collection->addCollection($this->loadCrudConfig($crudConfig));
         }
-        foreach ($this->apiConfig as $crudConfig) {
+        foreach ($this->apiCrudConfig as $crudConfig) {
             $collection->addCollection($this->loadApi($crudConfig));
         }
 
         return $collection;
     }
-    
+
     /**
      * Load routes for CRUD (without api)
      *
@@ -112,7 +83,7 @@ class CRUDRoutesLoader extends Loader
             $defaults = [
                 '_controller' => $controller.':'.($action['controller_action'] ?? $name)
             ];
-            
+
             if ($name === 'index') {
                 $path = "{_locale}".$crudConfig['base_path'];
                 $route = new Route($path, $defaults);
@@ -126,10 +97,10 @@ class CRUDRoutesLoader extends Loader
                 ];
                 $route = new Route($path, $defaults, $requirements);
             }
-            
+
             $collection->add('chill_crud_'.$crudConfig['name'].'_'.$name, $route);
         }
-        
+
         return $collection;
     }
 
@@ -186,14 +157,14 @@ class CRUDRoutesLoader extends Loader
             if (count($methods) === 0) {
                 throw new \RuntimeException("The api configuration named \"{$crudConfig['name']}\", action \"{$name}\", ".
                     "does not have any allowed methods. You should remove this action from the config ".
-                    "or allow, at least, one method"); 
+                    "or allow, at least, one method");
             }
 
             if ('_entity' === $name && \in_array(Request::METHOD_POST, $methods)) {
                 unset($methods[\array_search(Request::METHOD_POST, $methods)]);
-                $entityPostRoute = $this->createEntityPostRoute($name, $crudConfig, $action, 
+                $entityPostRoute = $this->createEntityPostRoute($name, $crudConfig, $action,
                     $controller);
-                $collection->add("chill_api_single_{$crudConfig['name']}_{$name}_create", 
+                $collection->add("chill_api_single_{$crudConfig['name']}_{$name}_create",
                     $entityPostRoute);
             }
 
@@ -205,7 +176,7 @@ class CRUDRoutesLoader extends Loader
 
             $route = new Route($path, $defaults, $requirements);
             $route->setMethods($methods);
-            
+
             $collection->add('chill_api_single_'.$crudConfig['name'].'_'.$name, $route);
         }
 

src/Bundle/ChillMainBundle/ChillMainBundle.php

@@ -3,6 +3,7 @@
 namespace Chill\MainBundle;
 
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\MainBundle\Search\SearchApiInterface;
 use Chill\MainBundle\Search\SearchInterface;
 use Chill\MainBundle\Security\Authorization\ChillVoterInterface;
 use Chill\MainBundle\Security\ProvideRoleInterface;
@@ -41,6 +42,8 @@ class ChillMainBundle extends Bundle
             ->addTag('chill_main.scope_resolver');
         $container->registerForAutoconfiguration(ChillEntityRenderInterface::class)
             ->addTag('chill.render_entity');
+        $container->registerForAutoconfiguration(SearchApiInterface::class)
+            ->addTag('chill.search_api_provider');
 
         $container->addCompilerPass(new SearchableServicesCompilerPass());
         $container->addCompilerPass(new ConfigConsistencyCompilerPass());

src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php

@@ -1,7 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Command;
 
+use Chill\MainBundle\Repository\UserRepository;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -23,101 +26,51 @@ use League\Csv\Writer;
 
 class ChillImportUsersCommand extends Command
 {
-    
-    /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $em;
-    
-    /**
-     *
-     * @var ValidatorInterface
-     */
-    protected $validator;
-    
-    /**
-     *
-     * @var LoggerInterface
-     */
-    protected $logger;
-    
-    /**
-     *
-     * @var UserPasswordEncoderInterface
-     */
-    protected $passwordEncoder;
-    
-    /**
-     *
-     * @var \Chill\MainBundle\Repository\UserRepository
-     */
-    protected $userRepository;
-    
-    /**
-     *
-     * @var bool
-     */
-    protected $doChanges = true;
-    
-    /**
-     *
-     * @var OutputInterface
-     */
-    protected $tempOutput;
-    
-    /**
-     *
-     * @var InputInterface
-     */
-    protected $tempInput;
-    
+    protected EntityManagerInterface $em;
+
+    protected ValidatorInterface $validator;
+
+    protected LoggerInterface $logger;
+
+    protected UserPasswordEncoderInterface $passwordEncoder;
+
+    protected UserRepository $userRepository;
+
+    protected bool $doChanges = true;
+
+    protected OutputInterface $tempOutput;
+
+    protected InputInterface $tempInput;
+
     /**
      * Centers and aliases.
-     * 
+     *
      * key are aliases, values are an array of centers
-     *
-     * @var array
      */
-    protected $centers = [];
-    
-    /**
-     * 
-     * @var array
-     */
-    protected $permissionGroups = [];
-    
-    /**
-     *
-     * @var array
-     */
-    protected $groupCenters = [];
-    
-    /**
-     *
-     * @var Writer
-     */
-    protected $output = null;
-    
+    protected array $centers;
+
+    protected array $permissionGroups;
+
+    protected array $groupCenters;
+
+    protected Writer $output;
+
     public function __construct(
         EntityManagerInterface $em,
         LoggerInterface $logger,
         UserPasswordEncoderInterface $passwordEncoder,
-        ValidatorInterface $validator
+        ValidatorInterface $validator,
+        UserRepository $userRepository
     ) {
         $this->em = $em;
         $this->passwordEncoder = $passwordEncoder;
         $this->validator = $validator;
         $this->logger = $logger;
-        
-        
-        $this->userRepository = $em->getRepository(User::class);
-        
+        $this->userRepository = $userRepository;
+
         parent::__construct('chill:main:import-users');
     }
 
-    
-    
     protected function configure()
     {
         $this
@@ -126,25 +79,24 @@ class ChillImportUsersCommand extends Command
             ->addArgument('csvfile', InputArgument::REQUIRED, 'Path to the csv file. Columns are: `username`, `email`, `center` (can contain alias), `permission group`')
             ->addOption('grouping-centers', null, InputOption::VALUE_OPTIONAL, 'Path to a csv file to aggregate multiple centers into a single alias')
             ->addOption('dry-run', null, InputOption::VALUE_NONE, 'Do not commit the changes')
-            ->addOption('csv-dump', null, InputOption::VALUE_REQUIRED, 'A path to dump a summary of the created file')
-        ;
+            ->addOption('csv-dump', null, InputOption::VALUE_REQUIRED, 'A path to dump a summary of the created file');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->tempOutput = $output;
         $this->tempInput = $input;
-        
+
         if ($input->getOption('dry-run')) {
             $this->doChanges = false;
         }
-              
+
         $this->prepareWriter();
-        
+
         if ($input->hasOption('grouping-centers')) {
             $this->prepareGroupingCenters();
         }
-        
+
         try {
             $this->loadUsers();
         }
@@ -152,19 +104,19 @@ class ChillImportUsersCommand extends Command
             throw $e;
         }
     }
-    
+
     protected function prepareWriter()
     {
         $this->output = $output = Writer::createFromPath($this->tempInput
             ->getOption('csv-dump'), 'a+');
-        
+
         $output->insertOne([
             'email',
             'username',
             'id'
         ]);
     }
-    
+
     protected function appendUserToFile(User $user)
     {
         $this->output->insertOne( [
@@ -173,35 +125,35 @@ class ChillImportUsersCommand extends Command
             $user->getId()
             ]);
     }
-    
+
     protected function loadUsers()
     {
         $reader = Reader::createFromPath($this->tempInput->getArgument('csvfile'));
         $reader->setHeaderOffset(0);
-        
+
         foreach ($reader->getRecords() as $line => $r) {
             $this->logger->debug("starting handling new line", [
                 'line' => $line
             ]);
-            
+
             if ($this->doesUserExists($r)) {
                 $this->tempOutput->writeln(sprintf("User with username '%s' already "
                     . "exists, skipping", $r["username"]));
-                
+
                 $this->logger->info("One user already exists, skipping creation", [
                     'username_in_file' => $r['username'],
                     'email_in_file' => $r['email'],
                     'line' => $line
                 ]);
-                
+
                 continue;
             }
-            
+
             $user = $this->createUser($line, $r);
             $this->appendUserToFile($user);
         }
     }
-    
+
     protected function doesUserExists($data)
     {
         if ($this->userRepository->countByUsernameOrEmail($data['username']) > 0) {
@@ -211,10 +163,10 @@ class ChillImportUsersCommand extends Command
         if ($this->userRepository->countByUsernameOrEmail($data['email']) > 0) {
             return true;
         }
-        
+
         return false;
     }
-    
+
     protected function createUser($offset, $data)
     {
         $user = new User();
@@ -222,41 +174,41 @@ class ChillImportUsersCommand extends Command
             ->setEmail(\trim($data['email']))
             ->setUsername(\trim($data['username']))
             ->setEnabled(true)
-            ->setPassword($this->passwordEncoder->encodePassword($user, 
+            ->setPassword($this->passwordEncoder->encodePassword($user,
                 \bin2hex(\random_bytes(32))))
             ;
-        
+
         $errors = $this->validator->validate($user);
-        
+
         if ($errors->count() > 0) {
             $errorMessages = $this->concatenateViolations($errors);
-            
+
             $this->tempOutput->writeln(sprintf("%d errors found with user with username \"%s\" at line %d", $errors->count(), $data['username'], $offset));
             $this->tempOutput->writeln($errorMessages);
 
             throw new \RuntimeException("Found errors while creating an user. "
                 . "Watch messages in command output");
         }
-        
+
         $pgs = $this->getPermissionGroup($data['permission group']);
         $centers = $this->getCenters($data['center']);
-        
+
         foreach($pgs as $pg) {
             foreach ($centers as $center) {
                 $groupcenter = $this->createOrGetGroupCenter($center, $pg);
-                
+
                 if (FALSE === $user->getGroupCenters()->contains($groupcenter)) {
                     $user->addGroupCenter($groupcenter);
                 }
             }
         }
-        
+
 
         if ($this->doChanges) {
             $this->em->persist($user);
             $this->em->flush();
         }
-                        
+
         $this->logger->notice("Create user", [
             'username' => $user->getUsername(),
             'id' => $user->getId(),
@@ -265,65 +217,58 @@ class ChillImportUsersCommand extends Command
 
         return $user;
     }
-    
+
     protected function getPermissionGroup($alias)
     {
         if (\array_key_exists($alias, $this->permissionGroups)) {
             return $this->permissionGroups[$alias];
         }
-        
+
         $permissionGroupsByName = [];
-        
+
         foreach($this->em->getRepository(PermissionsGroup::class)
             ->findAll() as $permissionGroup) {
             $permissionGroupsByName[$permissionGroup->getName()] = $permissionGroup;
         }
-        
+
         if (count($permissionGroupsByName) === 0) {
             throw new \RuntimeException("no permission groups found. Create them "
                 . "before importing users");
         }
-        
-        $question = new ChoiceQuestion("To which permission groups associate with \"$alias\" ?", 
+
+        $question = new ChoiceQuestion("To which permission groups associate with \"$alias\" ?",
             \array_keys($permissionGroupsByName));
         $question
             ->setMultiselect(true)
             ->setAutocompleterValues(\array_keys($permissionGroupsByName))
             ->setNormalizer(function($value) {
                 if (NULL === $value) { return ''; }
-                
+
                 return \trim($value);
             })
             ;
         $helper = $this->getHelper('question');
-        
+
         $keys = $helper->ask($this->tempInput, $this->tempOutput, $question);
-        
+
         $this->tempOutput->writeln("You have chosen ".\implode(", ", $keys));
-        
-        if ($helper->ask($this->tempInput, $this->tempOutput, 
+
+        if ($helper->ask($this->tempInput, $this->tempOutput,
             new ConfirmationQuestion("Are you sure ?", true))) {
-            
+
             foreach ($keys as $key) {
                 $this->permissionGroups[$alias][] = $permissionGroupsByName[$key];
             }
-            
+
             return $this->permissionGroups[$alias];
-        } else {
-            $this->logger->error("Error while responding to a a question");
-            
-            $this->tempOutput("Ok, I accept, but I do not know what to do. Please try again.");
-            
-            throw new \RuntimeException("Error while responding to a question");
         }
+
+        $this->logger->error('Error while responding to a a question');
+        $this->tempOutput->writeln('Ok, I accept, but I do not know what to do. Please try again.');
+
+        throw new \RuntimeException('Error while responding to a question');
     }
-    
-    /**
-     * 
-     * @param Center $center
-     * @param \Chill\MainBundle\Command\PermissionGroup $pg
-     * @return GroupCenter
-     */
+
     protected function createOrGetGroupCenter(Center $center, PermissionsGroup $pg): GroupCenter
     {
         if (\array_key_exists($center->getId(), $this->groupCenters)) {
@@ -331,36 +276,36 @@ class ChillImportUsersCommand extends Command
                 return $this->groupCenters[$center->getId()][$pg->getId()];
             }
         }
-        
+
         $repository = $this->em->getRepository(GroupCenter::class);
-        
+
         $groupCenter = $repository->findOneBy(array(
                 'center' => $center,
                 'permissionsGroup' => $pg
             ));
-        
+
         if ($groupCenter === NULL) {
             $groupCenter = new GroupCenter();
             $groupCenter
                 ->setCenter($center)
                 ->setPermissionsGroup($pg)
                 ;
-            
+
             $this->em->persist($groupCenter);
         }
-        
+
         $this->groupCenters[$center->getId()][$pg->getId()] = $groupCenter;
-        
+
         return $groupCenter;
     }
-    
+
     protected function prepareGroupingCenters()
     {
         $reader = Reader::createFromPath($this->tempInput->getOption('grouping-centers'));
         $reader->setHeaderOffset(0);
-        
+
         foreach ($reader->getRecords() as $r) {
-            $this->centers[$r['alias']] = 
+            $this->centers[$r['alias']] =
                 \array_merge(
                     $this->centers[$r['alias']] ?? [],
                     $this->getCenters($r['center']
@@ -368,18 +313,18 @@ class ChillImportUsersCommand extends Command
                 );
         }
     }
-    
+
     /**
      * return a list of centers matching the name of alias.
-     * 
+     *
      * If the name match one center, this center is returned in an array.
-     * 
-     * If the name match an alias, the centers corresponding to the alias are 
+     *
+     * If the name match an alias, the centers corresponding to the alias are
      * returned in an array.
-     * 
+     *
      * If the center is not found or alias is not created, a new center is created
      * and suggested to user
-     * 
+     *
      * @param string $name the name of the center or the alias regrouping center
      * @return Center[]
      */
@@ -387,62 +332,62 @@ class ChillImportUsersCommand extends Command
     {
         // sanitize
         $name = \trim($name);
-        
+
         if (\array_key_exists($name, $this->centers)) {
             return $this->centers[$name];
         }
-        
+
         // search for a center with given name
         $center = $this->em->getRepository(Center::class)
             ->findOneByName($name);
-        
+
         if ($center instanceof Center) {
             $this->centers[$name] = [$center];
-            
+
             return $this->centers[$name];
         }
-        
+
         // suggest and create
         $center = (new Center())
             ->setName($name);
-        
+
         $this->tempOutput->writeln("Center with name \"$name\" not found.");
         $qFormatter = $this->getHelper('question');
         $question = new ConfirmationQuestion("Create a center with name \"$name\" ?", true);
-        
+
         if ($qFormatter->ask($this->tempInput, $this->tempOutput, $question)) {
             $this->centers[$name] = [ $center ];
-            
+
             $errors = $this->validator->validate($center);
-            
+
             if ($errors->count() > 0) {
                 $errorMessages = $this->concatenateViolations($errors);
-                
+
                 $this->tempOutput->writeln(sprintf("%d errors found with center with name \"%s\"", $errors->count(), $name));
                 $this->tempOutput->writeln($errorMessages);
-                
+
                 throw new \RuntimeException("Found errors while creating one center. "
                     . "Watch messages in command output");
             }
-            
+
             $this->em->persist($center);
-            
+
             return $this->centers[$name];
         }
-        
+
         return null;
     }
-    
+
     protected function concatenateViolations(ConstraintViolationListInterface $list)
     {
         $str = [];
-        
+
         foreach ($list as $e) {
             /* @var $e \Symfony\Component\Validator\ConstraintViolationInterface */
             $str[] = $e->getMessage();
         }
-        
+
         return \implode(";", $str);
     }
-    
+
 }

src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php

@@ -10,18 +10,18 @@ use Symfony\Component\Console\Output\OutputInterface;
 /**
  *
  * @author Julien Fastré <julien.fastre@champs-libres.coop
- *        
+ *
  */
 class LoadCountriesCommand extends Command
 {
-    
+
     /**
      * @var EntityManager
      */
     private $entityManager;
-    
+
     private $availableLanguages;
-    
+
     /**
      * LoadCountriesCommand constructor.
      *
@@ -34,7 +34,7 @@ class LoadCountriesCommand extends Command
         $this->availableLanguages=$availableLanguages;
         parent::__construct();
     }
-    
+
     /*
      * (non-PHPdoc)
      * @see \Symfony\Component\Console\Command\Command::configure()
@@ -45,7 +45,7 @@ class LoadCountriesCommand extends Command
             ->setDescription('Load or update countries in db. This command does not delete existing countries, '.
                 'but will update names according to available languages');
     }
-    
+
     /*
      * (non-PHPdoc)
      * @see \Symfony\Component\Console\Command\Command::execute()
@@ -54,43 +54,44 @@ class LoadCountriesCommand extends Command
     {
         $countries = static::prepareCountryList($this->availableLanguages);
         $em = $this->entityManager;
-        
+
         foreach($countries as $country) {
             $countryStored = $em->getRepository('ChillMainBundle:Country')
                 ->findOneBy(array('countryCode' => $country->getCountryCode()));
-            
+
             if (NULL === $countryStored) {
                 $em->persist($country);
             } else {
                 $countryStored->setName($country->getName());
             }
         }
-        
+
         $em->flush();
     }
 
     public static function prepareCountryList($languages)
     {
         $regionBundle = Intl::getRegionBundle();
-        
+        $countries = [];
+
         foreach ($languages as $language) {
             $countries[$language] = $regionBundle->getCountryNames($language);
         }
-        
+
         $countryEntities = array();
-        
+
         foreach ($countries[$languages[0]] as $countryCode => $name) {
             $names = array();
-            
+
             foreach ($languages as $language) {
                 $names[$language] = $countries[$language][$countryCode];
             }
-            
+
             $country = new \Chill\MainBundle\Entity\Country();
             $country->setName($names)->setCountryCode($countryCode);
             $countryEntities[] = $country;
         }
-        
+
         return $countryEntities;
     }
 }

src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php

@@ -1,27 +1,13 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+declare(strict_types=1);
 
 namespace Chill\MainBundle\Command;
 
 use Chill\MainBundle\Doctrine\Model\Point;
 use Chill\MainBundle\Entity\Country;
 use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -31,38 +17,19 @@ use Symfony\Component\Filesystem\Filesystem;
 use Chill\MainBundle\Entity\PostalCode;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
-/**
- * Class LoadPostalCodesCommand
- *
- * @package Chill\MainBundle\Command
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class LoadPostalCodesCommand extends Command
 {
-    
-    /**
-     * @var EntityManager
-     */
-    private $entityManager;
-    
-    /**
-     * @var ValidatorInterface
-     */
-    private $validator;
-    
-    /**
-     * LoadPostalCodesCommand constructor.
-     *
-     * @param EntityManager $entityManager
-     * @param ValidatorInterface $validator
-     */
-    public function __construct(EntityManager $entityManager, ValidatorInterface $validator)
+    private EntityManagerInterface $entityManager;
+
+    private ValidatorInterface $validator;
+
+    public function __construct(EntityManagerInterface $entityManager, ValidatorInterface $validator)
     {
         $this->entityManager = $entityManager;
         $this->validator = $validator;
         parent::__construct();
     }
-    
+
     protected function configure()
     {
         $this->setName('chill:main:postal-code:populate')
@@ -78,10 +45,10 @@ class LoadPostalCodesCommand extends Command
                 ->addArgument('csv_file', InputArgument::REQUIRED, "the path to "
                         . "the csv file. See the help for specifications.")
                 ->addOption(
-                        'delimiter', 
-                        'd', 
-                        InputOption::VALUE_OPTIONAL, 
-                        "The delimiter character of the csv file", 
+                        'delimiter',
+                        'd',
+                        InputOption::VALUE_OPTIONAL,
+                        "The delimiter character of the csv file",
                         ",")
                 ->addOption(
                         'enclosure',
@@ -99,31 +66,26 @@ class LoadPostalCodesCommand extends Command
                         )
                 ;
     }
-    
+
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        try {
-            $csv = $this->getCSVResource($input);
-        } catch (\RuntimeException $e) {
-            $output->writeln('<error>Error during opening the csv file : '.
-                    $e->getMessage().'</error>');
-        }
-        
+        $csv = $this->getCSVResource($input);
+
         if ($output->getVerbosity() === OutputInterface::VERBOSITY_VERY_VERBOSE) {
             $output->writeln('The content of the file is ...');
             $output->write(file_get_contents($input->getArgument('csv_file')));
         }
-        
+
         $num = 0;
         $line = 0;
-        
+
         while (($row = fgetcsv(
-                $csv, 
-                0, 
-                $input->getOption('delimiter'), 
-                $input->getOption('enclosure'), 
+                $csv,
+                0,
+                $input->getOption('delimiter'),
+                $input->getOption('enclosure'),
                 $input->getOption('escape'))) !== false) {
-            
+
             try{
                 $this->addPostalCode($row, $output);
                 $num++;
@@ -136,31 +98,31 @@ class LoadPostalCodesCommand extends Command
             }
             $line ++;
         }
-        
+
         $this->entityManager->flush();
-        
+
         $output->writeln('<info>'.$num.' were added !</info>');
     }
-    
+
     private function getCSVResource(InputInterface $input)
     {
         $fs = new Filesystem();
         $filename = $input->getArgument('csv_file');
-        
+
         if (!$fs->exists($filename)) {
             throw new \RuntimeException("The file does not exists or you do not "
                     . "have the right to read it.");
         }
-        
+
         $resource = fopen($filename, 'r');
-        
+
         if ($resource == FALSE) {
             throw new \RuntimeException("The file '$filename' could not be opened.");
         }
-        
+
         return $resource;
     }
-    
+
     private function addPostalCode($row, OutputInterface $output)
     {
         if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
@@ -170,28 +132,28 @@ class LoadPostalCodesCommand extends Command
         $country = $em
                 ->getRepository(Country::class)
                 ->findOneBy(array('countryCode' => $row[2]));
-        
+
         if ($country === NULL) {
             throw new CountryCodeNotFoundException(sprintf("The country with code %s is not found. Aborting to insert postal code with %s - %s",
                     $row[2], $row[0], $row[1]));
         }
-        
+
         // try to find an existing postal code
         $existingPC = $em
                 ->getRepository(PostalCode::class)
                 ->findBy(array('code' => $row[0], 'name' => $row[1]));
-        
+
         if (count($existingPC) > 0) {
-            throw new ExistingPostalCodeException(sprintf("A postal code with code : %s and name : %s already exists, skipping", 
+            throw new ExistingPostalCodeException(sprintf("A postal code with code : %s and name : %s already exists, skipping",
                     $row[0], $row[1]));
         }
-        
+
         $postalCode = (new PostalCode())
                 ->setCode($row[0])
                 ->setName($row[1])
                 ->setCountry($country)
                 ;
-        
+
         if (NULL != $row[3]){
             $postalCode->setRefPostalCodeId($row[3]);
         }
@@ -205,7 +167,7 @@ class LoadPostalCodesCommand extends Command
         }
 
         $errors = $this->validator->validate($postalCode);
-        
+
         if ($errors->count() == 0) {
             $em->persist($postalCode);
         } else {
@@ -213,12 +175,12 @@ class LoadPostalCodesCommand extends Command
             foreach ($errors as $error) {
                 $msg .= " ".$error->getMessage();
             }
-            
+
             throw new PostalCodeNotValidException($msg);
         }
-        
-        
-        
+
+
+
         if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
             $output->writeln(sprintf('Creating postal code with code: %s, name: %s, countryCode: %s',
                     $postalCode->getCode(), $postalCode->getName(), $postalCode->getCountry()->getCountryCode()));
@@ -229,15 +191,15 @@ class LoadPostalCodesCommand extends Command
 
 class ExistingPostalCodeException extends \Exception
 {
-    
+
 }
 
 class CountryCodeNotFoundException extends \Exception
 {
-    
+
 }
 
 class PostalCodeNotValidException extends \Exception
 {
-    
+
 }

src/Bundle/ChillMainBundle/Controller/AdminCountryCRUDController.php

@@ -1,20 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
-use Chill\MainBundle\Entity\Country;
-use Chill\MainBundle\Pagination\PaginatorFactory;
 
-/**
- * 
- *
- */
 class AdminCountryCRUDController extends CRUDController
 {
-    
-    function __construct(PaginatorFactory $paginator)
-    {
-        $this->paginatorFactory = $paginator;
-    }
+
 }

src/Bundle/ChillMainBundle/Controller/UserController.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\AbstractCRUDController;
@@ -7,6 +9,7 @@ use Chill\MainBundle\CRUD\Controller\CRUDController;
 use Chill\MainBundle\Pagination\PaginatorInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -16,40 +19,23 @@ use Chill\MainBundle\Form\UserType;
 use Chill\MainBundle\Entity\GroupCenter;
 use Chill\MainBundle\Form\Type\ComposedGroupCenterType;
 use Chill\MainBundle\Form\UserPasswordType;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter;
 
 
-/**
- * Class UserController
- *
- * @package Chill\MainBundle\Controller
- */
 class UserController extends CRUDController
 {
-
     const FORM_GROUP_CENTER_COMPOSED = 'composed_groupcenter';
 
-    /**
-     * @var \Psr\Log\LoggerInterface
-     */
-    private $logger;
+    private LoggerInterface $logger;
 
-    /**
-     * @var ValidatorInterface
-     */
-    private $validator;
+    private ValidatorInterface $validator;
 
     private UserPasswordEncoderInterface $passwordEncoder;
 
-    /**
-     * UserController constructor.
-     *
-     * @param LoggerInterface $logger
-     * @param ValidatorInterface $validator
-     */
     public function __construct(
         LoggerInterface $chillLogger,
         ValidatorInterface $validator,
@@ -121,7 +107,7 @@ class UserController extends CRUDController
      */
     public function editPasswordAction(User $user, Request $request)
     {
-        $editForm = $this->createEditPasswordForm($user, $request);
+        $editForm = $this->createEditPasswordForm($user);
         $editForm->handleRequest($request);
 
         if ($editForm->isSubmitted() && $editForm->isValid()) {
@@ -150,20 +136,17 @@ class UserController extends CRUDController
         ]);
     }
 
-    /**
-     *
-     *
-     * @param User $user
-     * @return \Symfony\Component\Form\Form
-     */
-    private function createEditPasswordForm(User $user)
+    private function createEditPasswordForm(User $user): FormInterface
     {
-        return $this->createForm(UserPasswordType::class, null, array(
-                'user' => $user
-                ))
+        return $this->createForm(
+            UserPasswordType::class,
+            null,
+                [
+                    'user' => $user
+                ]
+            )
             ->add('submit', SubmitType::class, array('label' => 'Change password'))
-            ->remove('actual_password')
-                ;
+            ->remove('actual_password');
     }
 
     /**
@@ -208,7 +191,7 @@ class UserController extends CRUDController
      * @Route("/{_locale}/admin/main/user/{uid}/add_link_groupcenter",
      *     name="admin_user_add_groupcenter")
      */
-    public function addLinkGroupCenterAction(Request $request, $uid): RedirectResponse
+    public function addLinkGroupCenterAction(Request $request, $uid): Response
     {
         $em = $this->getDoctrine()->getManager();
 
@@ -238,23 +221,22 @@ class UserController extends CRUDController
             return $this->redirect($this->generateUrl('chill_crud_admin_user_edit',
                     \array_merge(['id' => $uid], $returnPathParams)));
 
-            } else {
-                foreach($this->validator->validate($user) as $error)
+            }
+
+            foreach($this->validator->validate($user) as $error) {
                 $this->addFlash('error', $error->getMessage());
             }
         }
 
-        return $this->render('@ChillMain/User/edit.html.twig', array(
+        return $this->render('@ChillMain/User/edit.html.twig', [
             'entity'      => $user,
             'edit_form'   => $this->createEditForm($user)->createView(),
-            'add_groupcenter_form' => $this->createAddLinkGroupCenterForm($user)->createView(),
+            'add_groupcenter_form' => $this->createAddLinkGroupCenterForm($user, $request)->createView(),
             'delete_groupcenter_form' => array_map(
-                    function(\Symfony\Component\Form\Form $form) {
-                        return $form->createView();
-
-                    },
-                    iterator_to_array($this->getDeleteLinkGroupCenterByUser($user), true))
-        ));
+                static fn(Form $form) => $form->createView(),
+                iterator_to_array($this->getDeleteLinkGroupCenterByUser($user, $request), true)
+            )
+        ]);
     }
 
     private function getPersistedGroupCenter(GroupCenter $groupCenter)
@@ -279,10 +261,8 @@ class UserController extends CRUDController
      * Creates a form to delete a link to a GroupCenter
      *
      * @param mixed $permissionsGroup The entity id
-     *
-     * @return \Symfony\Component\Form\Form The form
      */
-    private function createDeleteLinkGroupCenterForm(User $user, GroupCenter $groupCenter, $request)
+    private function createDeleteLinkGroupCenterForm(User $user, GroupCenter $groupCenter, $request): FormInterface
     {
         $returnPathParams = $request->query->has('returnPath') ? ['returnPath' => $request->query->get('returnPath')] : [];
 
@@ -291,39 +271,29 @@ class UserController extends CRUDController
                     array_merge($returnPathParams, ['uid' => $user->getId(), 'gcid' => $groupCenter->getId()])))
             ->setMethod('DELETE')
             ->add('submit', SubmitType::class, array('label' => 'Delete'))
-            ->getForm()
-        ;
+            ->getForm();
     }
 
     /**
-     * create a form to add a link to a groupcenter
-     *
-     * @param User $user
-     * @return \Symfony\Component\Form\Form
+     * Create a form to add a link to a groupcenter.
      */
-    private function createAddLinkGroupCenterForm(User $user, Request $request)
+    private function createAddLinkGroupCenterForm(User $user, Request $request): FormInterface
     {
         $returnPathParams = $request->query->has('returnPath') ? ['returnPath' => $request->query->get('returnPath')] : [];
 
         return $this->createFormBuilder()
-                ->setAction($this->generateUrl('admin_user_add_groupcenter',
-                        array_merge($returnPathParams, ['uid' => $user->getId()])))
-                ->setMethod('POST')
-                ->add(self::FORM_GROUP_CENTER_COMPOSED, ComposedGroupCenterType::class)
-                ->add('submit', SubmitType::class, array('label' => 'Add a new groupCenter'))
-                ->getForm()
-                ;
+            ->setAction($this->generateUrl('admin_user_add_groupcenter',
+                    array_merge($returnPathParams, ['uid' => $user->getId()])))
+            ->setMethod('POST')
+            ->add(self::FORM_GROUP_CENTER_COMPOSED, ComposedGroupCenterType::class)
+            ->add('submit', SubmitType::class, array('label' => 'Add a new groupCenter'))
+            ->getForm();
     }
 
-    /**
-     *
-     * @param User $user
-     */
     private function getDeleteLinkGroupCenterByUser(User $user, Request $request)
     {
         foreach ($user->getGroupCenters() as $groupCenter) {
-            yield $groupCenter->getId() => $this
-                    ->createDeleteLinkGroupCenterForm($user, $groupCenter, $request);
+            yield $groupCenter->getId() => $this->createDeleteLinkGroupCenterForm($user, $groupCenter, $request);
         }
     }
 }

src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php

@@ -24,26 +24,26 @@ class LoadLanguages extends AbstractFixture implements ContainerAwareInterface,
     // Array of ancien languages (to exclude)
     private $ancientToExclude = ["ang", "egy", "fro", "goh", "grc", "la", "non", "peo", "pro", "sga",
         "dum", "enm", "frm", "gmh", "mga", "akk", "phn", "zxx", "got", "und"];
-    
+
     /**
-     * 
+     *
      * @var ContainerInterface
      */
     private $container;
-    
+
     public function setContainer(ContainerInterface $container = null)
     {
         $this->container = $container;
     }
-    
+
     public function getOrder() {
         return 10;
     }
-    
+
     public function load(ObjectManager $manager) {
-        
+
         echo "loading languages... \n";
-        
+
         foreach (Intl::getLanguageBundle()->getLanguageNames() as $code => $language) {
             if (
                     !in_array($code, $this->regionalVersionToInclude)
@@ -58,23 +58,24 @@ class LoadLanguages extends AbstractFixture implements ContainerAwareInterface,
                 $manager->persist($lang);
             }
         }
-        
+
         $manager->flush();
     }
-    
+
     /**
-     * prepare names for languages
-     * 
-     * @param string $languageCode
+     * Prepare names for languages.
+     *
      * @return string[] languages name indexed by available language code
      */
-    private function prepareName($languageCode) {
+    private function prepareName(string $languageCode): array {
+        $names = [];
+
         foreach ($this->container->getParameter('chill_main.available_languages') as $lang) {
             $names[$lang] = Intl::getLanguageBundle()->getLanguageName($languageCode);
         }
-        
+
         return $names;
     }
-    
+
 
 }

src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ACLFlagsCompilerPass.php

@@ -1,35 +1,32 @@
 <?php
-/*
- */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\DependencyInjection\CompilerPass;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Chill\MainBundle\Form\PermissionsGroupType;
 use Symfony\Component\DependencyInjection\Reference;
+use LogicException;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class ACLFlagsCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
         $permissionGroupType = $container->getDefinition(PermissionsGroupType::class);
-        
+
         foreach($container->findTaggedServiceIds('chill_main.flags') as $id => $tags) {
             $reference = new Reference($id);
-            
+
             foreach ($tags as $tag) {
                 switch($tag['scope']) {
                     case PermissionsGroupType::FLAG_SCOPE:
-                        
+
                         $permissionGroupType->addMethodCall('addFlagProvider', [ $reference ]);
                         break;
                     default:
-                        throw new \LogicalException(sprintf(
+                        throw new LogicException(sprintf(
                             "This tag 'scope' is not implemented: %s, on service with id %s", $tag['scope'], $id)
                             );
                 }

src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php

@@ -19,14 +19,11 @@ class Configuration implements ConfigurationInterface
 
     use AddWidgetConfigurationTrait;
 
-    /**
-     *
-     * @var ContainerBuilder
-     */
-    private $containerBuilder;
+    private ContainerBuilder $containerBuilder;
 
 
-    public function __construct(array $widgetFactories = array(),
+    public function __construct(
+            array $widgetFactories,
             ContainerBuilder $containerBuilder)
     {
         $this->setWidgetFactories($widgetFactories);
@@ -107,6 +104,9 @@ class Configuration implements ConfigurationInterface
                         ->booleanNode('form_show_scopes')
                             ->defaultTrue()
                         ->end()
+                        ->booleanNode('form_show_centers')
+                            ->defaultTrue()
+                        ->end()
                     ->end()
                 ->end()
                 ->arrayNode('redis')

src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php

@@ -30,27 +30,27 @@ use Chill\MainBundle\DependencyInjection\Widget\HasWidgetFactoriesExtensionInter
 
 /**
  * Compile the configurations and inject required service into container.
- * 
+ *
  * The widgets are services tagged with :
- * 
+ *
  * ```
  * { name: chill_widget, alias: my_alias, place: my_place }
  * ```
- * 
- * Or, if the tag does not exist or if you need to add some config to your 
+ *
+ * Or, if the tag does not exist or if you need to add some config to your
  * service depending on the config, you should use a `WidgetFactory` (see
  * `WidgetFactoryInterface`.
- * 
- * To reuse this compiler pass, simple execute the doProcess metho in your 
+ *
+ * To reuse this compiler pass, simple execute the doProcess metho in your
  * compiler. Example :
- * 
+ *
  * ```
  * namespace Chill\MainBundle\DependencyInjection\CompilerPass;
- * 
+ *
  * use Symfony\Component\DependencyInjection\ContainerBuilder;
  * use Chill\MainBundle\DependencyInjection\Widget\AbstractWidgetsCompilerPass;
  * class WidgetsCompilerPass extends AbstractWidgetsCompilerPass {
- *     
+ *
  *    public function process(ContainerBuilder $container)
  *    {
  *       $this->doProcess($container, 'chill_main', 'chill_main.widgets');
@@ -58,58 +58,58 @@ use Chill\MainBundle\DependencyInjection\Widget\HasWidgetFactoriesExtensionInter
  * }
  * ```
  *
- *        
+ *
  */
 abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
 {
     private $widgetServices = array();
-    
+
     /**
      *
      * @var WidgetFactoryInterface[]
      */
     private $widgetFactories;
-    
+
     /**
      * The service which will manage the widgets
-     * 
+     *
      * @var string
      */
     const WIDGET_MANAGER = 'chill.main.twig.widget';
-    
+
     /**
      * the method wich register the widget into give service.
      */
     const WIDGET_MANAGER_METHOD_REGISTER = 'addWidget';
-    
+
     /**
      * the value of the `name` key in service definitions's tag
-     * 
+     *
      * @var string
      */
     const WIDGET_SERVICE_TAG_NAME = 'chill_widget';
-    
+
     /**
-     * the key used to collect the alias in the service definition's tag. 
-     * the alias must be 
+     * the key used to collect the alias in the service definition's tag.
+     * the alias must be
      * injected into the configuration under 'alias' key.
-     * 
+     *
      * @var string
      */
     const WIDGET_SERVICE_TAG_ALIAS = 'alias';
-    
+
     /**
      * the key used to collect the authorized place in the service definition's tag
-     * 
+     *
      * @var string
      */
     const WIDGET_SERVICE_TAG_PLACES = 'place';
-    
+
     /**
      * the key to use to order widget for a given place
      */
     const WIDGET_CONFIG_ORDER = 'order';
-    
+
     /**
      * the key to use to identify widget for a given place
      */
@@ -118,24 +118,25 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
 
     /**
      * process the configuration and the container to add the widget available
-     * 
+     *
      * @param ContainerBuilder $container
      * @param string $extension the extension of your bundle
      * @param string $containerWidgetConfigParameterName the key under which we can use the widget configuration
      * @throws \LogicException
      * @throws \UnexpectedValueException if the given extension does not implement HasWidgetExtensionInterface
-     * @throws \InvalidConfigurationException if there are errors in the config
      */
-    public function doProcess(ContainerBuilder $container, $extension,
-            $containerWidgetConfigParameterName)
-    {
+    public function doProcess(
+        ContainerBuilder $container,
+        $extension,
+        $containerWidgetConfigParameterName
+    ) {
         if (!$container->hasDefinition(self::WIDGET_MANAGER)) {
             throw new \LogicException("the service ".self::WIDGET_MANAGER." should".
                 " be present. It is required by ".self::class);
         }
-        
+
         $managerDefinition = $container->getDefinition(self::WIDGET_MANAGER);
-        
+
         // collect the widget factories
         /* @var $extensionClass HasWidgetFactoriesExtensionInterface */
         $extensionClass = $container->getExtension($extension);
@@ -148,19 +149,19 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
                     HasWidgetFactoriesExtensionInterface::class,
                     get_class($extensionClass)));
         }
-        
-        
+
+
         $this->widgetFactories = $extensionClass->getWidgetFactories();
-        
+
         // collect the availabled tagged services
         $this->collectTaggedServices($container);
-        
+
         // collect the widgets and their config :
         $widgetParameters = $container->getParameter($containerWidgetConfigParameterName);
-        
+
         // and add them to the delegated_block
         foreach($widgetParameters as $place => $widgets) {
-            
+
             foreach ($widgets as $param) {
                 $alias = $param[self::WIDGET_CONFIG_ALIAS];
                 // check that the service exists
@@ -168,43 +169,43 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
                     throw new InvalidConfigurationException(sprintf("The alias %s".
                         " is not defined.", $alias));
                 }
-                
+
                 // check that the widget is allowed at this place
                 if (!$this->isPlaceAllowedForWidget($place, $alias, $container)) {
-                    throw new \InvalidConfigurationException(sprintf(
+                    throw new InvalidConfigurationException(sprintf(
                         "The widget with alias %s is not allowed at place %s",
-                        $alias, 
+                        $alias,
                         $place
                         ));
                 }
-                
+
                 // get the order, eventually corrected
-                $order = $this->cacheAndGetOrdering($place, $param[self::WIDGET_CONFIG_ORDER]); 
-                
+                $order = $this->cacheAndGetOrdering($place, $param[self::WIDGET_CONFIG_ORDER]);
+
                 // register the widget with config to the service, using the method
                 // `addWidget`
                 if ($this->widgetServices[$alias] instanceof WidgetFactoryInterface) {
                     /* @var $factory WidgetFactoryInterface */
                     $factory = $this->widgetServices[$alias];
                     // get the config (under the key which equals to widget_alias
-                    $config = isset($param[$factory->getWidgetAlias()]) ? 
+                    $config = isset($param[$factory->getWidgetAlias()]) ?
                                     $param[$factory->getWidgetAlias()] : array();
                     // register the service into the container
-                    $serviceId =$this->registerServiceIntoContainer($container, 
+                    $serviceId =$this->registerServiceIntoContainer($container,
                             $factory, $place, $order, $config);
-                    
+
                     $managerDefinition->addMethodCall(self::WIDGET_MANAGER_METHOD_REGISTER,
                             array(
-                                $place, 
-                                $order, 
-                                new Reference($serviceId), 
+                                $place,
+                                $order,
+                                new Reference($serviceId),
                                 $config
                         ));
                 } else {
                     $managerDefinition->addMethodCall(self::WIDGET_MANAGER_METHOD_REGISTER,
                             array(
-                                $place, 
-                                $order, 
+                                $place,
+                                $order,
                                 new Reference($this->widgetServices[$alias]),
                                 array() // the config is alway an empty array
                         ));
@@ -212,10 +213,10 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
             }
         }
     }
-    
+
     /**
      * register the service into container.
-     * 
+     *
      * @param ContainerBuilder $container
      * @param WidgetFactoryInterface $factory
      * @param string $place
@@ -231,28 +232,28 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
             array $config
             ) {
         $serviceId = $factory->getServiceId($container, $place, $order, $config);
-        $definition = $factory->createDefinition($container, $place, 
+        $definition = $factory->createDefinition($container, $place,
                 $order, $config);
         $container->setDefinition($serviceId, $definition);
-        
+
         return $serviceId;
     }
-    
+
     /**
      * cache of ordering by place.
-     * 
+     *
      * @internal used by function cacheAndGetOrdering
      * @var array
      */
     private $cacheOrdering = array();
-    
+
     /**
      * check if the ordering has already be used for the given $place and,
      * if yes, correct the ordering by incrementation of 1 until the ordering
      * has not be used.
-     * 
+     *
      * recursive method.
-     * 
+     *
      * @param string $place
      * @param float $ordering
      * @return float
@@ -262,7 +263,7 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
         if (!array_key_exists($place, $this->cacheOrdering)) {
             $this->cacheOrdering[$place] = array();
         }
-        
+
         // check if the order exists
         if (array_search($ordering, $this->cacheOrdering[$place])) {
             // if the order exists, increment of 1 and try again
@@ -270,14 +271,14 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
         } else {
             // cache the ordering
             $this->cacheOrdering[$place][] = $ordering;
-            
+
             return $ordering;
         }
     }
-    
+
     /**
      * get the places where the service is allowed
-     * 
+     *
      * @param Definition $definition
      * @return unknown
      */
@@ -288,7 +289,7 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
                     ->getAllowedPlaces())) {
                 return true;
             }
-            
+
         } else {
             $definition = $container->findDefinition($this->widgetServices[$widgetAlias]);
 
@@ -300,17 +301,17 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
                 }
             }
         }
-        
+
         return false;
     }
-    
+
     /**
      * This method collect all service tagged with `self::WIDGET_SERVICE_TAG`, and
      * add also the widget defined by factories
-     * 
+     *
      * This method also check that the service is correctly tagged with `alias` and
      * `places`, or the factory give a correct alias and more than one place.
-     * 
+     *
      * @param ContainerBuilder $container
      * @throws InvalidConfigurationException
      * @throws InvalidArgumentException
@@ -320,13 +321,13 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
         // first, check the service tagged in service definition
         foreach ($container->findTaggedServiceIds(self::WIDGET_SERVICE_TAG_NAME) as $id => $attrs) {
             foreach ($attrs as $attr) {
-                
+
                 // check the alias is set
                 if (!isset($attr[self::WIDGET_SERVICE_TAG_ALIAS])) {
                     throw new InvalidConfigurationException("you should add an ".self::WIDGET_SERVICE_TAG_ALIAS.
                         " key on the service ".$id);
                 }
-                
+
                 // check the place is set
                 if (!isset($attr[self::WIDGET_SERVICE_TAG_PLACES])) {
                     throw new InvalidConfigurationException(sprintf(
@@ -335,54 +336,54 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
                         $id
                         ));
                 }
-                
+
                 // check the alias does not exists yet
                 if (array_key_exists($attr[self::WIDGET_SERVICE_TAG_ALIAS], $this->widgetServices)) {
                     throw new InvalidArgumentException("a service has already be defined with the ".
                         self::WIDGET_SERVICE_TAG_ALIAS." ".$attr[self::WIDGET_SERVICE_TAG_ALIAS]);
                 }
-                
+
                 // register the service as available
                 $this->widgetServices[$attr[self::WIDGET_SERVICE_TAG_ALIAS]] = $id;
             }
         }
-        
+
         // add the services defined by factories
         foreach($this->widgetFactories as $factory) {
             /* @var $factory WidgetFactoryInterface */
             $alias = $factory->getWidgetAlias();
-            
+
             // check the alias is not empty
             if (empty($alias)) {
                 throw new \LogicException(sprintf(
                         "the widget factory %s returns an empty alias",
                         get_class($factory)));
             }
-            
+
             // check the places are not empty
             if (!is_array($factory->getAllowedPlaces())) {
                 throw new \UnexpectedValueException("the method 'getAllowedPlaces' "
                         . "should return a non-empty array. Unexpected value on ".
                         get_class($factory));
             }
-            
+
             if (count($factory->getAllowedPlaces()) == 0) {
                 throw new \LengthException("The method 'getAllowedPlaces' should "
                         . "return a non-empty array, but returned 0 elements on ".
                         get_class($factory).'::getAllowedPlaces()');
             }
-            
+
             // check the alias does not exists yet
             if (array_key_exists($alias, $this->widgetServices)) {
                 throw new InvalidArgumentException("a service has already be defined with the ".
                     self::WIDGET_SERVICE_TAG_ALIAS." ".$alias);
             }
-            
+
             // register the factory as available
             $this->widgetServices[$factory->getWidgetAlias()] = $factory;
-            
+
         }
     }
-    
-    
-}
+
+
+}

src/Bundle/ChillMainBundle/Doctrine/DQL/OverlapsI.php

@@ -1,58 +1,43 @@
 <?php
-/*
- * Chill is a software for social workers
- * Copyright (C) 2018 Champs-Libres Coopérative <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Doctrine\DQL;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\AST\PathExpression;
 use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
 
 /**
  * DQL function for OVERLAPS function in postgresql
- * 
- * If a value is null in period start, it will be replaced by -infinity. 
+ *
+ * If a value is null in period start, it will be replaced by -infinity.
  * If a value is null in period end, it will be replaced by infinity
- * 
  */
 class OverlapsI extends FunctionNode
 {
     private $firstPeriodStart;
-    
+
     private $firstPeriodEnd;
-    
+
     private $secondPeriodStart;
-    
+
     private $secondPeriodEnd;
-    
+
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        return '('
-            .$this->makeCase($sqlWalker, $this->firstPeriodStart, 'start').', '
-            .$this->makeCase($sqlWalker, $this->firstPeriodEnd, 'end').
-            ') OVERLAPS ('
-            .$this->makeCase($sqlWalker, $this->secondPeriodStart, 'start').', '
-            .$this->makeCase($sqlWalker, $this->secondPeriodEnd, 'end').')'
-            ;
+        return sprintf(
+            '(%s, %s) OVERLAPS (%s, %s)',
+            $this->makeCase($sqlWalker, $this->firstPeriodStart, 'start'),
+            $this->makeCase($sqlWalker, $this->firstPeriodEnd, 'end'),
+            $this->makeCase($sqlWalker, $this->secondPeriodStart, 'start'),
+            $this->makeCase($sqlWalker, $this->secondPeriodEnd, 'end')
+        );
     }
-    
-    protected function makeCase($sqlWalker, $part, $position)
+
+    protected function makeCase($sqlWalker, $part, string $position): string
     {
-        //return $part->dispatch($sqlWalker);
-        
         switch ($position) {
             case 'start' :
                 $p = '-infinity';
@@ -60,51 +45,51 @@ class OverlapsI extends FunctionNode
             case 'end':
                 $p = 'infinity';
                 break;
+            default:
+                throw new \Exception('Unexpected position value.');
         }
-        
-        if ($part instanceof \Doctrine\ORM\Query\AST\PathExpression) {
-            return 'CASE WHEN '
-                .'  '.$part->dispatch($sqlWalker).' IS NOT NULL '
-                . 'THEN '.
-                $part->dispatch($sqlWalker)
-                . ' ELSE '.
-                "'".$p."'::date "
-                . 'END';
-        } else {
-            return 'CASE WHEN '
-                .'  '.$part->dispatch($sqlWalker).'::date IS NOT NULL '
-                . 'THEN '.
-                $part->dispatch($sqlWalker)
-                . '::date ELSE '.
-                "'".$p."'::date "
-                . 'END';
+
+        if ($part instanceof PathExpression) {
+            return sprintf(
+                "CASE WHEN %s IS NOT NULL THEN %s ELSE '%s'::date END",
+                $part->dispatch($sqlWalker),
+                $part->dispatch($sqlWalker),
+                $p
+            );
         }
+
+        return sprintf(
+            "CASE WHEN %s::date IS NOT NULL THEN %s::date ELSE '%s'::date END",
+            $part->dispatch($sqlWalker),
+            $part->dispatch($sqlWalker),
+            $p
+        );
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
-        
+
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
-        
+
         $this->firstPeriodStart = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_COMMA);
-        
+
         $this->firstPeriodEnd = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
-        
+
         $parser->match(Lexer::T_COMMA);
-        
+
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
-        
+
         $this->secondPeriodStart = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_COMMA);
-        
+
         $this->secondPeriodEnd = $parser->StringPrimary();
-        
+
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
 }

src/Bundle/ChillMainBundle/Doctrine/Model/Point.php

@@ -4,13 +4,9 @@ namespace Chill\MainBundle\Doctrine\Model;
 
 use \JsonSerializable;
 
-/**
- * Description of Point
- *
- */
 class Point implements JsonSerializable {
-    private ?float $lat = null;
-    private ?float $lon = null;
+    private ?float $lat;
+    private ?float $lon;
     public static string $SRID = '4326';
 
     private function __construct(?float $lon, ?float $lat)
@@ -22,6 +18,7 @@ class Point implements JsonSerializable {
     public function toGeoJson(): string
     {
         $array = $this->toArrayGeoJson();
+
         return \json_encode($array);
     }
 
@@ -33,60 +30,53 @@ class Point implements JsonSerializable {
     public function toArrayGeoJson(): array
     {
         return [
-            "type" => "Point",
-            "coordinates" => [ $this->lon, $this->lat ]
+            'type' => 'Point',
+            'coordinates' => [$this->lon, $this->lat],
         ];
     }
 
-    /**
-     *
-     * @return string
-     */
     public function toWKT(): string
     {
-        return 'SRID='.self::$SRID.';POINT('.$this->lon.' '.$this->lat.')';
+        return sprintf("SRID=%s;POINT(%s %s)", self::$SRID, $this->lon, $this->lat);
     }
 
-    /**
-     *
-     * @param type $geojson
-     * @return Point
-     */
-    public static function fromGeoJson(string $geojson): Point
+    public static function fromGeoJson(string $geojson): self
     {
         $a = json_decode($geojson);
-        //check if the geojson string is correct
-        if (NULL === $a or !isset($a->type) or !isset($a->coordinates)){
+
+        if (null === $a) {
             throw PointException::badJsonString($geojson);
         }
 
-        if ($a->type != 'Point'){
+        if (null === $a->type || null === $a->coordinates) {
+            throw PointException::badJsonString($geojson);
+        }
+
+        if ($a->type !== 'Point'){
             throw PointException::badGeoType();
         }
 
-        $lat = $a->coordinates[1];
-        $lon = $a->coordinates[0];
+        [$lon, $lat] = $a->coordinates;
 
         return Point::fromLonLat($lon, $lat);
     }
 
-    public static function fromLonLat(float $lon, float $lat): Point
+    public static function fromLonLat(float $lon, float $lat): self
     {
-        if (($lon > -180 && $lon < 180) && ($lat > -90 && $lat < 90))
-        {
+        if (($lon > -180 && $lon < 180) && ($lat > -90 && $lat < 90)) {
             return new Point($lon, $lat);
-        } else {
-            throw PointException::badCoordinates($lon, $lat);
         }
+
+        throw PointException::badCoordinates($lon, $lat);
     }
 
-    public static function fromArrayGeoJson(array $array): Point
+    public static function fromArrayGeoJson(array $array): self
     {
-        if ($array['type'] == 'Point' &&
-                isset($array['coordinates']))
-        {
+        if ($array['type'] === 'Point' && isset($array['coordinates'])) {
             return self::fromLonLat($array['coordinates'][0], $array['coordinates'][1]);
         }
+
+        throw new \Exception('Unable to build a point from input data.');
     }
 
     public function getLat(): float

src/Bundle/ChillMainBundle/Doctrine/Type/PointType.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Doctrine\Type;
 
 use Chill\MainBundle\Doctrine\Model\Point;
@@ -7,40 +9,32 @@ use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Chill\MainBundle\Doctrine\Model\PointException;
 
-
 /**
  * A Type for Doctrine to implement the Geography Point type
  * implemented by Postgis on postgis+postgresql databases
- *
  */
-class PointType extends Type {
-
-    const POINT = 'point';
+class PointType extends Type
+{
+    public const POINT = 'point';
 
     /**
-     *
-     * @param array $fieldDeclaration
-     * @param AbstractPlatform $platform
      * @return string
      */
-    public function getSqlDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
+    public function getSQLDeclaration(array $column, AbstractPlatform $platform)
     {
         return 'geometry(POINT,'.Point::$SRID.')';
     }
 
     /**
-     *
-     * @param type $value
-     * @param AbstractPlatform $platform
      * @return ?Point
      */
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
         if ($value === NULL){
             return NULL;
-        } else {
-            return Point::fromGeoJson($value);
         }
+
+        return Point::fromGeoJson($value);
     }
 
     public function getName()
@@ -52,9 +46,9 @@ class PointType extends Type {
     {
         if ($value === NULL){
             return NULL;
-        } else {
-            return $value->toWKT();
         }
+
+        return $value->toWKT();
     }
 
     public function canRequireSQLConversion()

src/Bundle/ChillMainBundle/Entity/Center.php

@@ -1,19 +1,19 @@
 <?php
 
 /*
- * 
+ *
  * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -23,12 +23,11 @@ namespace Chill\MainBundle\Entity;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * @ORM\Entity
  * @ORM\Table(name="centers")
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class Center implements HasCenterInterface
 {
@@ -46,9 +45,10 @@ class Center implements HasCenterInterface
      * @var string
      *
      * @ORM\Column(type="string", length=255)
+     * @Serializer\Groups({"docgen:read"})
      */
-    private $name;
-    
+    private string $name = '';
+
     /**
      * @var Collection
      *
@@ -58,8 +58,8 @@ class Center implements HasCenterInterface
      * )
      */
     private $groupCenters;
-    
-    
+
+
     /**
      * Center constructor.
      */
@@ -67,7 +67,7 @@ class Center implements HasCenterInterface
     {
         $this->groupCenters = new \Doctrine\Common\Collections\ArrayCollection();
     }
-    
+
     /**
      * @return string
      */
@@ -75,7 +75,7 @@ class Center implements HasCenterInterface
     {
         return $this->name;
     }
-    
+
     /**
      * @param $name
      * @return $this
@@ -85,7 +85,7 @@ class Center implements HasCenterInterface
         $this->name = $name;
         return $this;
     }
-    
+
     /**
      * @return int
      */
@@ -93,7 +93,7 @@ class Center implements HasCenterInterface
     {
         return $this->id;
     }
-    
+
     /**
      * @return ArrayCollection|Collection
      */
@@ -101,7 +101,7 @@ class Center implements HasCenterInterface
     {
         return $this->groupCenters;
     }
-    
+
     /**
      * @param GroupCenter $groupCenter
      * @return $this
@@ -111,7 +111,7 @@ class Center implements HasCenterInterface
         $this->groupCenters->add($groupCenter);
         return $this;
     }
-    
+
     /**
      * @return string
      */
@@ -119,7 +119,7 @@ class Center implements HasCenterInterface
     {
         return $this->getName();
     }
-    
+
     /**
      * @return $this|Center
      */

src/Bundle/ChillMainBundle/Entity/RoleScope.php

@@ -1,22 +1,6 @@
 <?php
 
-/*
- * Chill is a suite of a modules, Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- * 
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+declare(strict_types=1);
 
 namespace Chill\MainBundle\Entity;
 
@@ -28,38 +12,30 @@ use Doctrine\Common\Collections\ArrayCollection;
  * @ORM\Entity
  * @ORM\Table(name="role_scopes")
  * @ORM\Cache(usage="NONSTRICT_READ_WRITE", region="acl_cache_region")
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class RoleScope
 {
     /**
-     * @var integer
-     *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
-    
+    private ?int $id = null;
+
     /**
-     * @var string
-     *
      * @ORM\Column(type="string", length=255)
      */
-    private $role;
-    
+    private ?string $role = null;
+
     /**
-     * @var Scope
-     *
      * @ORM\ManyToOne(
      *     targetEntity="Chill\MainBundle\Entity\Scope",
      *     inversedBy="roleScopes")
      * @ORM\JoinColumn(nullable=true, name="scope_id")
      * @ORM\Cache(usage="NONSTRICT_READ_WRITE")
      */
-    private $scope;
-    
+    private ?Scope $scope = null;
+
     /**
      * @var Collection
      *
@@ -68,59 +44,37 @@ class RoleScope
      *     mappedBy="roleScopes")
      */
     private $permissionsGroups;
-    
-    
-    /**
-     * RoleScope constructor.
-     */
+
     public function __construct() {
-        $this->new = true;
         $this->permissionsGroups = new ArrayCollection();
     }
-    
-    /**
-     * @return int
-     */
-    public function getId()
+
+    public function getId(): ?int
     {
         return $this->id;
     }
 
-    /**
-     * @return string
-     */
-    public function getRole()
+    public function getRole(): ?string
     {
         return $this->role;
     }
 
-    /**
-     * @return Scope
-     */
-    public function getScope()
+    public function getScope(): ?Scope
     {
         return $this->scope;
     }
-    
-    /**
-     * @param type $role
-     * @return RoleScope
-     */
-    public function setRole($role)
+
+    public function setRole(?string $role = null): self
     {
         $this->role = $role;
 
         return $this;
     }
 
-    /**
-     * @param Scope $scope
-     * @return RoleScope
-     */
-    public function setScope(Scope $scope = null)
+    public function setScope(?Scope $scope = null): self
     {
         $this->scope = $scope;
-        
+
         return $this;
     }
 }

src/Bundle/ChillMainBundle/Entity/User.php

@@ -8,7 +8,7 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Chill\MainBundle\Entity\UserJob;
 use Symfony\Component\Security\Core\User\AdvancedUserInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * User
@@ -16,7 +16,7 @@ use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
  * @ORM\Entity
  * @ORM\Table(name="users")
  * @ORM\Cache(usage="NONSTRICT_READ_WRITE", region="acl_cache_region")
- * @DiscriminatorMap(typeProperty="type", mapping={
+ * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
  *    "user"=User::class
  * })
  */
@@ -51,6 +51,7 @@ class User implements AdvancedUserInterface {
 
     /**
      * @ORM\Column(type="string", length=200)
+     * @Serializer\Groups({"docgen:read"})
      */
     private string $label = '';
 
@@ -58,8 +59,9 @@ class User implements AdvancedUserInterface {
      * @var string
      *
      * @ORM\Column(type="string", length=150, nullable=true)
+     * @Serializer\Groups({"docgen:read"})
      */
-    private $email;
+    private ?string $email = null;
 
     /**
      * @var string
@@ -123,6 +125,7 @@ class User implements AdvancedUserInterface {
     /**
      * @var Center|null
      * @ORM\ManyToOne(targetEntity=Center::class)
+     * @Serializer\Groups({"docgen:read"})
      */
     private ?Center $mainCenter = null;
 

src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php

@@ -1,48 +1,25 @@
 <?php
 
-/*
- * Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+declare(strict_types=1);
 
 namespace Chill\MainBundle\Export\Formatter;
 
-use Chill\MainBundle\Export\ExportInterface;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Chill\MainBundle\Export\FormatterInterface;
-use Symfony\Component\Translation\TranslatorInterface;
-use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use Chill\MainBundle\Export\ExportManager;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
-// command to get the report with curl : curl --user "center a_social:password" "http://localhost:8000/fr/exports/generate/count_person?export[filters][person_gender_filter][enabled]=&export[filters][person_nationality_filter][enabled]=&export[filters][person_nationality_filter][form][nationalities]=&export[aggregators][person_nationality_aggregator][order]=1&export[aggregators][person_nationality_aggregator][form][group_by_level]=country&export[submit]=&export[_token]=RHpjHl389GrK-bd6iY5NsEqrD5UKOTHH40QKE9J1edU" --globoff
-
 /**
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Command to get the report with curl:
+ *   curl --user "center a_social:password" "http://localhost:8000/fr/exports/generate/count_person?export[filters][person_gender_filter][enabled]=&export[filters][person_nationality_filter][enabled]=&export[filters][person_nationality_filter][form][nationalities]=&export[aggregators][person_nationality_aggregator][order]=1&export[aggregators][person_nationality_aggregator][form][group_by_level]=country&export[submit]=&export[_token]=RHpjHl389GrK-bd6iY5NsEqrD5UKOTHH40QKE9J1edU" --globoff
  * @deprecated this formatter is not used any more.
  */
 class CSVFormatter implements FormatterInterface
 {
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
 
     protected $result;
 
@@ -85,11 +62,7 @@ class CSVFormatter implements FormatterInterface
     }
 
     /**
-     *
      * @uses appendAggregatorForm
-     * @param FormBuilderInterface $builder
-     * @param type $exportAlias
-     * @param array $aggregatorAliases
      */
     public function buildForm(FormBuilderInterface $builder, $exportAlias, array $aggregatorAliases)
     {
@@ -172,20 +145,35 @@ class CSVFormatter implements FormatterInterface
      * If two aggregators have the same order, the second given will be placed
      * after.  This is not significant for the first ordering.
      *
-     * @param type $formatterData
-     * @return type
      */
-    protected function orderingHeaders($formatterData)
+    protected function orderingHeaders(array $formatterData)
     {
         $this->formatterData = $formatterData;
-        uasort($this->formatterData, function($a, $b) {
+        uasort(
+            $this->formatterData,
+            static fn(array $a, array $b): int => ($a['order'] <= $b['order'] ? -1 : 1)
+        );
+    }
 
-            return ($a['order'] <= $b['order'] ? -1 : 1);
-        });
+    private function findColumnPosition(&$columnHeaders, $columnToFind): int
+    {
+        $i = 0;
+        foreach($columnHeaders as $set) {
+            if ($set === $columnToFind) {
+                return $i;
+            }
+            $i++;
+        }
+
+        //we didn't find it, adding the column
+        $columnHeaders[] = $columnToFind;
+
+        return $i++;
     }
 
     protected function generateContent()
     {
+        $line = null;
         $rowKeysNb = count($this->getRowHeaders());
         $columnKeysNb = count($this->getColumnHeaders());
         $resultsKeysNb = count($this->export->getQueryKeys($this->exportData));
@@ -196,21 +184,6 @@ class CSVFormatter implements FormatterInterface
         $contentData = array();
         $content = array();
 
-        function findColumnPosition(&$columnHeaders, $columnToFind) {
-            $i = 0;
-            foreach($columnHeaders as $set) {
-                if ($set === $columnToFind) {
-                    return $i;
-                }
-                $i++;
-            }
-
-            //we didn't find it, adding the column
-            $columnHeaders[] = $columnToFind;
-
-            return $i++;
-        }
-
         // create a file pointer connected to the output stream
         $output = fopen('php://output', 'w');
 
@@ -244,7 +217,7 @@ class CSVFormatter implements FormatterInterface
             // add the column headers
             /* @var $columns string[] the column for this row */
             $columns = array_slice($row, $rowKeysNb, $columnKeysNb);
-            $columnPosition = findColumnPosition($columnHeaders, $columns);
+            $columnPosition = $this->findColumnPosition($columnHeaders, $columns);
 
             //fill with blank at the position given by the columnPosition + nbRowHeaders
             for ($i=0; $i < $columnPosition; $i++) {

src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php

@@ -229,7 +229,7 @@ class SpreadSheetFormatter implements FormatterInterface
             $this->getContentType($this->formatterData['format']));
 
         $this->tempfile = \tempnam(\sys_get_temp_dir(), '');
-        $this->generatecontent();
+        $this->generateContent();
 
         $f = \fopen($this->tempfile, 'r');
         $response->setContent(\stream_get_contents($f));

src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php

@@ -51,8 +51,10 @@ class CenterTransformer implements DataTransformerInterface
             }
         }
 
+        $ids = [];
+
         if ($this->multiple) {
-            $ids = \explode(',', $id);
+            $ids = explode(',', $id);
         } else {
             $ids[] = (int) $id;
         }
@@ -68,9 +70,9 @@ class CenterTransformer implements DataTransformerInterface
 
         if ($this->multiple) {
             return new ArrayCollection($centers);
-        } else {
-            return $centers[0];
         }
+
+        return $centers[0];
     }
 
     public function transform($center)

src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php

@@ -1,48 +1,25 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Form\Type\DataTransformer;
 
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class DateIntervalTransformer implements DataTransformerInterface
 {
-    /**
-     * 
-     * @param \DateInterval $value
-     * @throws UnexpectedTypeException
-     */
     public function transform($value)
     {
         if (empty($value)) {
             return null;
         }
-        
+
         if (!$value instanceof \DateInterval) {
             throw new UnexpectedTypeException($value, \DateInterval::class);
         }
-        
+
         if ($value->d > 0) {
             // we check for weeks (weeks are converted to 7 days)
             if ($value->d % 7 === 0) {
@@ -50,43 +27,49 @@ class DateIntervalTransformer implements DataTransformerInterface
                     'n' => $value->d / 7,
                     'unit' => 'W'
                     ];
-            } else {
-                return [
-                    'n' => $value->d,
-                    'unit' => 'D'
-                ];
             }
-        } elseif ($value->m > 0) {
+
+            return [
+                'n' => $value->d,
+                'unit' => 'D'
+            ];
+        }
+
+        if ($value->m > 0) {
             return [
                 'n' => $value->m,
                 'unit' => 'M'
             ];
-        } elseif ($value->y > 0) {
+        }
+
+        if ($value->y > 0) {
             return [
                 'n' => $value->y,
                 'unit' => 'Y'
             ];
         }
-        
-        throw new TransformationFailedException('the date interval does not '
-            . 'contains any days, months or years');
+
+        throw new TransformationFailedException(
+            'The date interval does not contains any days, months or years.'
+        );
     }
 
     public function reverseTransform($value)
     {
-        if (empty($value) or empty($value['n'])) {
+        if (empty($value) || empty($value['n'])) {
             return null;
         }
-        
+
         $string = 'P'.$value['n'].$value['unit'];
-        
+
         try {
             return new \DateInterval($string);
         } catch (\Exception $e) {
-            throw new TransformationFailedException("Could not transform value "
-                . "into DateInterval", 1542, $e);
+            throw new TransformationFailedException(
+                'Could not transform value into DateInterval',
+                1542,
+                $e
+            );
         }
-        
-        
     }
 }

src/Bundle/ChillMainBundle/Pagination/PageGenerator.php

@@ -1,50 +1,23 @@
 <?php
 
-/*
- * Chill is a software for social workers
- * Copyright (C) 2016 Champs-Libres Coopérative <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+declare(strict_types=1);
 
 namespace Chill\MainBundle\Pagination;
 
 /**
- * PageGenerator associated with a Paginator
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
+ * PageGenerator associated with a Paginator.
  */
 class PageGenerator implements \Iterator
 {
-    /**
-     *
-     * @var Paginator
-     */
-    protected $paginator;
-    
-    /**
-     *
-     * @var int
-     */
-    protected $current = 1;
-    
-    public function __construct(Paginator $paginator) 
+    protected Paginator $paginator;
+
+    protected int $current = 1;
+
+    public function __construct(Paginator $paginator)
     {
         $this->paginator = $paginator;;
     }
-    
+
     public function current()
     {
         return $this->paginator->getPage($current);
@@ -67,7 +40,7 @@ class PageGenerator implements \Iterator
 
     public function valid()
     {
-        return $this->current > 0 
+        return $this->current > 0
               && $this->current <= $this->paginator->countPages();
     }
 }

src/Bundle/ChillMainBundle/Repository/UserRepository.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Repository;
 
+use Chill\MainBundle\Entity\GroupCenter;
 use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;

src/Bundle/ChillMainBundle/Resources/public/chill/chillmain.scss

@@ -402,3 +402,11 @@ input.belgian_national_number {
    &.daily_counter {}
    &.control_digit {}
 }
+
+// replace abbr
+span.item-key {
+    font-variant: all-small-caps;
+    font-size: 90%;
+    background-color: #0000000a;
+    //text-decoration: dotted underline;
+}

src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/index.js

@@ -8,3 +8,43 @@ require('./bootstrap.scss');
 import Dropdown from 'bootstrap/js/src/dropdown';
 import Modal from 'bootstrap/js/dist/modal';
 import Collapse from 'bootstrap/js/src/collapse';
+import Carousel from 'bootstrap/js/src/carousel';
+
+//
+// ACHeaderSlider is a small slider used in banner of AccompanyingCourse Section
+// Initialize options, and show/hide controls in first/last slides
+//
+let ACHeaderSlider = document.querySelector('#ACHeaderSlider');
+if (ACHeaderSlider) {
+    let controlPrev = ACHeaderSlider.querySelector('button[data-bs-slide="prev"]'),
+        controlNext = ACHeaderSlider.querySelector('button[data-bs-slide="next"]'),
+        length = ACHeaderSlider.querySelectorAll('.carousel-item').length,
+        last = length-1,
+        carousel = new Carousel(ACHeaderSlider, {
+            interval: false,
+            wrap: false,
+            ride: false,
+            keyboard: false,
+            touch: true
+        })
+    ;
+    document.addEventListener('DOMContentLoaded', (e) => {
+        controlNext.classList.remove('visually-hidden');
+    });
+    ACHeaderSlider.addEventListener('slid.bs.carousel', (e) => {
+        //console.log('from slide', e.direction, e.relatedTarget, e.from, e.to );
+        switch (e.to) {
+            case 0:
+                controlPrev.classList.add('visually-hidden');
+                controlNext.classList.remove('visually-hidden');
+                break;
+            case last:
+                controlPrev.classList.remove('visually-hidden');
+                controlNext.classList.add('visually-hidden');
+                break;
+            default:
+                controlPrev.classList.remove('visually-hidden');
+                controlNext.classList.remove('visually-hidden');
+        }
+    })
+}

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/mod_input_address_index.js

@@ -6,12 +6,12 @@ import App from './App.vue';
 const i18n = _createI18n(addressMessages);
 
 const addAddressInput = (inputs) => {
-
+    console.log(inputs)
     inputs.forEach(el => {
         let
             addressId = el.value,
             uniqid = el.dataset.inputAddress,
-            container = document.querySelector('div[data-input-address-container="' + uniqid + '"]'),
+            container = el.parentNode.querySelector('div[data-input-address-container="' + uniqid + '"]'),
             isEdit = addressId !== '',
             addressIdInt = addressId !== '' ? parseInt(addressId) : null
         ;

src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js

@@ -45,7 +45,8 @@ const messages = {
          redirect: {
             person: "Quitter la page et ouvrir la fiche de l'usager",
             thirdparty: "Quitter la page et voir le tiers",
-         }
+         },
+         refresh: 'Rafraîchir'
       },
       nav: {
          next: "Suivant",

src/Bundle/ChillMainBundle/Resources/views/Entity/address.html.twig

@@ -58,6 +58,13 @@
 
 {% macro inline(address, options) %}
     {% if options['has_no_address'] == true and address.isNoAddress == true %}
+        {% if address.postCode is not empty %}
+            <p class="postcode">
+                <span class="code">{{ address.postCode.code }}</span>
+                <span class="name">{{ address.postCode.name }}</span>
+            </p>
+            <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
+        {% endif %}
         <span class="noaddress">
             {{ 'address.consider homeless'|trans }}
         </span>
@@ -108,9 +115,19 @@
 {%- if render == 'bloc' -%}
     <div class="chill-entity entity-address">
         {% if options['has_no_address'] == true and address.isNoAddress == true %}
+            {% if address.postCode is not empty %}
+            <div class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">
+                <p class="postcode">
+                    <span class="code">{{ address.postCode.code }}</span>
+                    <span class="name">{{ address.postCode.name }}</span>
+                </p>
+                <p class="country">{{ address.postCode.country.name|localize_translatable_string }}</p>
+            </div>    
+            {% endif %}
             <div class="noaddress">
                 {{ 'address.consider homeless'|trans }}
             </div>
+        
         {% else %}
             <div class="address{% if options['multiline'] %} multiline{% endif %}{% if options['with_delimiter'] %} delimiter{% endif %}">
                 {% if options['with_picto'] %}

src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig

@@ -10,30 +10,32 @@
               </div>
             {% endif %}
         </div>
-        {% if form.checkboxes|length > 0 %}
-            {% for checkbox_name, options in form.checkboxes %}
-                <div class="row gx-0">
-                    <div class="col-md-12">
-                        {% for c in form['checkboxes'][checkbox_name].children %}
-                            <div class="form-check form-check-inline">
-                                {{ form_widget(c) }}
-                                {{ form_label(c) }}
-                            </div>
-                        {% endfor %}
-                    </div>
-                </div>
-                {% if loop.last %}
+        {% if form.checkboxes is defined %}
+            {% if form.checkboxes|length > 0 %}
+                {% for checkbox_name, options in form.checkboxes %}
                     <div class="row gx-0">
                         <div class="col-md-12">
-                            <ul class="record_actions">
-                                <li>
-                                    <button type="submit" class="btn btn-misc"><i class="fa fa-filter"></i></button>
-                                </li>
-                            </ul>
+                            {% for c in form['checkboxes'][checkbox_name].children %}
+                                <div class="form-check form-check-inline">
+                                    {{ form_widget(c) }}
+                                    {{ form_label(c) }}
+                                </div>
+                            {% endfor %}
                         </div>
                     </div>
-                {% endif %}
-            {% endfor %}
+                    {% if loop.last %}
+                        <div class="row gx-0">
+                            <div class="col-md-12">
+                                <ul class="record_actions">
+                                    <li>
+                                        <button type="submit" class="btn btn-misc"><i class="fa fa-filter"></i></button>
+                                    </li>
+                                </ul>
+                            </div>
+                        </div>
+                    {% endif %}
+                {% endfor %}
+            {% endif %}
         {% endif %}
     </div>
 {{ form_end(form) }}

src/Bundle/ChillMainBundle/Resources/views/layout.html.twig

@@ -5,7 +5,7 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-    <title>{{ installation.name }} - {% block title %}{% endblock %}</title>
+    <title>{{ installation.name }} - {% block title %}{{ 'Homepage'|trans }}{% endblock %}</title>
     <link rel="shortcut icon" href="{{ asset('build/images/favicon.ico') }}" type="image/x-icon">
 
     {{ encore_entry_link_tags('mod_bootstrap') }}
@@ -68,6 +68,9 @@
                             <button type="submit" class="btn btn-lg btn-warning mt-3">
                                 <i class="fa fa-fw fa-search"></i> {{ 'Search'|trans }}
                             </button>
+                            <a class="btn btn-lg btn-misc mt-3" href="{{ path('chill_main_advanced_search_list') }}">
+                                <i class="fa fa-fw fa-search"></i> {{ 'Advanced search'|trans }}
+                            </a>
                         </center>
                     </form>
                 </div>

src/Bundle/ChillMainBundle/Routing/Loader/ChillRoutesLoader.php

@@ -1,22 +1,6 @@
 <?php
 
-/*
- * Chill is a software for social workers
- * Copyright (C) 2015 Champs-Libres Coopérative <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+declare(strict_types=1);
 
 namespace Chill\MainBundle\Routing\Loader;
 
@@ -25,52 +9,34 @@ use Symfony\Component\Routing\RouteCollection;
 
 /**
  * Import routes from bundles
- * 
- * Routes must be defined in configuration, add an entry 
- * under `chill_main.routing.resources`
- * 
- * 
  *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * Routes must be defined in configuration, add an entry
+ * under `chill_main.routing.resources`
  */
 class ChillRoutesLoader extends Loader
 {
-    private $routes;
-    
-   
-    
+    private array $routes;
+
     public function __construct(array $routes)
     {
         $this->routes = $routes;
+
+        parent::__construct();
     }
-    
-    /**
-     * {@inheritDoc}
-     * 
-     * @param type $resource
-     * @param type $type
-     * @return RouteCollection
-     */
+
     public function load($resource, $type = null)
     {
         $collection = new RouteCollection();
-        
-        foreach ($this->routes as $resource) {
+
+        foreach ($this->routes as $routeResource) {
             $collection->addCollection(
-                  $this->import($resource, NULL)
-                  );
+                $this->import($routeResource, NULL)
+            );
         }
-        
+
         return $collection;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @param type $resource
-     * @param type $type
-     * @return boolean
-     */
     public function supports($resource, $type = null)
     {
         return 'chill_routes' === $type;

src/Bundle/ChillMainBundle/Routing/MenuComposer.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Routing;
 
 use Symfony\Component\Routing\RouteCollection;
@@ -8,43 +10,28 @@ use Knp\Menu\FactoryInterface;
 use Knp\Menu\ItemInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 
-
 /**
  * This class permit to build menu from the routing information
  * stored in each bundle.
- * 
- * how to must come here FIXME 
+ *
+ * how to must come here FIXME
  *
  * @author julien
  */
 class MenuComposer
 {
-    
-    /**
-     *
-     * @var RouterInterface
-     */
-    private $router;
-    
-    /**
-     *
-     * @var FactoryInterface
-     */
-    private $menuFactory;
-    
-    /**
-     *
-     * @var TranslatorInterface
-     */
-    private $translator;
-    
-    /**
-     *
-     * @var 
-     */
-    private $localMenuBuilders = [];
-    
-    
+
+    private RouterInterface $router;
+
+    private FactoryInterface $menuFactory;
+
+    private TranslatorInterface $translator;
+
+    private array $localMenuBuilders = [];
+
+    private RouteCollection $routeCollection;
+
+
     function __construct(
         RouterInterface $router,
         FactoryInterface $menuFactory,
@@ -60,7 +47,7 @@ class MenuComposer
      * This function is needed for testing purpose: routeCollection is not
      * available as a service (RouterInterface is provided as a service and
      * added to this class as paramater in __construct)
-     * 
+     *
      * @param RouteCollection $routeCollection
      */
     public function setRouteCollection(RouteCollection $routeCollection)
@@ -71,7 +58,7 @@ class MenuComposer
     /**
      * Return an array of routes added to $menuId,
      * The array is aimed to build route with MenuTwig
-     * 
+     *
      * @param string $menuId
      * @param array $parameters see https://redmine.champs-libres.coop/issues/179
      * @return array
@@ -83,7 +70,7 @@ class MenuComposer
 
         foreach ($routeCollection->all() as $routeKey => $route) {
             if ($route->hasOption('menus')) {
-                
+
                 if (array_key_exists($menuId, $route->getOption('menus'))) {
                     $route = $route->getOption('menus')[$menuId];
 
@@ -101,12 +88,12 @@ class MenuComposer
 
         return $routes;
     }
-    
+
     public function getMenuFor($menuId, array $parameters = array())
     {
         $routes = $this->getRoutesFor($menuId, $parameters);
         $menu = $this->menuFactory->createItem($menuId);
-        
+
         // build menu from routes
         foreach ($routes as $order => $route) {
             $menu->addChild($this->translator->trans($route['label']), [
@@ -121,24 +108,24 @@ class MenuComposer
                 ])
             ;
         }
-        
+
         if ($this->hasLocalMenuBuilder($menuId)) {
             foreach ($this->localMenuBuilders[$menuId] as $builder) {
                 /* @var $builder LocalMenuBuilderInterface */
                 $builder->buildMenu($menuId, $menu, $parameters['args']);
             }
         }
-        
+
         $this->reorderMenu($menu);
-        
+
         return $menu;
     }
-    
+
     /**
      * recursive function to resolve the order of a array of routes.
-     * If the order chosen in routing.yml is already in used, find the 
+     * If the order chosen in routing.yml is already in used, find the
      * first next order available.
-     * 
+     *
      * @param array $routes the routes previously added
      * @param int $order
      * @return int
@@ -151,41 +138,41 @@ class MenuComposer
             return $order;
         }
     }
-    
-    private function reorderMenu(ItemInterface $menu) 
+
+    private function reorderMenu(ItemInterface $menu)
     {
         $ordered = [];
         $unordered = [];
-        
+
         foreach ($menu->getChildren() as $name => $item) {
             $order = $item->getExtra('order');
-            
+
             if ($order !== null) {
                $ordered[$this->resolveOrder($ordered, $order)] = $name;
             } else {
                 $unordered = $name;
             }
         }
-        
+
         ksort($ordered);
-        
+
         $menus = \array_merge(\array_values($ordered), $unordered);
         $menu->reorderChildren($menus);
     }
-    
-    
-    public function addLocalMenuBuilder(LocalMenuBuilderInterface $menuBuilder, $menuId) 
+
+
+    public function addLocalMenuBuilder(LocalMenuBuilderInterface $menuBuilder, $menuId)
     {
         $this->localMenuBuilders[$menuId][] = $menuBuilder;
     }
-    
+
     /**
      * Return true if the menu has at least one builder.
-     * 
+     *
      * This function is a helper to determine if the method `getMenuFor`
      * should be used, or `getRouteFor`. The method `getMenuFor` should be used
      * if the result is true (it **does** exists at least one menu builder.
-     * 
+     *
      * @param string $menuId
      * @return bool
      */

src/Bundle/ChillMainBundle/Search/AbstractSearch.php

@@ -26,10 +26,10 @@ use Chill\MainBundle\Search\ParsingException;
 
 /**
  * This class implements abstract search with most common responses.
- * 
+ *
  * you should use this abstract class instead of SearchInterface : if the signature of
  * search interface change, the generic method will be implemented here.
- * 
+ *
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  *
  */
@@ -37,7 +37,7 @@ abstract class AbstractSearch implements SearchInterface
 {
     /**
      * parse string expected to be a date and transform to a DateTime object
-     * 
+     *
      * @param type $string
      * @return \DateTime
      * @throws ParsingException if the  date is not parseable
@@ -51,14 +51,14 @@ abstract class AbstractSearch implements SearchInterface
                       . 'not parsable', 0, $ex);
             throw $exception;
         }
-        
+
     }
-    
+
     /**
      * recompose a pattern, retaining only supported terms
-     * 
+     *
      * the outputted string should be used to show users their search
-     * 
+     *
      * @param array $terms
      * @param array $supportedTerms
      * @param string $domain if your domain is NULL, you should set NULL. You should set used domain instead
@@ -67,35 +67,35 @@ abstract class AbstractSearch implements SearchInterface
     protected function recomposePattern(array $terms, array $supportedTerms, $domain = NULL)
     {
         $recomposed = '';
-        
+
         if ($domain !== NULL)
         {
             $recomposed .= '@'.$domain.' ';
         }
-        
+
         foreach ($supportedTerms as $term) {
             if (array_key_exists($term, $terms) && $term !== '_default') {
                 $recomposed .= ' '.$term.':';
                 $containsSpace = \strpos($terms[$term], " ") !== false;
                 if ($containsSpace) {
-                    $recomposed .= "(";
+                    $recomposed .= '"';
                 }
                 $recomposed .= (mb_stristr(' ', $terms[$term]) === FALSE) ?  $terms[$term] : '('.$terms[$term].')';
                 if ($containsSpace) {
-                    $recomposed .= ")";
+                    $recomposed .= '"';
                 }
             }
         }
-        
+
         if ($terms['_default'] !== '') {
             $recomposed .= ' '.$terms['_default'];
         }
-        
+
         //strip first character if empty
         if (mb_strcut($recomposed, 0, 1) === ' '){
             $recomposed = mb_strcut($recomposed, 1);
         }
-        
+
         return $recomposed;
     }
-}
+}

src/Bundle/ChillMainBundle/Search/SearchApi.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Search;
 
 use Chill\MainBundle\Search\Entity\SearchUserApiProvider;
@@ -13,27 +15,20 @@ use Doctrine\ORM\Query\ResultSetMappingBuilder;
 use Chill\MainBundle\Search\SearchProvider;
 use Symfony\Component\VarDumper\Resources\functions\dump;
 
-/**
- */
 class SearchApi
 {
     private EntityManagerInterface $em;
     private PaginatorFactory $paginator;
 
-    private array $providers = [];
+    private iterable $providers = [];
 
     public function __construct(
         EntityManagerInterface $em,
-        SearchPersonApiProvider $searchPerson,
-        ThirdPartyApiSearch $thirdPartyApiSearch,
-        SearchUserApiProvider $searchUser,
+        iterable $providers,
         PaginatorFactory $paginator
-    )
-    {
+    ) {
         $this->em = $em;
-        $this->providers[] = $searchPerson;
-        $this->providers[] = $thirdPartyApiSearch;
-        $this->providers[] = $searchUser;
+        $this->providers = $providers;
         $this->paginator = $paginator;
     }
 
@@ -69,10 +64,15 @@ class SearchApi
 
     private function findProviders(string $pattern, array $types, array $parameters): array
     {
-        return \array_filter(
-            $this->providers,
-            fn($p) => $p->supportsTypes($pattern, $types, $parameters)
-        );
+        $providers = [];
+
+        foreach ($this->providers as $provider) {
+           if ($provider->supportsTypes($pattern, $types, $parameters)) {
+               $providers[] = $provider;
+           }
+        }
+
+        return $providers;
     }
 
     private function countItems($providers, $types, $parameters): int
@@ -83,18 +83,18 @@ class SearchApi
         $countNq = $this->em->createNativeQuery($countQuery, $rsmCount);
         $countNq->setParameters($parameters);
 
-        return $countNq->getSingleScalarResult();
+        return (int) $countNq->getSingleScalarResult();
     }
 
     private function buildCountQuery(array $queries, $types, $parameters)
     {
-        $query = "SELECT COUNT(sq.key) AS count FROM ({union_unordered}) AS sq";
+        $query = "SELECT SUM(c) AS count FROM ({union_unordered}) AS sq";
         $unions = [];
         $parameters = [];
 
         foreach ($queries as $q) {
-            $unions[] = $q->buildQuery();
-            $parameters = \array_merge($parameters, $q->buildParameters());
+            $unions[] = $q->buildQuery(true);
+            $parameters = \array_merge($parameters, $q->buildParameters(true));
         }
 
         $unionUnordered = \implode(" UNION ", $unions);
@@ -126,7 +126,7 @@ class SearchApi
 
     private function fetchRawResult($queries, $types, $parameters, $paginator): array
     {
-        list($union, $parameters) = $this->buildUnionQuery($queries, $types, $parameters, $paginator);
+        list($union, $parameters) = $this->buildUnionQuery($queries, $types, $parameters);
         $rsm = new ResultSetMappingBuilder($this->em);
         $rsm->addScalarResult('key', 'key', Types::STRING)
             ->addScalarResult('metadata', 'metadata', Types::JSON)
@@ -139,25 +139,30 @@ class SearchApi
         return $nq->getResult();
     }
 
-    private function prepareProviders($rawResults)
+    private function prepareProviders(array $rawResults)
     {
         $metadatas = [];
+        $providers = [];
+
         foreach ($rawResults as $r) {
             foreach ($this->providers as $k => $p) {
                 if ($p->supportsResult($r['key'], $r['metadata'])) {
                     $metadatas[$k][] = $r['metadata'];
+                    $providers[$k] = $p;
                     break;
                 }
             }
         }
 
         foreach ($metadatas as $k => $m) {
-            $this->providers[$k]->prepare($m);
+            $providers[$k]->prepare($m);
         }
     }
 
-    private function buildResults($rawResults)
+    private function buildResults(array $rawResults): array
     {
+        $items = [];
+
         foreach ($rawResults as $r) {
             foreach ($this->providers as $k => $p) {
                 if ($p->supportsResult($r['key'], $r['metadata'])) {
@@ -170,6 +175,6 @@ class SearchApi
             }
         }
 
-        return $items ?? [];
+        return $items;
     }
 }

src/Bundle/ChillMainBundle/Search/SearchApiQuery.php

@@ -4,6 +4,8 @@ namespace Chill\MainBundle\Search;
 
 class SearchApiQuery
 {
+    private array $select = [];
+    private array $selectParams = [];
     private ?string $selectKey = null;
     private array $selectKeyParams = [];
     private ?string $jsonbMetadata = null;
@@ -15,6 +17,38 @@ class SearchApiQuery
     private array $whereClauses = [];
     private array $whereClausesParams = [];
 
+    public function addSelectClause(string $select, array $params = []): self
+    {
+        $this->select[] = $select;
+        $this->selectParams = [...$this->selectParams, ...$params];
+
+        return $this;
+    }
+
+    public function resetSelectClause(): self
+    {
+        $this->select = [];
+        $this->selectParams = [];
+        $this->selectKey = null;
+        $this->selectKeyParams = [];
+        $this->jsonbMetadata = null;
+        $this->jsonbMetadataParams = [];
+        $this->pertinence = null;
+        $this->pertinenceParams = [];
+
+        return $this;
+    }
+
+    public function getSelectClauses(): array
+    {
+        return $this->select;
+    }
+
+    public function getSelectParams(): array
+    {
+        return $this->selectParams;
+    }
+
     public function setSelectKey(string $selectKey, array $params = []): self
     {
         $this->selectKey = $selectKey;
@@ -47,6 +81,16 @@ class SearchApiQuery
         return $this;
     }
 
+    public function getFromClause(): string
+    {
+        return $this->fromClause;
+    }
+
+    public function getFromParams(): array
+    {
+        return $this->fromClauseParams;
+    }
+
     /**
      * Set the where clause and replace all existing ones.
      *
@@ -54,7 +98,7 @@ class SearchApiQuery
     public function setWhereClauses(string $whereClause, array $params = []): self
     {
         $this->whereClauses = [$whereClause];
-        $this->whereClausesParams = [$params];
+        $this->whereClausesParams = $params;
 
         return $this;
     }
@@ -71,38 +115,92 @@ class SearchApiQuery
     public function andWhereClause(string $whereClause, array $params = []): self
     {
         $this->whereClauses[] = $whereClause;
-        $this->whereClausesParams[] = $params;
+        \array_push($this->whereClausesParams, ...$params);
 
         return $this;
     }
 
-    public function buildQuery(): string
+    private function buildSelectParams(bool $count = false): array
     {
-        $where = \implode(' AND ', $this->whereClauses);
+        if ($count) {
+            return [];
+        }
+
+        $args = $this->getSelectParams();
+
+        if (null !== $this->selectKey) {
+            $args = [...$args, ...$this->selectKeyParams];
+        }
+        if (null !== $this->jsonbMetadata) {
+            $args = [...$args, ...$this->jsonbMetadataParams];
+        }
+        if (null !== $this->pertinence) {
+            $args = [...$args, ...$this->pertinenceParams];
+        }
+
+        return $args;
+    }
+
+    private function buildSelectClause(bool $countOnly = false): string
+    {
+        if ($countOnly) {
+            return 'count(*) AS c';
+        }
+
+        $selects = $this->getSelectClauses();
+
+        if (null !== $this->selectKey) {
+            $selects[] = \strtr("'{key}' AS key", [ '{key}' => $this->selectKey ]);
+        }
+        if (null !== $this->jsonbMetadata) {
+            $selects[] = \strtr('{metadata} AS metadata', [ '{metadata}' => $this->jsonbMetadata]);
+        }
+        if (null !== $this->pertinence) {
+            $selects[] = \strtr('{pertinence} AS pertinence', [ '{pertinence}' => $this->pertinence]);
+        }
+
+        return \implode(', ', $selects);
+    }
+
+    public function buildQuery(bool $countOnly = false): string
+    {
+        $isMultiple = count($this->whereClauses);
+        $where =
+            ($isMultiple ? '(' : '').
+            \implode(
+                ($isMultiple ? ')' : '').' AND '.($isMultiple ? '(' : '')
+            , $this->whereClauses).
+            ($isMultiple ? ')' : '')
+        ;
+
+        $select = $this->buildSelectClause($countOnly);
+
 
         return \strtr("SELECT
-            '{key}' AS key,
-            {metadata} AS metadata,
-            {pertinence} AS pertinence
-        FROM {from}
-        WHERE {where}
+                {select}
+            FROM {from}
+            WHERE {where}
         ", [
-            '{key}' => $this->selectKey,
-            '{metadata}' => $this->jsonbMetadata,
-            '{pertinence}' => $this->pertinence,
+            '{select}' => $select,
             '{from}' => $this->fromClause,
             '{where}' => $where,
         ]);
     }
 
-    public function buildParameters(): array
+
+    public function buildParameters(bool $countOnly = false): array
     {
-        return \array_merge(
-            $this->selectKeyParams,
-            $this->jsonbMetadataParams,
-            $this->pertinenceParams,
-            $this->fromClauseParams,
-            \array_merge([], ...$this->whereClausesParams),
-        );
+        if (!$countOnly) {
+            return [
+               ...$this->buildSelectParams($countOnly),
+               ...$this->fromClauseParams,
+               ...$this->whereClausesParams,
+            ];
+        } else {
+            return [
+                ...$this->fromClauseParams,
+                ...$this->whereClausesParams,
+            ];
+        }
     }
 }

src/Bundle/ChillMainBundle/Search/SearchApiResult.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Search;
 
 use Symfony\Component\Serializer\Annotation as Serializer;
@@ -10,6 +12,8 @@ class SearchApiResult
 
     private $result;
 
+    private float $relevance;
+
     public function __construct(float $relevance)
     {
         $this->relevance = $relevance;
@@ -20,7 +24,7 @@ class SearchApiResult
         $this->result = $result;
 
         return $this;
-    } 
+    }
 
     /**
      * @Serializer\Groups({"read"})

src/Bundle/ChillMainBundle/Search/SearchProvider.php

@@ -10,10 +10,10 @@ use Chill\MainBundle\Search\HasAdvancedSearchFormInterface;
  * installed into the app.
  * the service is callable from the container with
  * $container->get('chill_main.search_provider')
- * 
- * the syntax for search string is : 
- * - domain, which begin with `@`. Example: `@person`. Restrict the search to some 
- * entities. It may exists multiple search provider for the same domain (example: 
+ *
+ * the syntax for search string is :
+ * - domain, which begin with `@`. Example: `@person`. Restrict the search to some
+ * entities. It may exists multiple search provider for the same domain (example:
  * a search provider for people which performs regular search, and suggestion search
  * with phonetical algorithms
  * - terms, which are the terms of the search. There are terms with argument (example :
@@ -25,17 +25,17 @@ class SearchProvider
 {
 
     /**
-     * 
+     *
      * @var SearchInterface[]
      */
     private $searchServices = array();
-    
+
     /**
      *
      * @var HasAdvancedSearchForm[]
      */
     private $hasAdvancedFormSearchServices = array();
-    
+
     /*
      * return search services in an array, ordered by
      * the order key (defined in service definition)
@@ -59,7 +59,7 @@ class SearchProvider
 
         return $this->searchServices;
     }
-    
+
     public function getHasAdvancedFormSearchServices()
     {
         //sort the array
@@ -75,7 +75,7 @@ class SearchProvider
 
     /**
      * parse the search string to extract domain and terms
-     * 
+     *
      * @param string $pattern
      * @return string[] an array where the keys are _domain, _default (residual terms) or term
      */
@@ -95,9 +95,9 @@ class SearchProvider
 
     /**
      * Extract the domain of the subject
-     * 
+     *
      * The domain begins with `@`. Example: `@person`, `@report`, ....
-     * 
+     *
      * @param type $subject
      * @return string
      * @throws ParsingException
@@ -121,14 +121,15 @@ class SearchProvider
     private function extractTerms(&$subject)
     {
         $terms = array();
-        preg_match_all('/([a-z\-]+):([\w\-]+|\([^\(\r\n]+\))/', $subject, $matches);
+        $matches = [];
+        preg_match_all('/([a-z\-]+):(([^"][\S\-]+)|"[^"]*")/', $subject, $matches);
 
         foreach ($matches[2] as $key => $match) {
             //remove from search pattern
             $this->mustBeExtracted[] = $matches[0][$key];
             //strip parenthesis
-            if (mb_substr($match, 0, 1) === '(' &&
-                  mb_substr($match, mb_strlen($match) - 1) === ')') {
+            if (mb_substr($match, 0, 1) === '"' &&
+                  mb_substr($match, mb_strlen($match) - 1) === '"') {
                 $match = trim(mb_substr($match, 1, mb_strlen($match) - 2));
             }
             $terms[$matches[1][$key]] = $match;
@@ -139,14 +140,14 @@ class SearchProvider
 
     /**
      * store string which must be extracted to find default arguments
-     * 
+     *
      * @var string[]
      */
     private $mustBeExtracted = array();
 
     /**
      * extract default (residual) arguments
-     * 
+     *
      * @param string $subject
      * @return string
      */
@@ -158,7 +159,7 @@ class SearchProvider
     /**
      * search through services which supports domain and give
      * results as an array of resultsfrom different SearchInterface
-     * 
+     *
      * @param string $pattern
      * @param number $start
      * @param number $limit
@@ -167,25 +168,25 @@ class SearchProvider
      * @return array of results from different SearchInterface
      * @throws UnknowSearchDomainException if the domain is unknow
      */
-    public function getSearchResults($pattern, $start = 0, $limit = 50, 
+    public function getSearchResults($pattern, $start = 0, $limit = 50,
           array $options = array(), $format = 'html')
     {
         $terms = $this->parse($pattern);
         $results = array();
-        
+
         //sort searchServices by order
         $sortedSearchServices = array();
         foreach($this->searchServices as $service) {
             $sortedSearchServices[$service->getOrder()] = $service;
         }
-        
+
         if ($terms['_domain'] !== NULL) {
             foreach ($sortedSearchServices as $service) {
                 if ($service->supports($terms['_domain'], $format)) {
                     $results[] = $service->renderResult($terms, $start, $limit, $options);
                 }
             }
-            
+
             if (count($results) === 0) {
                 throw new UnknowSearchDomainException($terms['_domain']);
             }
@@ -196,24 +197,24 @@ class SearchProvider
                 }
             }
         }
-        
+
         //sort array
         ksort($results);
 
         return $results;
     }
-    
+
     public function getResultByName($pattern, $name, $start = 0, $limit = 50,
-          array $options = array(), $format = 'html') 
+          array $options = array(), $format = 'html')
     {
         $terms = $this->parse($pattern);
         $search = $this->getByName($name);
-        
+
         if ($terms['_domain'] !== NULL && !$search->supports($terms['_domain'], $format))
         {
             throw new ParsingException("The domain is not supported for the search name");
         }
-        
+
         return $search->renderResult($terms, $start, $limit, $options, $format);
     }
 
@@ -232,16 +233,16 @@ class SearchProvider
             throw new UnknowSearchNameException($name);
         }
     }
-    
+
     /**
-     * return searchservice with an advanced form, defined in service 
+     * return searchservice with an advanced form, defined in service
      * definition.
-     * 
+     *
      * @param string $name
      * @return HasAdvancedSearchForm
      * @throws UnknowSearchNameException
      */
-    public function getHasAdvancedFormByName($name) 
+    public function getHasAdvancedFormByName($name)
     {
         if (\array_key_exists($name, $this->hasAdvancedFormSearchServices)) {
             return $this->hasAdvancedFormSearchServices[$name];
@@ -253,7 +254,7 @@ class SearchProvider
     public function addSearchService(SearchInterface $service, $name)
     {
         $this->searchServices[$name] = $service;
-        
+
         if ($service instanceof HasAdvancedSearchFormInterface) {
             $this->hasAdvancedFormSearchServices[$name] = $service;
         }
@@ -477,7 +478,7 @@ class SearchProvider
             $string = strtr($string, $chars);
         } /* remove from wordpress: we use only utf 8
          * else {
-         
+
             // Assume ISO-8859-1 if not UTF-8
             $chars['in'] = chr(128) . chr(131) . chr(138) . chr(142) . chr(154) . chr(158)
                   . chr(159) . chr(162) . chr(165) . chr(181) . chr(192) . chr(193) . chr(194)

src/Bundle/ChillMainBundle/Search/Utils/ExtractDateFromPattern.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Chill\MainBundle\Search\Utils;
+
+use \DateTimeImmutable;
+
+class ExtractDateFromPattern
+{
+    private const DATE_PATTERN = [
+        ["([12]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01]))", 'Y-m-d'], // 1981-05-12
+        ["((0[1-9]|[12]\d|3[01])\/(0[1-9]|1[0-2])\/([12]\d{3}))", 'd/m/Y'], // 15/12/1980
+        ["((0[1-9]|[12]\d|3[01])-(0[1-9]|1[0-2])-([12]\d{3}))", 'd-m-Y'], // 15/12/1980
+    ];
+
+    public function extractDates(string $subject): SearchExtractionResult
+    {
+        $dates = [];
+        $filteredSubject = $subject;
+
+        foreach (self::DATE_PATTERN as [$pattern, $format]) {
+            $matches = [];
+            \preg_match_all($pattern, $filteredSubject, $matches);
+
+            foreach ($matches[0] as $match) {
+                $date = DateTimeImmutable::createFromFormat($format, $match);
+                if (false !== $date) {
+                    $dates[] = $date;
+                    // filter string: remove what is found
+                    $filteredSubject = \trim(\strtr($filteredSubject, [$match => ""]));
+                }
+            }
+        }
+
+        return new SearchExtractionResult($filteredSubject, $dates);
+    }
+}

src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Chill\MainBundle\Search\Utils;
+
+
+class ExtractPhonenumberFromPattern
+{
+    private const PATTERN = "([\+]{0,1}[0-9\ ]{5,})";
+
+    public function extractPhonenumber(string $subject): SearchExtractionResult
+    {
+        $matches = [];
+        \preg_match(self::PATTERN, $subject,$matches);
+
+        if (0 < count($matches)) {
+            $phonenumber = [];
+            $length = 0;
+
+            foreach (\str_split(\trim($matches[0])) as $key => $char) {
+                switch ($char) {
+                    case '0':
+                        $length++;
+                        if ($key === 0) { $phonenumber[] = '+32'; }
+                        else { $phonenumber[] = $char; }
+                        break;
+                    case '1':
+                    case '2':
+                    case '3':
+                    case '4':
+                    case '5':
+                    case '6':
+                    case '7':
+                    case '8':
+                    case '9':
+                        $length++;
+                        $phonenumber[] = $char;
+                        break;
+                    case ' ':
+                        break;
+                    default:
+                        throw new \LogicException("should not match not alnum character");
+                }
+            }
+
+            if ($length > 5) {
+                $filtered = \trim(\strtr($subject, [$matches[0] => '']));
+
+                return new SearchExtractionResult($filtered, [\implode('', $phonenumber)] );
+            }
+        }
+
+        return new SearchExtractionResult($subject, []);
+    }
+}

src/Bundle/ChillMainBundle/Search/Utils/SearchExtractionResult.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Chill\MainBundle\Search\Utils;
+
+class SearchExtractionResult
+{
+    private string $filteredSubject;
+    private array $found;
+
+    public function __construct(string $filteredSubject, array $found)
+    {
+        $this->filteredSubject = $filteredSubject;
+        $this->found = $found;
+    }
+
+    public function getFound(): array
+    {
+        return $this->found;
+    }
+
+    public function hasResult(): bool
+    {
+        return [] !== $this->found;
+    }
+
+    public function getFilteredSubject(): string
+    {
+        return $this->filteredSubject;
+    }
+}

src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php

@@ -1,34 +1,17 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+declare(strict_types=1);
 
 namespace Chill\MainBundle\Security\Authorization;
 
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
  * Voter for Chill software.
  *
  * This abstract Voter provide generic methods to handle object specific to Chill
- *
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 abstract class AbstractChillVoter extends Voter implements ChillVoterInterface
 {
@@ -39,6 +22,8 @@ abstract class AbstractChillVoter extends Voter implements ChillVoterInterface
             . 'getSupportedAttributes and getSupportedClasses methods.',
             E_USER_DEPRECATED);
 
+        // @TODO: getSupportedAttributes() should be created in here and made abstract or in ChillVoterInterface.
+        // @TODO: getSupportedClasses() should be created in here and made abstract or in ChillVoterInterface.
         return \in_array($attribute, $this->getSupportedAttributes($attribute))
             && \in_array(\get_class($subject), $this->getSupportedClasses());
     }
@@ -49,7 +34,7 @@ abstract class AbstractChillVoter extends Voter implements ChillVoterInterface
             . 'methods introduced by Symfony 3.0, and do not rely on '
             . 'isGranted method', E_USER_DEPRECATED);
 
+        // @TODO: isGranted() should be created in here and made abstract or in ChillVoterInterface.
         return $this->isGranted($attribute, $subject, $token->getUser());
     }
-
 }

src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php

@@ -1,21 +1,6 @@
 <?php
 
-/*
- * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+declare(strict_types=1);
 
 namespace Chill\MainBundle\Security\Authorization;
 
@@ -38,12 +23,12 @@ use Chill\MainBundle\Security\RoleProvider;
 use Doctrine\ORM\EntityManagerInterface;
 use Chill\MainBundle\Entity\GroupCenter;
 use Chill\MainBundle\Entity\RoleScope;
+use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
  * Helper for authorizations.
  *
  * Provides methods for user and entities information.
- *
  */
 class AuthorizationHelper implements AuthorizationHelperInterface
 {
@@ -74,11 +59,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface
     /**
      * Determines if a user is active on this center
      *
-     * If
-     *
-     * @param User $user
      * @param Center|Center[] $center May be an array of center
-     * @return bool
      */
     public function userCanReachCenter(User $user, $center): bool
     {
@@ -89,7 +70,9 @@ class AuthorizationHelper implements AuthorizationHelperInterface
                 }
             }
             return false;
-        } elseif ($center instanceof Center) {
+        }
+
+        if ($center instanceof Center) {
             foreach ($user->getGroupCenters() as $groupCenter) {
                 if ($center->getId() === $groupCenter->getCenter()->getId()) {
                     return true;
@@ -99,12 +82,16 @@ class AuthorizationHelper implements AuthorizationHelperInterface
             return false;
         }
 
-        throw new \UnexpectedValueException(sprintf("The entity given is not an ".
-            "instance of %s, %s given", Center::class, get_class($center)));
+        throw new \UnexpectedValueException(
+            sprintf(
+                'The entity given is not an instance of %s, %s given',
+                Center::class,
+                get_class($center)
+            )
+        );
     }
 
     /**
-     *
      * Determines if the user has access to the given entity.
      *
      * if the entity implements Chill\MainBundle\Entity\HasScopeInterface,
@@ -159,19 +146,21 @@ class AuthorizationHelper implements AuthorizationHelperInterface
                         if ($this->scopeResolverDispatcher->isConcerned($entity)) {
                            $scope = $this->scopeResolverDispatcher->resolveScope($entity);
 
-                           if (NULL === $scope) {
-                               return true;
-                           } elseif (is_iterable($scope)) {
-                               foreach ($scope as $s) {
-                                   if ($s === $roleScope->getScope()) {
-                                       return true;
-                                   }
-                               }
-                           } else {
-                               if ($scope === $roleScope->getScope()) {
-                                   return true;
-                               }
-                           }
+                            if (NULL === $scope) {
+                                return true;
+                            }
+
+                            if (is_iterable($scope)) {
+                                foreach ($scope as $s) {
+                                    if ($s === $roleScope->getScope()) {
+                                        return true;
+                                    }
+                                }
+                            } else {
+                                if ($scope === $roleScope->getScope()) {
+                                    return true;
+                                }
+                            }
                         } else {
                             return true;
                         }
@@ -190,14 +179,11 @@ class AuthorizationHelper implements AuthorizationHelperInterface
 
     /**
      * Get reachable Centers for the given user, role,
-     * and optionnaly Scope
+     * and optionally Scope
      *
-     * @param User $user
-     * @param string|Role $role
-     * @param null|Scope $scope
      * @return Center[]|array
      */
-    public function getReachableCenters(User $user, string $role, ?Scope $scope = null): array
+    public function getReachableCenters(UserInterface $user, string $role, ?Scope $scope = null): array
     {
         if ($role instanceof Role) {
             $role = $role->getRole();
@@ -213,11 +199,11 @@ class AuthorizationHelper implements AuthorizationHelperInterface
                     if ($scope === null) {
                         $centers[] = $groupCenter->getCenter();
                         break 1;
-                    } else {
-                        if ($scope->getId() == $roleScope->getScope()->getId()){
-                            $centers[] = $groupCenter->getCenter();
-                            break 1;
-                        }
+                    }
+
+                    if ($scope->getId() == $roleScope->getScope()->getId()){
+                        $centers[] = $groupCenter->getCenter();
+                        break 1;
                     }
                 }
             }
@@ -243,7 +229,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface
         }
 
         foreach ($centers as $center) {
-            if ($this->userCanReachCenter($user, $center, $role)) {
+            if ($this->userCanReachCenter($user, $center)) {
                 $results[] = $center;
             }
         }
@@ -256,12 +242,10 @@ class AuthorizationHelper implements AuthorizationHelperInterface
      *
      * @deprecated Use getReachableCircles
      *
-     * @param User $user
-     * @param string role
      * @param Center|Center[] $center
      * @return Scope[]|array
      */
-    public function getReachableScopes(User $user, string $role, $center): array
+    public function getReachableScopes(UserInterface $user, string $role, $center): array
     {
         if ($role instanceof Role) {
             $role = $role->getRole();
@@ -273,12 +257,11 @@ class AuthorizationHelper implements AuthorizationHelperInterface
     /**
      * Return all reachable circle for a given user, center and role
      *
-     * @param User $user
      * @param string|Role $role
      * @param Center|Center[] $center
      * @return Scope[]
      */
-    public function getReachableCircles(User $user, $role, $center)
+    public function getReachableCircles(UserInterface $user, $role, $center)
     {
         $scopes = [];
 

src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelperInterface.php

@@ -4,29 +4,23 @@ namespace Chill\MainBundle\Security\Authorization;
 
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Entity\User;
-use Symfony\Component\Security\Core\Role\Role;
+use Symfony\Component\Security\Core\User\UserInterface;
 
 interface AuthorizationHelperInterface
 {
-
     /**
      * Get reachable Centers for the given user, role,
      * and optionnaly Scope
      *
-     * @param User $user
-     * @param string|Role $role
      * @param null|Scope $scope
      * @return Center[]
      */
-    public function getReachableCenters(User $user, string $role, ?Scope $scope = null): array;
+    public function getReachableCenters(UserInterface $user, string $role, ?Scope $scope = null): array;
 
     /**
-     * @param User $user
-     * @param string $role
      * @param Center|Center[]|array $center
      * @return array
      */
-    public function getReachableScopes(User $user, string $role, $center): array;
+    public function getReachableScopes(UserInterface $user, string $role, $center): array;
 
 }

src/Bundle/ChillMainBundle/Security/Authorization/ChillExportVoter.php

@@ -1,48 +1,24 @@
 <?php
-/*
- * Copyright (C) 2018 Julien Fastré <julien.fastre@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Authorization;
 
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Entity\User;
-use Symfony\Component\Security\Core\Role\Role;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class ChillExportVoter extends Voter
 {
-    const EXPORT = 'chill_export';
-    
-    /**
-     *
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
-    
-    public function __construct(AuthorizationHelper $authorizationHelper)
+    public const EXPORT = 'chill_export';
+
+    protected AuthorizationHelperInterface $authorizationHelper;
+
+    public function __construct(AuthorizationHelperInterface $authorizationHelper)
     {
         $this->authorizationHelper = $authorizationHelper;
     }
-    
+
     protected function supports($attribute, $subject): bool
     {
         return $attribute === self::EXPORT;
@@ -53,10 +29,7 @@ class ChillExportVoter extends Voter
         if (!$token->getUser() instanceof User) {
             return false;
         }
-        
-        $centers = $this->authorizationHelper
-            ->getReachableCenters($token->getUser(), new Role($attribute));
-        
-        return count($centers) > 0;
+
+        return [] !== $this->authorizationHelper->getReachableCenters($token->getUser(), $attribute);
     }
 }

src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php

@@ -98,5 +98,7 @@ class PasswordRecoverVoter extends Voter
                 return true;
                 
         }
+
+        return false;
     }
 }

src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php

@@ -1,27 +1,43 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\Resolver;
 
-class CenterResolverDispatcher
+use Chill\MainBundle\Entity\Center;
+
+/**
+ * @deprecated Use CenterResolverManager and its interface CenterResolverManagerInterface
+ */
+final class CenterResolverDispatcher
 {
     /**
-     * @var iterabble|CenterResolverInterface[]
+     * @var CenterResolverInterface[]
      */
-    private iterable $resolvers = [];
+    private iterable $resolvers;
 
-    public function __construct(iterable $resolvers)
+    public function __construct(iterable $resolvers = [])
     {
         $this->resolvers = $resolvers;
     }
 
     /**
-     * @param mixed $entity
-     * @param array|null $options
+     * @param object $entity
      * @return null|Center|Center[]
      */
     public function resolveCenter($entity, ?array $options = [])
     {
-        foreach($this->resolvers as $priority => $resolver) {
+        trigger_deprecation(
+            'ChillMainBundle',
+            'dev-master',
+            '
+            Use the service CenterResolverManager through the interface CenterResolverManagerInterface.
+            The new method "CenterResolverManagerInterface::resolveCenters(): array" is available and the typing
+            has been improved in order to avoid mixing types.
+            '
+        );
+
+        foreach($this->resolvers as $resolver) {
             if ($resolver->supports($entity, $options)) {
                 return $resolver->resolveCenter($entity, $options);
             }

src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverInterface.php

@@ -6,12 +6,14 @@ use Chill\MainBundle\Entity\Center;
 
 interface CenterResolverInterface
 {
+    /**
+     * @param object $entity
+     */
     public function supports($entity, ?array $options = []): bool;
 
     /**
-     * @param $entity
-     * @param array|null $options
-     * @return Center|array|Center[]
+     * @param object $entity
+     * @return Center|Center[]
      */
     public function resolveCenter($entity, ?array $options = []);
 

src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Security\Resolver;
+
+final class CenterResolverManager implements CenterResolverManagerInterface
+{
+    /**
+     * @var CenterResolverInterface[]
+     */
+    private iterable $resolvers;
+
+    public function __construct(iterable $resolvers = [])
+    {
+        $this->resolvers = $resolvers;
+    }
+
+    public function resolveCenters($entity, ?array $options = []): array
+    {
+        foreach($this->resolvers as $resolver) {
+            if ($resolver->supports($entity, $options)) {
+                return (array) $resolver->resolveCenter($entity, $options);
+            }
+        }
+
+        return [];
+    }
+}

src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManagerInterface.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Security\Resolver;
+
+use Chill\MainBundle\Entity\Center;
+
+interface CenterResolverManagerInterface
+{
+    /**
+     * @param object $entity
+     * @return Center[]
+     */
+    public function resolveCenters($entity, ?array $options = []): array;
+}

src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php

@@ -6,10 +6,10 @@ use Twig\TwigFilter;
 
 final class ResolverTwigExtension extends \Twig\Extension\AbstractExtension
 {
-    private CenterResolverDispatcher $centerResolverDispatcher;
-    private ScopeResolverInterface $scopeResolverDispatcher;
+    private CenterResolverManagerInterface $centerResolverDispatcher;
+    private ScopeResolverDispatcher $scopeResolverDispatcher;
 
-    public function __construct(CenterResolverDispatcher $centerResolverDispatcher, ScopeResolverInterface $scopeResolverDispatcher)
+    public function __construct(CenterResolverManagerInterface $centerResolverDispatcher, ScopeResolverDispatcher $scopeResolverDispatcher)
     {
         $this->centerResolverDispatcher = $centerResolverDispatcher;
         $this->scopeResolverDispatcher = $scopeResolverDispatcher;
@@ -31,7 +31,7 @@ final class ResolverTwigExtension extends \Twig\Extension\AbstractExtension
      */
     public function resolveCenter($entity, ?array $options = [])
     {
-        return $this->centerResolverDispatcher->resolveCenter($entity, $options);
+        return $this->centerResolverDispatcher->resolveCenters($entity, $options);
     }
 
     /**

src/Bundle/ChillMainBundle/Security/UserProvider/UserProvider.php

@@ -1,22 +1,10 @@
 <?php
-/*
- * Copyright (C) 2018 Champs Libres Cooperative <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Security\UserProvider;
 
+use Doctrine\ORM\NoResultException;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Doctrine\ORM\EntityManagerInterface;
@@ -24,25 +12,15 @@ use Chill\MainBundle\Entity\User;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
 
-/**
- * 
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- */
 class UserProvider implements UserProviderInterface
 {
-    /**
-     *
-     * @var EntityManagerInterface
-     */
-    protected $em;
-    
+    protected EntityManagerInterface $em;
+
     public function __construct(EntityManagerInterface $em)
     {
         $this->em = $em;
     }
 
-    
     public function loadUserByUsername($username): UserInterface
     {
         try {
@@ -50,14 +28,18 @@ class UserProvider implements UserProviderInterface
                     "SELECT u FROM %s u "
                     . "WHERE u.usernameCanonical = UNACCENT(LOWER(:pattern)) "
                     . "OR "
-                    . "u.emailCanonical = UNACCENT(LOWER(:pattern))", 
+                    . "u.emailCanonical = UNACCENT(LOWER(:pattern))",
                     User::class))
                 ->setParameter('pattern', $username)
                 ->getSingleResult();
-        } catch (\Doctrine\ORM\NoResultException $e) {
-            throw new UsernameNotFoundException(sprintf('Bad credentials.', $username));
+        } catch (NoResultException $e) {
+            throw new UsernameNotFoundException(
+                sprintf('Bad credentials.'),
+                0,
+                $e
+            );
         }
-        
+
         return $user;
     }
 
@@ -66,13 +48,13 @@ class UserProvider implements UserProviderInterface
         if (!$user instanceof User) {
             throw new UnsupportedUserException("Unsupported user class: cannot reload this user");
         }
-        
+
         $reloadedUser = $this->em->getRepository(User::class)->find($user->getId());
-        
+
         if (NULL === $reloadedUser) {
             throw new UsernameNotFoundException(sprintf('User with ID "%s" could not be reloaded.', $user->getId()));
         }
-        
+
         return $reloadedUser;
     }
 

src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Address;
@@ -12,31 +14,41 @@ class AddressNormalizer implements NormalizerAwareInterface, NormalizerInterface
 {
     use NormalizerAwareTrait;
 
+    /**
+     * @param Address $address
+     */
     public function normalize($address, string $format = null, array $context = [])
     {
-        /** @var Address $address */
-        $data['address_id'] = $address->getId();
-        $data['text'] = $address->isNoAddress() ? '' : $address->getStreetNumber().', '.$address->getStreet();
-        $data['street'] = $address->getStreet();
-        $data['streetNumber'] = $address->getStreetNumber();
-        $data['postcode']['id'] = $address->getPostCode()->getId();
-        $data['postcode']['name'] = $address->getPostCode()->getName();
-        $data['postcode']['code'] = $address->getPostCode()->getCode();
-        $data['country']['id'] = $address->getPostCode()->getCountry()->getId();
-        $data['country']['name'] = $address->getPostCode()->getCountry()->getName();
-        $data['country']['code'] = $address->getPostCode()->getCountry()->getCountryCode();
-        $data['floor'] = $address->getFloor();
-        $data['corridor'] = $address->getCorridor();
-        $data['steps'] = $address->getSteps();
-        $data['flat'] = $address->getFlat();
-        $data['buildingName'] = $address->getBuildingName();
-        $data['distribution'] = $address->getDistribution();
-        $data['extra'] = $address->getExtra();
-        $data['validFrom'] = $address->getValidFrom();
-        $data['validTo'] = $address->getValidTo();
-        $data['addressReference'] = $this->normalizer->normalize($address->getAddressReference(), $format, [
-            AbstractNormalizer::GROUPS => ['read']
-        ]);
+        $data = [
+            'address_id' => $address->getId(),
+            'text' => $address->isNoAddress() ? '' : $address->getStreetNumber().', '.$address->getStreet(),
+            'street' => $address->getStreet(),
+            'streetNumber' => $address->getStreetNumber(),
+            'postcode' => [
+                'id' => $address->getPostCode()->getId(),
+                'name' => $address->getPostCode()->getName(),
+                'code' => $address->getPostCode()->getCode(),
+            ],
+            'country' => [
+                'id' => $address->getPostCode()->getCountry()->getId(),
+                'name' => $address->getPostCode()->getCountry()->getName(),
+                'code' => $address->getPostCode()->getCountry()->getCountryCode(),
+            ],
+            'floor' => $address->getFloor(),
+            'corridor' => $address->getCorridor(),
+            'steps' => $address->getSteps(),
+            'flat' => $address->getFlat(),
+            'buildingName' => $address->getBuildingName(),
+            'distribution' => $address->getDistribution(),
+            'extra' => $address->getExtra(),
+            'validFrom' => $address->getValidFrom(),
+            'validTo' => $address->getValidTo(),
+            'addressReference' => $this->normalizer->normalize(
+                $address->getAddressReference(),
+                $format,
+                [AbstractNormalizer::GROUPS => ['read']]
+            ),
+        ];
 
         return $data;
     }

src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php

@@ -1,18 +1,18 @@
 <?php
 /*
- * 
+ *
  * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -27,7 +27,7 @@ use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 
 /**
- * 
+ *
  *
  */
 class CenterNormalizer implements NormalizerInterface, DenormalizerInterface
@@ -52,7 +52,7 @@ class CenterNormalizer implements NormalizerInterface, DenormalizerInterface
 
     public function supportsNormalization($data, string $format = null): bool
     {
-        return $data instanceof Center;
+        return $data instanceof Center && $format === 'json';
     }
 
     public function denormalize($data, string $type, string $format = null, array $context = [])

src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php

@@ -9,32 +9,30 @@ use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 
 class CollectionNormalizer implements NormalizerInterface, NormalizerAwareInterface
 {
-    use NormalizerAwareTrait; 
+    use NormalizerAwareTrait;
+
+    /**
+     * @param Collection $collection
+     */
+    public function normalize($collection, string $format = null, array $context = [])
+    {
+        $paginator = $collection->getPaginator();
+
+        return [
+            'count' => $paginator->getTotalItems(),
+            'pagination' => [
+                'first' => $paginator->getCurrentPageFirstItemNumber(),
+                'items_per_page' => $paginator->getItemsPerPage(),
+                'next' => $paginator->hasNextPage() ? $paginator->getNextPage()->generateUrl() : null,
+                'previous' => $paginator->hasPreviousPage() ? $paginator->getPreviousPage()->generateUrl() : null,
+                'more' => $paginator->hasNextPage(),
+            ],
+            'results' => $this->normalizer->normalize($collection->getItems(), $format, $context),
+        ];
+    }
 
     public function supportsNormalization($data, string $format = null): bool
     {
         return $data instanceof Collection;
     }
-
-    public function normalize($collection, string $format = null, array $context = [])
-    {
-        /** @var $collection Collection */
-        $paginator = $collection->getPaginator();
-
-        $data['count'] = $paginator->getTotalItems();
-        $pagination['first'] = $paginator->getCurrentPageFirstItemNumber();
-        $pagination['items_per_page'] = $paginator->getItemsPerPage();
-        $pagination['next']  = $paginator->hasNextPage() ? 
-            $paginator->getNextPage()->generateUrl() : null;
-        $pagination['previous'] = $paginator->hasPreviousPage() ?
-            $paginator->getPreviousPage()->generateUrl() : null;
-        $pagination['more'] = $paginator->hasNextPage();
-        $data['pagination'] = $pagination;
-
-        // normalize results
-        $data['results'] = $this->normalizer->normalize($collection->getItems(),
-            $format, $context);
-
-        return $data;
-    }
 }

src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php

@@ -19,23 +19,78 @@
 
 namespace Chill\MainBundle\Serializer\Normalizer;
 
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 
-class DateNormalizer implements NormalizerInterface, DenormalizerInterface
+class DateNormalizer implements ContextAwareNormalizerInterface, DenormalizerInterface
 {
+    private RequestStack $requestStack;
+    private ParameterBagInterface $parameterBag;
+
+    public function __construct(RequestStack $requestStack, ParameterBagInterface $parameterBag)
+    {
+        $this->requestStack = $requestStack;
+        $this->parameterBag = $parameterBag;
+    }
+
     public function normalize($date, string $format = null, array $context = array())
     {
         /** @var \DateTimeInterface $date */
-        return [
-            'datetime' => $date->format(\DateTimeInterface::ISO8601)
-        ];
+        switch($format) {
+            case 'json':
+                return [
+                    'datetime' => $date->format(\DateTimeInterface::ISO8601)
+                ];
+            case 'docgen':
+
+                if (null === $date) {
+                    return [
+                        'long' => '', 'short' => ''
+                    ];
+                }
+
+                $hasTime = $date->format('His') !== "000000";
+                $request = $this->requestStack->getCurrentRequest();
+                $locale = null !== $request ? $request->getLocale() : $this->parameterBag->get('kernel.default_locale');
+                $formatterLong = \IntlDateFormatter::create(
+                    $locale,
+                    \IntlDateFormatter::LONG,
+                    $hasTime ? \IntlDateFormatter::SHORT: \IntlDateFormatter::NONE
+                );
+                $formatterShort = \IntlDateFormatter::create(
+                    $locale,
+                    \IntlDateFormatter::SHORT,
+                    $hasTime ? \IntlDateFormatter::SHORT: \IntlDateFormatter::NONE
+                );
+
+                return [
+                    'short' => $formatterShort->format($date),
+                    'long' => $formatterLong->format($date)
+                ];
+        }
     }
 
-    public function supportsNormalization($data, string $format = null): bool
+    public function supportsNormalization($data, string $format = null, array $context = []): bool
     {
-        return $data instanceof \DateTimeInterface;
+        if ($format === 'json') {
+            return $data instanceof \DateTimeInterface;
+        } elseif ($format === 'docgen') {
+            return $data instanceof \DateTimeInterface || (
+                $data === null
+                && \array_key_exists('docgen:expects', $context)
+                && (
+                    $context['docgen:expects']  === \DateTimeInterface::class
+                    || $context['docgen:expects']  === \DateTime::class
+                    || $context['docgen:expects']  === \DateTimeImmutable::class
+                )
+            );
+        }
+
+        return false;
     }
 
     public function denormalize($data, string $type, string $format = null, array $context = [])

src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php

@@ -52,6 +52,6 @@ class UserNormalizer implements NormalizerInterface, NormalizerAwareInterface
 
     public function supportsNormalization($data, string $format = null): bool
     {
-        return $data instanceof User;
+        return $format === 'json' && $data instanceof User;
     }
 }

src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php

@@ -1,92 +1,56 @@
 <?php
-/*
- * Chill is a suite of a modules, Chill is a software for social workers
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+
+declare(strict_types=1);
 
 namespace Chill\MainBundle\Templating;
 
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\Translation\Translator;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
-/**
- * 
- * This helper helps to find the string in current locale from translatable_strings
- * 
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- *
- */
-class TranslatableStringHelper
+final class TranslatableStringHelper implements TranslatableStringHelperInterface
 {
-    /**
-     * 
-     * @var RequestStack
-     */
-    private $requestStack;
-    
-    private $fallbackLocales;
-    
-    public function __construct(RequestStack $requestStack, Translator $translator)
+    private RequestStack $requestStack;
+
+    private TranslatorInterface $translator;
+
+    public function __construct(RequestStack $requestStack, TranslatorInterface $translator)
     {
         $this->requestStack = $requestStack;
-        $this->fallbackLocales = $translator->getFallbackLocales();
+        $this->translator = $translator;
     }
-    
-    /**
-     * return the string in current locale if it exists.
-     * 
-     * If it does not exists; return the name in the first language available.
-     * 
-     * Return a blank string if any strings are available.
-     * Return NULL if $translatableString is NULL
-     * 
-     * @param array $translatableStrings
-     * @return string
-     */
-    public function localize(array $translatableStrings)
-    {
-        if (NULL === $translatableStrings) {
-            return NULL;
-        }
-        
-        $language = $this->requestStack->getCurrentRequest()->getLocale();
-        
 
-        if (isset($translatableStrings[$language])) {
-            
-            return $translatableStrings[$language];
-        } else {
-            foreach ($this->fallbackLocales as $locale) {
-                if (array_key_exists($locale, $translatableStrings)) {
-                    
-                    return $translatableStrings[$locale];
-                }
-            }
-            
+    public function localize(array $translatableStrings): ?string
+    {
+        if ([] === $translatableStrings) {
+            return null;
         }
-        
+
+        $request = $this->requestStack->getCurrentRequest();
+
+        if (null === $request) {
+            return null;
+        }
+
+        $language = $request->getLocale();
+
+        if (array_key_exists($language, $translatableStrings)) {
+            return $translatableStrings[$language];
+        }
+
+        foreach ($this->translator->getFallbackLocales() as $locale) {
+            if (array_key_exists($locale, $translatableStrings)) {
+                return $translatableStrings[$locale];
+            }
+        }
+
         // no fallback translation... trying the  first available
         $langs = array_keys($translatableStrings);
-        
-        if (count($langs) === 0) {
+
+        if ([] === $langs) {
             return '';
         }
-    
-        return $translatableStrings[$langs[0]];
 
+        return $translatableStrings[$langs[0]];
     }
 
-}
+}

src/Bundle/ChillMainBundle/Templating/TranslatableStringHelperInterface.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Templating;
+
+interface TranslatableStringHelperInterface
+{
+    /**
+     * Return the string in current locale if it exists.
+     *
+     * If it does not exists; return the name in the first language available.
+     *
+     * Return a blank string if any strings are available.
+     */
+    public function localize(array $translatableStrings): ?string;
+}

src/Bundle/ChillMainBundle/Test/PrepareClientTrait.php

@@ -30,7 +30,6 @@ trait PrepareClientTrait
      *
      * @param string $username the username (default 'center a_social')
      * @param string $password the password (default 'password')
-     * @return \Symfony\Component\BrowserKit\Client
      * @throws \LogicException
      */
     public function getClientAuthenticated(

src/Bundle/ChillMainBundle/Tests/Search/SearchApiQueryTest.php

@@ -12,7 +12,7 @@ class SearchApiQueryTest extends TestCase
         $q = new SearchApiQuery();
         $q->setSelectJsonbMetadata('boum')
             ->setSelectKey('bim')
-            ->setSelectPertinence('1')
+            ->setSelectPertinence('?', ['gamma'])
             ->setFromClause('badaboum')
             ->andWhereClause('foo', [ 'alpha' ])
             ->andWhereClause('bar', [ 'beta' ])
@@ -20,8 +20,13 @@ class SearchApiQueryTest extends TestCase
 
         $query = $q->buildQuery();
 
-        $this->assertStringContainsString('foo AND bar', $query);
-        $this->assertEquals(['alpha', 'beta'], $q->buildParameters());
+        $this->assertStringContainsString('(foo) AND (bar)', $query);
+        $this->assertEquals(['gamma', 'alpha', 'beta'], $q->buildParameters());
+
+        $query = $q->buildQuery(true);
+
+        $this->assertStringContainsString('(foo) AND (bar)', $query);
+        $this->assertEquals(['gamma', 'alpha', 'beta'], $q->buildParameters());
     }
 
     public function testWithoutWhereClause()
@@ -37,4 +42,20 @@ class SearchApiQueryTest extends TestCase
         $this->assertEquals([], $q->buildParameters());
     }
 
+    public function testBuildParams()
+    {
+        $q = new SearchApiQuery();
+
+        $q
+            ->addSelectClause('bada', [ 'one', 'two' ])
+            ->addSelectClause('boum', ['three', 'four'])
+            ->setWhereClauses('mywhere', [ 'six', 'seven'])
+            ;
+
+        $params = $q->buildParameters();
+
+        $this->assertEquals(['six', 'seven'], $q->buildParameters(true));
+        $this->assertEquals(['one', 'two', 'three', 'four', 'six', 'seven'], $q->buildParameters());
+    }
+
 }

src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php

@@ -26,17 +26,17 @@ use PHPUnit\Framework\TestCase;
 
 class SearchProviderTest extends TestCase
 {
-    
+
     /**
      *
-     * @var SearchProvider 
+     * @var SearchProvider
      */
     private $search;
-    
+
     public function setUp()
     {
         $this->search = new SearchProvider();
-        
+
         //add a default service
         $this->addSearchService(
               $this->createDefaultSearchService('I am default', 10), 'default'
@@ -46,7 +46,7 @@ class SearchProviderTest extends TestCase
               $this->createNonDefaultDomainSearchService('I am domain bar', 20, FALSE), 'bar'
               );
     }
-    
+
     /**
      * @expectedException \Chill\MainBundle\Search\UnknowSearchNameException
      */
@@ -54,11 +54,11 @@ class SearchProviderTest extends TestCase
     {
         $this->search->getByName("invalid name");
     }
-    
+
     public function testSimplePattern()
     {
-        $terms = $this->p("@person birthdate:2014-01-02 name:(my name) is not my name");
-        
+        $terms = $this->p("@person birthdate:2014-01-02 name:\"my name\" is not my name");
+
         $this->assertEquals(array(
            '_domain' => 'person',
            'birthdate' => '2014-01-02',
@@ -66,40 +66,40 @@ class SearchProviderTest extends TestCase
            'name' => 'my name'
         ), $terms);
     }
-    
+
     public function testWithoutDomain()
     {
         $terms = $this->p('foo:bar residual');
-        
+
         $this->assertEquals(array(
            '_domain' => null,
            'foo' => 'bar',
            '_default' => 'residual'
         ), $terms);
     }
-    
+
     public function testWithoutDefault()
     {
         $terms = $this->p('@person foo:bar');
-        
+
         $this->assertEquals(array(
            '_domain' => 'person',
            'foo' => 'bar',
            '_default' => ''
         ), $terms);
     }
-    
+
     public function testCapitalLetters()
     {
         $terms = $this->p('Foo:Bar LOL marCi @PERSON');
-        
+
         $this->assertEquals(array(
            '_domain' => 'person',
            '_default' => 'lol marci',
            'foo' => 'bar'
         ), $terms);
     }
-    
+
     /**
      * @expectedException Chill\MainBundle\Search\ParsingException
      */
@@ -107,12 +107,11 @@ class SearchProviderTest extends TestCase
     {
         $term = $this->p("@person @report");
     }
-    
+
     public function testDoubleParenthesis()
     {
-        $terms = $this->p("@papamobile name:(my beautiful name) residual "
-              . "surname:(i love techno)");
-        
+        $terms = $this->p('@papamobile name:"my beautiful name" residual surname:"i love techno"');
+
         $this->assertEquals(array(
            '_domain' => 'papamobile',
            'name' => 'my beautiful name',
@@ -120,65 +119,65 @@ class SearchProviderTest extends TestCase
            'surname' => 'i love techno'
         ), $terms);
     }
-    
+
     public function testAccentued()
     {
         //$this->markTestSkipped('accentued characters must be implemented');
-        
+
         $terms = $this->p('manço bélier aztèque à saloù ê');
-        
+
         $this->assertEquals(array(
            '_domain' => NULL,
            '_default' => 'manco belier azteque a salou e'
         ), $terms);
     }
-    
+
     public function testAccentuedCapitals()
     {
         //$this->markTestSkipped('accentued characters must be implemented');
-        
+
         $terms = $this->p('MANÉÀ oÛ lÎ À');
-        
+
         $this->assertEquals(array(
            '_domain' => null,
            '_default' => 'manea ou li a'
         ), $terms);
     }
-    
+
     public function testTrimInParenthesis()
     {
-        $terms = $this->p('foo:(bar     )');
-        
+        $terms = $this->p('foo:"bar     "');
+
         $this->assertEquals(array(
            '_domain' => null,
            'foo' => 'bar',
            '_default' => ''
         ), $terms);
     }
-    
+
     public function testTrimInDefault()
     {
         $terms = $this->p('  foo bar     ');
-        
+
         $this->assertEquals(array(
            '_domain' => null,
            '_default' => 'foo bar'
         ), $terms);
     }
-    
+
     public function testArgumentNameWithTrait()
     {
         $terms = $this->p('date-from:2016-05-04');
-        
+
         $this->assertEquals(array(
             '_domain' => null,
             'date-from' => '2016-05-04',
             '_default' => ''
         ), $terms);
     }
-    
+
     /**
-     * Test the behaviour when no domain is provided in the search pattern : 
+     * Test the behaviour when no domain is provided in the search pattern :
      * the default search should be enabled
      */
     public function testSearchResultDefault()
@@ -186,12 +185,12 @@ class SearchProviderTest extends TestCase
         $response = $this->search->getSearchResults('default search');
 
         //$this->markTestSkipped();
-        
+
         $this->assertEquals(array(
            "I am default"
-        ), $response);      
+        ), $response);
     }
-    
+
     /**
      * @expectedException \Chill\MainBundle\Search\UnknowSearchDomainException
      */
@@ -200,49 +199,49 @@ class SearchProviderTest extends TestCase
         $response = $this->search->getSearchResults('@unknow domain');
 
         //$this->markTestSkipped();
-        
+
     }
-    
+
     public function testSearchResultDomainSearch()
     {
         //add a search service which will be supported
         $this->addSearchService(
               $this->createNonDefaultDomainSearchService("I am domain foo", 100, TRUE), 'foo'
               );
-        
+
         $response = $this->search->getSearchResults('@foo default search');
-        
+
         $this->assertEquals(array(
            "I am domain foo"
         ), $response);
-        
+
     }
-    
+
     public function testSearchWithinSpecificSearchName()
     {
         //add a search service which will be supported
         $this->addSearchService(
               $this->createNonDefaultDomainSearchService("I am domain foo", 100, TRUE), 'foo'
               );
-        
+
         $response = $this->search->getResultByName('@foo search', 'foo');
-        
+
         $this->assertEquals('I am domain foo', $response);
-        
+
     }
-    
+
     /**
      * @expectedException \Chill\MainBundle\Search\ParsingException
      */
     public function testSearchWithinSpecificSearchNameInConflictWithSupport()
     {
         $response = $this->search->getResultByName('@foo default search', 'bar');
-        
+
     }
-    
+
     /**
      * shortcut for executing parse method
-     * 
+     *
      * @param unknown $pattern
      * @return string[]
      */
@@ -250,12 +249,12 @@ class SearchProviderTest extends TestCase
     {
         return $this->search->parse($pattern);
     }
-    
+
     /**
      * Add a search service to the chill.main.search_provider
-     * 
+     *
      * Useful for mocking the SearchInterface
-     * 
+     *
      * @param SearchInterface $search
      * @param string $name
      */
@@ -264,52 +263,52 @@ class SearchProviderTest extends TestCase
         $this->search
               ->addSearchService($search, $name);
     }
-    
+
     private function createDefaultSearchService($result, $order)
     {
         $mock = $this
               ->getMockForAbstractClass('Chill\MainBundle\Search\AbstractSearch');
-        
+
         //set the mock as default
         $mock->expects($this->any())
               ->method('isActiveByDefault')
               ->will($this->returnValue(TRUE));
-        
+
         $mock->expects($this->any())
               ->method('getOrder')
               ->will($this->returnValue($order));
-        
+
         //set the return value
         $mock->expects($this->any())
               ->method('renderResult')
               ->will($this->returnValue($result));
-        
+
         return $mock;
     }
-    
+
     private function createNonDefaultDomainSearchService($result, $order, $domain)
     {
         $mock = $this
               ->getMockForAbstractClass('Chill\MainBundle\Search\AbstractSearch');
-        
+
         //set the mock as default
         $mock->expects($this->any())
               ->method('isActiveByDefault')
               ->will($this->returnValue(FALSE));
-        
+
         $mock->expects($this->any())
               ->method('getOrder')
               ->will($this->returnValue($order));
-        
+
         $mock->expects($this->any())
               ->method('supports')
               ->will($this->returnValue($domain));
-        
+
         //set the return value
         $mock->expects($this->any())
               ->method('renderResult')
               ->will($this->returnValue($result));
-        
+
         return $mock;
     }
 }

src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractDateFromPatternTest.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Search\Utils;
+
+use Chill\MainBundle\Search\Utils\ExtractDateFromPattern;
+use PHPUnit\Framework\TestCase;
+
+class ExtractDateFromPatternTest extends TestCase
+{
+
+    /**
+     * @dataProvider provideSubjects
+     */
+    public function testExtractDate(string $subject, string $filtered, int $count, ...$datesSearched)
+    {
+        $extractor = new ExtractDateFromPattern();
+        $result = $extractor->extractDates($subject);
+
+        $this->assertCount($count, $result->getFound());
+        $this->assertEquals($filtered, $result->getFilteredSubject());
+        $this->assertContainsOnlyInstancesOf(\DateTimeImmutable::class, $result->getFound());
+
+        $dates = \array_map(
+            function (\DateTimeImmutable $d) {
+                return $d->format('Y-m-d');
+            }, $result->getFound()
+        );
+
+        foreach ($datesSearched as $date) {
+            $this->assertContains($date, $dates);
+        }
+    }
+
+    public function provideSubjects()
+    {
+        yield ["15/06/1981", "", 1, '1981-06-15'];
+        yield ["15/06/1981 30/12/1987", "", 2, '1981-06-15', '1987-12-30'];
+        yield ["diallo 15/06/1981", "diallo", 1, '1981-06-15'];
+        yield ["diallo  31/03/1981", "diallo", 1, '1981-03-31'];
+        yield ["diallo 15-06-1981", "diallo", 1, '1981-06-15'];
+        yield ["diallo 1981-12-08", "diallo", 1, '1981-12-08'];
+        yield ["diallo", "diallo", 0];
+    }
+
+}

src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Search\Utils;
+
+use Chill\MainBundle\Search\Utils\ExtractPhonenumberFromPattern;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+class ExtractPhonenumberFromPatternTest extends KernelTestCase
+{
+    /**
+     * @dataProvider provideData
+     */
+    public function testExtract($subject, $expectedCount, $expected, $filteredSubject, $msg)
+    {
+        $extractor = new ExtractPhonenumberFromPattern();
+        $result = $extractor->extractPhonenumber($subject);
+
+        $this->assertCount($expectedCount, $result->getFound());
+        $this->assertEquals($filteredSubject, $result->getFilteredSubject());
+        $this->assertEquals($expected, $result->getFound());
+    }
+
+    public function provideData()
+    {
+        yield ['Diallo', 0, [], 'Diallo', "no phonenumber"];
+        yield ['Diallo 15/06/2021', 0, [], 'Diallo 15/06/2021', "no phonenumber and a date"];
+        yield ['Diallo 0486 123 456', 1, ['+32486123456'], 'Diallo', "a phonenumber and a name"];
+        yield ['Diallo 123 456', 1, ['123456'], 'Diallo', "a number and a name, without leadiing 0"];
+        yield ['123 456', 1, ['123456'], '', "only phonenumber"];
+        yield ['0123 456', 1, ['+32123456'], '', "only phonenumber with a leading 0"];
+    }
+
+}

src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/DateNormalizerTest.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace Serializer\Normalizer;
+
+use Chill\MainBundle\Serializer\Normalizer\DateNormalizer;
+use Prophecy\Prophet;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+class DateNormalizerTest extends KernelTestCase
+{
+    private Prophet $prophet;
+
+    public function setUp()
+    {
+        $this->prophet = new Prophet();
+    }
+
+    public function testSupports()
+    {
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(new \DateTime(), 'json'));
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(new \DateTimeImmutable(), 'json'));
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(new \DateTime(), 'docgen'));
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(new \DateTimeImmutable(), 'docgen'));
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(null, 'docgen', ['docgen:expects' => \DateTimeImmutable::class]));
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(null, 'docgen', ['docgen:expects' => \DateTimeInterface::class]));
+        $this->assertTrue($this->buildDateNormalizer()->supportsNormalization(null, 'docgen', ['docgen:expects' => \DateTime::class]));
+        $this->assertFalse($this->buildDateNormalizer()->supportsNormalization(new \stdClass(), 'docgen'));
+        $this->assertFalse($this->buildDateNormalizer()->supportsNormalization(new \DateTime(), 'xml'));
+    }
+
+    /**
+     * @dataProvider generateDataNormalize
+     */
+    public function testNormalize($expected, $date, $format, $locale, $msg)
+    {
+        $this->assertEquals($expected, $this->buildDateNormalizer($locale)->normalize($date, $format, []), $msg);
+    }
+
+    private function buildDateNormalizer(string $locale = null): DateNormalizer
+    {
+        $requestStack = $this->prophet->prophesize(RequestStack::class);
+        $parameterBag = new ParameterBag();
+        $parameterBag->set('kernel.default_locale', 'fr');
+
+        if ($locale === null) {
+            $requestStack->getCurrentRequest()->willReturn(null);
+        } else {
+            $request = $this->prophet->prophesize(Request::class);
+            $request->getLocale()->willReturn($locale);
+            $requestStack->getCurrentRequest()->willReturn($request->reveal());
+        }
+
+        return new DateNormalizer($requestStack->reveal(), $parameterBag);
+    }
+
+    public function generateDataNormalize()
+    {
+        $datetime = \DateTime::createFromFormat('Y-m-d H:i:sO', '2021-06-05 15:05:01+02:00');
+        $date     = \DateTime::createFromFormat('Y-m-d H:i:sO', '2021-06-05 00:00:00+02:00');
+        yield [
+            ['datetime' => '2021-06-05T15:05:01+0200'],
+                $datetime, 'json', null, 'simple normalization to json'
+        ];
+
+        yield [
+            ['long' => '5 juin 2021', 'short' => '05/06/2021'],
+                $date, 'docgen', 'fr', 'normalization to docgen for a date, with current request'
+        ];
+
+        yield [
+            ['long' => '5 juin 2021', 'short' => '05/06/2021'],
+            $date, 'docgen', null, 'normalization to docgen for a date, without current request'
+        ];
+
+        yield [
+            ['long' => '5 juin 2021 à 15:05', 'short' => '05/06/2021 15:05'],
+            $datetime, 'docgen', null, 'normalization to docgen for a datetime, without current request'
+        ];
+
+        yield [
+            ['long' => '', 'short' => ''],
+            null, 'docgen', null, 'normalization to docgen for a null datetime'
+        ];
+    }
+}

src/Bundle/ChillMainBundle/Tests/Util/DateRangeCoveringTest.php

@@ -37,6 +37,18 @@ class DateRangeCoveringTest extends TestCase
         $this->assertNotContains(3, $cover->getIntersections()[0][2]);
     }
 
+    public function testCoveringWithMinCover1_NoCoveringWithNullDates()
+    {
+        $cover = new DateRangeCovering(1, new \DateTimeZone('Europe/Brussels')); 
+        $cover
+            ->add(new \DateTime('2021-10-05'), new \DateTime('2021-10-18'), 521)
+            ->add(new \DateTime('2021-10-26'), null, 663)
+            ->compute()
+            ;
+
+        $this->assertFalse($cover->hasIntersections());
+    }
+
     public function testCoveringWithMinCover1WithTwoIntersections()
     {
         $cover = new DateRangeCovering(1, new \DateTimeZone('Europe/Brussels')); 

src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php

@@ -291,11 +291,12 @@ class TimelineBuilder implements ContainerAwareInterface
                     $entitiesByType[$result['type']][$result['id']], //the entity
                     $context,
                     $args);
-            $timelineEntry['date'] = new \DateTime($result['date']);
-            $timelineEntry['template'] = $data['template'];
-            $timelineEntry['template_data'] = $data['template_data'];
 
-            $timelineEntries[] = $timelineEntry;
+            $timelineEntries[] = [
+                'date' => new \DateTime($result['date']),
+                'template' => $data['template'],
+                'template_data' => $data['template_data']
+            ];
         }
 
         return $this->container->get('templating')

src/Bundle/ChillMainBundle/Util/DateRangeCovering.php

@@ -5,15 +5,15 @@ namespace Chill\MainBundle\Util;
 /**
  * Utilities to compare date periods
  *
- * This class allow to compare periods when there are period covering. The 
+ * This class allow to compare periods when there are period covering. The
  * argument `minCovers` allow to find also when there are more than 2 period
- * which intersects. 
+ * which intersects.
  *
- * Example: a team may have maximum 2 leaders on a same period: you will 
+ * Example: a team may have maximum 2 leaders on a same period: you will
  * find here all periods where there are more than 2 leaders.
  *
  * Usage:
- * 
+ *
  * ```php
  * $cover = new DateRangeCovering(2); // 2 means we will have periods
  *    // when there are 2+ periods intersecting
@@ -73,7 +73,7 @@ class DateRangeCovering
         $this->addToSequence($start->getTimestamp(), $k, null);
         $this->addToSequence(
             NULL === $end ? PHP_INT_MAX : $end->getTimestamp(), null, $k
-        ); 
+        );
 
         return $this;
     }
@@ -140,72 +140,11 @@ class DateRangeCovering
         return $this;
     }
 
-    private function process(array $intersections): array
-    {
-        $result = [];
-        $starts = [];
-        $ends   = [];
-        $metadatas = [];
-
-        while (null !== ($current = \array_pop($intersections))) {
-            list($cStart, $cEnd, $cMetadata) = $current;
-            $n = count($cMetadata);
-
-            foreach ($intersections as list($iStart, $iEnd, $iMetadata)) {
-                $start = max($cStart, $iStart);
-                $end = min($cEnd, $iEnd);
-
-                if ($start <= $end) {
-                    if (FALSE !== ($key = \array_search($start, $starts))) {
-                        if ($ends[$key] === $end) {
-                            $metadatas[$key] = \array_unique(\array_merge($metadatas[$key], $iMetadata));
-                            continue;
-                        }
-                    }
-                    $starts[] = $start;
-                    $ends[]   = $end;
-                    $metadatas[] = \array_unique(\array_merge($iMetadata, $cMetadata));
-                }
-            }
-        }
-
-        // recompose results
-        foreach ($starts as $k => $start) {
-            $result[] = [$start, $ends[$k], \array_unique($metadatas[$k])];
-        }
-
-        return $result;
-    }
-
-    private function addToIntersections(array $intersections, array $intersection)
-    {
-        $foundExisting = false;
-        list($nStart, $nEnd, $nMetadata) = $intersection;
-
-        \array_walk($intersections, 
-            function(&$i, $key) use ($nStart, $nEnd, $nMetadata, $foundExisting) {
-                if ($foundExisting) {
-                    return;
-                };
-                if ($i[0] === $nStart && $i[1] === $nEnd) {
-                    $foundExisting = true;
-                    $i[2] = \array_merge($i[2], $nMetadata);
-                }
-            }
-        );
-
-        if (!$foundExisting) {
-            $intersections[] = $intersection;
-        }
-
-        return $intersections;
-    }
-
     public function hasIntersections(): bool
     {
         if (!$this->computed) {
             throw new \LogicException(sprintf("You cannot call the method %s before ".
-                "'process'", __METHOD));
+                "'process'", __METHOD__));
         }
 
         return count($this->intersections) > 0;
@@ -215,7 +154,7 @@ class DateRangeCovering
     {
         if (!$this->computed) {
             throw new \LogicException(sprintf("You cannot call the method %s before ".
-                "'process'", __METHOD));
+                "'process'", __METHOD__));
         }
 
         return $this->intersections;

src/Bundle/ChillMainBundle/config/services.yaml

@@ -8,38 +8,29 @@ services:
 
     Chill\MainBundle\Repository\:
         resource: '../Repository/'
-        autowire: true
-        autoconfigure: true
 
     Chill\MainBundle\Repository\UserACLAwareRepositoryInterface: '@Chill\MainBundle\Repository\UserACLAwareRepository'
 
     Chill\MainBundle\Serializer\Normalizer\:
         resource: '../Serializer/Normalizer'
-        autoconfigure: true
-        autowire: true
         tags:
             - { name: 'serializer.normalizer', priority: 64 }
 
     Chill\MainBundle\Form\Type\:
         resource: '../Form/Type'
-        autoconfigure: true
-        autowire: true
         tags:
             - { name: form.type }
 
     Chill\MainBundle\Doctrine\Event\:
         resource: '../Doctrine/Event/'
-        autowire: true
         tags:
             - { name: 'doctrine.event_subscriber' }
 
     chill.main.helper.translatable_string:
         class: Chill\MainBundle\Templating\TranslatableStringHelper
-        arguments:
-            - "@request_stack"
-            - "@translator.default"
 
     Chill\MainBundle\Templating\TranslatableStringHelper: '@chill.main.helper.translatable_string'
+    Chill\MainBundle\Templating\TranslatableStringHelperInterface: '@Chill\MainBundle\Templating\TranslatableStringHelper'
 
     chill.main.twig.translatable_string:
         class: Chill\MainBundle\Templating\TranslatableStringTwig

src/Bundle/ChillMainBundle/config/services/cache.yaml

@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill_main.tag_aware_cache:
         class: Symfony\Component\Cache\Adapter\TagAwareAdapter
         arguments:

src/Bundle/ChillMainBundle/config/services/command.yaml

@@ -1,10 +1,9 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Command\ChillImportUsersCommand:
-        arguments:
-            $em: '@Doctrine\ORM\EntityManagerInterface'
-            $logger: '@Psr\Log\LoggerInterface'
-            $passwordEncoder: '@Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface'
-            $validator: '@Symfony\Component\Validator\Validator\ValidatorInterface'
         tags:
             - { name: console.command }
 

src/Bundle/ChillMainBundle/config/services/controller.yaml

@@ -1,12 +1,13 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
 
     Chill\MainBundle\Controller\:
-        autowire: true
         resource: '../../Controller'
         tags: ['controller.service_arguments']
 
     Chill\MainBundle\Controller\PasswordController:
-        autowire: true
         arguments:
             $chillLogger: '@monolog.logger.chill'
         tags: ['controller.service_arguments']
@@ -28,10 +29,6 @@ services:
             $validator: '@Symfony\Component\Validator\Validator\ValidatorInterface'
         tags: ['controller.service_arguments']
 
-    Chill\MainBundle\Controller\UserController:
-        autowire: true
-        autoconfigure: true
-
     Chill\MainBundle\Controller\NotificationController:
         arguments:
             $security: '@Symfony\Component\Security\Core\Security'

src/Bundle/ChillMainBundle/config/services/crud.yaml

@@ -1,15 +1,19 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\CRUD\Routing\CRUDRoutesLoader:
         arguments:
             $crudConfig: '%chill_main_crud_route_loader_config%'
-            $apiConfig:  '%chill_main_api_route_loader_config%'
+            $apiCrudConfig:  '%chill_main_api_route_loader_config%'
         tags: [ routing.loader ]
 
     Chill\MainBundle\CRUD\Resolver\Resolver:
         arguments:
             $em: '@Doctrine\ORM\EntityManagerInterface'
             $crudConfig: '%chill_main_crud_route_loader_config%'
-    
+
     Chill\MainBundle\CRUD\Templating\TwigCRUDResolver:
         arguments:
             $resolver: '@Chill\MainBundle\CRUD\Resolver\Resolver'

src/Bundle/ChillMainBundle/config/services/doctrine.yaml

@@ -1,3 +1,7 @@
 ---
 services:
-  'Chill\MainBundle\Doctrine\Migrations\VersionComparator': ~
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
+    Chill\MainBundle\Doctrine\Migrations\VersionComparator: ~

src/Bundle/ChillMainBundle/config/services/export.yaml

@@ -1,9 +1,13 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill.main.export_element_validator:
         class: Chill\MainBundle\Validator\Constraints\Export\ExportElementConstraintValidator
         tags:
             - { name: validator.constraint_validator }
-       
+
 #    deprecated in favor of spreadsheet_formatter
 #    chill.main.export.csv_formatter:
 #        class: Chill\MainBundle\Export\Formatter\CSVFormatter
@@ -11,7 +15,7 @@ services:
 #            - "@translator"
 #        tags:
 #            - { name: chill.export_formatter, alias: 'csv' }
-            
+
     chill.main.export.spreadsheet_formatter:
         class: Chill\MainBundle\Export\Formatter\SpreadSheetFormatter
         arguments:
@@ -19,7 +23,7 @@ services:
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'spreadsheet' }
-            
+
     chill.main.export.list_formatter:
         class: Chill\MainBundle\Export\Formatter\CSVListFormatter
         arguments:
@@ -27,7 +31,7 @@ services:
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'csvlist' }
-            
+
     chill.main.export.list_spreadsheet_formatter:
         class: Chill\MainBundle\Export\Formatter\SpreadsheetListFormatter
         arguments:
@@ -35,7 +39,7 @@ services:
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'spreadlist' }
-            
+
     chill.main.export.pivoted_list_formatter:
         class: Chill\MainBundle\Export\Formatter\CSVPivotedListFormatter
         arguments:
@@ -43,4 +47,3 @@ services:
             $exportManager: '@Chill\MainBundle\Export\ExportManager'
         tags:
             - { name: chill.export_formatter, alias: 'csv_pivoted_list' }
-            

src/Bundle/ChillMainBundle/config/services/fixtures.yaml

@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\DataFixtures\ORM\:
         resource: ../../DataFixtures/ORM
         tags: [ 'doctrine.fixture.orm' ]

src/Bundle/ChillMainBundle/config/services/form.yaml

@@ -1,4 +1,7 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
 
     chill.main.form.type.translatable.string:
         class: Chill\MainBundle\Form\Type\TranslatableStringFormType
@@ -39,9 +42,7 @@ services:
         tags:
             - { name: form.type, alias: select2_chill_language }
 
-    Chill\MainBundle\Form\Type\PickCenterType:
-        autowire: true
-        autoconfigure: true
+    Chill\MainBundle\Form\Type\PickCenterType: ~
 
     chill.main.form.type.composed_role_scope:
         class: Chill\MainBundle\Form\Type\ComposedRoleScopeType
@@ -62,9 +63,7 @@ services:
         tags:
             - { name: form.type }
 
-    Chill\MainBundle\Form\ChoiceLoader\PostalCodeChoiceLoader:
-        autowire: true
-        autoconfigure: true
+    Chill\MainBundle\Form\ChoiceLoader\PostalCodeChoiceLoader: ~
 
     chill.main.form.type.export:
         class: Chill\MainBundle\Form\Type\Export\ExportType
@@ -96,14 +95,10 @@ services:
         arguments:
             - '@Chill\MainBundle\Export\ExportManager'
 
-    Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer:
-        autowire: true
-        autoconfigure: true
+    Chill\MainBundle\Form\Type\DataTransformer\CenterTransformer: ~
 
     chill.main.form.advanced_search_type:
         class: Chill\MainBundle\Form\AdvancedSearchType
-        autowire: true
-        autoconfigure: true
         arguments:
             - "@chill_main.search_provider"
         tags:
@@ -116,9 +111,7 @@ services:
         tags:
             - { name: form.type }
 
-    Chill\MainBundle\Form\UserType:
-        autowire: true
-        autoconfigure: true
+    Chill\MainBundle\Form\UserType: ~
 
     Chill\MainBundle\Form\PermissionsGroupType:
         tags:
@@ -131,15 +124,8 @@ services:
         tags:
             - { name: form.type }
 
+    Chill\MainBundle\Form\Type\PickAddressType: ~
 
-    Chill\MainBundle\Form\Type\PickAddressType:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Form\DataTransform\AddressToIdDataTransformer: ~
 
-    Chill\MainBundle\Form\DataTransform\AddressToIdDataTransformer:
-        autoconfigure: true
-        autowire: true
-
-    Chill\MainBundle\Form\Type\LocationFormType:
-        autowire: true
-        autoconfigure: true
+    Chill\MainBundle\Form\Type\LocationFormType: ~

src/Bundle/ChillMainBundle/config/services/logger.yaml

@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill.main.logger:
         # a logger to log events from the app (deletion, remove, etc.)
         alias: monolog.logger.chill

src/Bundle/ChillMainBundle/config/services/menu.yaml

@@ -1,9 +1,11 @@
 services:
-    Chill\MainBundle\Routing\MenuBuilder\:
-        resource: '../../Routing/MenuBuilder'
+    _defaults:
         autowire: true
         autoconfigure: true
 
+    Chill\MainBundle\Routing\MenuBuilder\:
+        resource: '../../Routing/MenuBuilder'
+
     Chill\MainBundle\Routing\MenuBuilder\UserMenuBuilder:
         arguments:
             $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'

src/Bundle/ChillMainBundle/config/services/notification.yaml

@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Notification\Mailer:
         arguments:
             $logger: '@Psr\Log\LoggerInterface'
@@ -9,6 +13,4 @@ services:
             $translator: '@Symfony\Component\Translation\TranslatorInterface'
             $routeParameters: '%chill_main.notifications%'
 
-    Chill\MainBundle\Notification\NotificationRenderer:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Notification\NotificationRenderer: ~

src/Bundle/ChillMainBundle/config/services/pagination.yaml

@@ -1,9 +1,11 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill_main.paginator_factory:
         class: Chill\MainBundle\Pagination\PaginatorFactory
         public: true
-        autowire: true
-        autoconfigure: true
         arguments:
             - "@request_stack"
             - "@router"

src/Bundle/ChillMainBundle/config/services/phonenumber.yaml

@@ -1,19 +1,21 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Phonenumber\PhonenumberHelper:
         arguments:
-            $logger: '@Psr\Log\LoggerInterface'
             $config: '%chill_main.phone_helper%'
             $cachePool: '@cache.user_data'
-            
+
     Chill\MainBundle\Phonenumber\Templating:
         arguments:
             $phonenumberHelper: '@Chill\MainBundle\Phonenumber\PhonenumberHelper'
         tags:
             - { name: twig.extension }
-    
+
     Chill\MainBundle\Validation\Validator\ValidPhonenumber:
         arguments:
-            $logger: '@Psr\Log\LoggerInterface'
             $phonenumberHelper: '@Chill\MainBundle\Phonenumber\PhonenumberHelper'
         tags:
             - { name: validator.constraint_validator }

src/Bundle/ChillMainBundle/config/services/redis.yaml

@@ -1,10 +1,13 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Redis\RedisConnectionFactory:
         arguments:
             $parameters: "%chill_main.redis%"
         tags:
             - { name: kernel.event_subcriber }
-            
+
     Chill\MainBundle\Redis\ChillRedis:
         factory: [ '@Chill\MainBundle\Redis\RedisConnectionFactory', 'create' ]
-            

src/Bundle/ChillMainBundle/config/services/routing.yaml

@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill.main.menu_composer:
         class: Chill\MainBundle\Routing\MenuComposer
         arguments:
@@ -6,7 +10,7 @@ services:
             - '@Knp\Menu\FactoryInterface'
             - '@Symfony\Component\Translation\TranslatorInterface'
     Chill\MainBundle\Routing\MenuComposer: '@chill.main.menu_composer'
-    
+
     chill.main.routes_loader:
         class: Chill\MainBundle\Routing\Loader\ChillRoutesLoader
         arguments:

src/Bundle/ChillMainBundle/config/services/search.yaml

@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill_main.search_provider:
         class: Chill\MainBundle\Search\SearchProvider
 
@@ -7,8 +11,13 @@ services:
     Chill\MainBundle\Search\SearchApi:
         autowire: true
         autoconfigure: true
+        arguments:
+            $providers: !tagged_iterator chill.search_api_provider
 
     Chill\MainBundle\Search\Entity\:
+        resource: '../../Search/Entity'
+
+    Chill\MainBundle\Search\Utils\:
         autowire: true
         autoconfigure: true
-        resource: '../../Search/Entity'
+        resource: './../Search/Utils/'

src/Bundle/ChillMainBundle/config/services/security.yaml

@@ -3,46 +3,35 @@ services:
         autowire: true
         autoconfigure: true
 
-    # do not autowire the directory Security/Resolver
     Chill\MainBundle\Security\Resolver\CenterResolverDispatcher:
         arguments:
             - !tagged_iterator chill_main.center_resolver
 
+    Chill\MainBundle\Security\Resolver\CenterResolverManager:
+        arguments:
+            - !tagged_iterator chill_main.center_resolver
+    Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface: '@Chill\MainBundle\Security\Resolver\CenterResolverManager'
+
     Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher:
         arguments:
             - !tagged_iterator chill_main.scope_resolver
 
-    # do not autowire the directory Security/Resolver
-    Chill\MainBundle\Security\Resolver\DefaultCenterResolver:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Security\Resolver\DefaultCenterResolver: ~
 
-    Chill\MainBundle\Security\Resolver\DefaultScopeResolver:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Security\Resolver\DefaultScopeResolver: ~
 
-    # do not autowire the directory Security/Resolver
-    Chill\MainBundle\Security\Resolver\ResolverTwigExtension:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Security\Resolver\ResolverTwigExtension: ~
 
-    # do not autowire the directory Security/Resolver
-    Chill\MainBundle\Security\Authorization\DefaultVoterHelperFactory:
-        autowire: true
+    Chill\MainBundle\Security\Authorization\DefaultVoterHelperFactory: ~
 
-    # do not autowire the directory Security/Resolver
     Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface: '@Chill\MainBundle\Security\Authorization\DefaultVoterHelperFactory'
 
     chill.main.security.authorization.helper:
         class: Chill\MainBundle\Security\Authorization\AuthorizationHelper
-        autowire: true
-        autoconfigure: true
     Chill\MainBundle\Security\Authorization\AuthorizationHelper: '@chill.main.security.authorization.helper'
     Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface: '@chill.main.security.authorization.helper'
 
-    Chill\MainBundle\Security\ParentRoleHelper:
-        autowire: true
-        autoconfigure: true
+    Chill\MainBundle\Security\ParentRoleHelper: ~
 
     chill.main.role_provider:
         class: Chill\MainBundle\Security\RoleProvider
@@ -54,20 +43,16 @@ services:
     Symfony\Component\Security\Core\User\UserProviderInterface: "@chill.main.user_provider"
 
     Chill\MainBundle\Security\Authorization\ChillExportVoter:
-        arguments:
-            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
         tags:
             - { name: security.voter }
 
     Chill\MainBundle\Security\PasswordRecover\TokenManager:
         arguments:
             $secret: '%kernel.secret%'
-            $logger: '@Psr\Log\LoggerInterface'
 
     Chill\MainBundle\Security\PasswordRecover\RecoverPasswordHelper:
         arguments:
             $tokenManager: '@Chill\MainBundle\Security\PasswordRecover\TokenManager'
-            $urlGenerator: '@Symfony\Component\Routing\Generator\UrlGeneratorInterface'
             $mailer: '@Chill\MainBundle\Notification\Mailer'
             $routeParameters: "%chill_main.notifications%"
 
@@ -80,11 +65,9 @@ services:
     Chill\MainBundle\Security\PasswordRecover\PasswordRecoverLocker:
         arguments:
             $chillRedis: '@Chill\MainBundle\Redis\ChillRedis'
-            $logger: '@Psr\Log\LoggerInterface'
 
     Chill\MainBundle\Security\PasswordRecover\PasswordRecoverVoter:
         arguments:
             $locker: '@Chill\MainBundle\Security\PasswordRecover\PasswordRecoverLocker'
-            $requestStack: '@Symfony\Component\HttpFoundation\RequestStack'
         tags:
             - { name: security.voter }

src/Bundle/ChillMainBundle/config/services/serializer.yaml

@@ -1,11 +1,13 @@
 ---
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
 
     # note: the autowiring for serializers and normalizers is declared
     # into ../services.yaml
 
     Chill\MainBundle\Serializer\Normalizer\DoctrineExistingEntityNormalizer:
-        autowire: true
         tags:
             - { name: 'serializer.normalizer', priority: 8 }
 

src/Bundle/ChillMainBundle/config/services/templating.yaml

@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
 #    twig_intl:
 #        class: Twig_Extensions_Extension_Intl
 #        tags:
@@ -32,8 +36,6 @@ services:
             - { name: twig.extension }
 
     Chill\MainBundle\Templating\Entity\CommentRender:
-        autoconfigure: true
-        autowire: true
         tags:
             - { name: 'chill.render_entity' }
 
@@ -41,17 +43,11 @@ services:
         tags:
             - { name: twig.extension }
 
-    Chill\MainBundle\Templating\Entity\AddressRender:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Templating\Entity\AddressRender: ~
 
-    Chill\MainBundle\Templating\Entity\UserRender:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Templating\Entity\UserRender: ~
 
     Chill\MainBundle\Templating\Listing\:
         resource: './../../Templating/Listing'
-        autoconfigure: true
-        autowire: true
 
     Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface: '@Chill\MainBundle\Templating\Listing\FilterOrderHelperFactory'

src/Bundle/ChillMainBundle/config/services/timeline.yaml

@@ -1,4 +1,8 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill_main.timeline_builder:
         class: Chill\MainBundle\Timeline\TimelineBuilder
         arguments:

src/Bundle/ChillMainBundle/config/services/validator.yaml

@@ -1,11 +1,15 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     chill_main.validator_user_circle_consistency:
         class: Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistencyValidator
         arguments:
             - "@chill.main.security.authorization.helper"
         tags:
             - { name: "validator.constraint_validator" }
-            
+
     Chill\MainBundle\Validation\Validator\UserUniqueEmailAndUsername:
         arguments:
             $em: '@Doctrine\ORM\EntityManagerInterface'

src/Bundle/ChillMainBundle/config/services/widget.yaml

@@ -1,2 +1,6 @@
 services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+
     Chill\MainBundle\Templating\UI\CountNotificationUser: ~

src/Bundle/ChillMainBundle/migrations/Version20211119173554.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20211119173554 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'remove comment on deprecated json_array type';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $columns = [
+            'users.attributes'
+        ];
+
+        foreach ($columns as $col) {
+            $this->addSql("COMMENT ON COLUMN $col IS NULL");
+        }
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->throwIrreversibleMigrationException();
+    }
+}

src/Bundle/ChillMainBundle/translations/messages.fr.yml

@@ -37,7 +37,7 @@ Choose an user: Choisir un utilisateur
 No value: Aucune information
 Last updated by: Dernière mise à jour par
 Last updated on: Dernière mise à jour le
-on: le
+on: "le "
 
 Edit: Modifier
 Update: Mettre à jour
@@ -74,7 +74,7 @@ Choose a postal code: Choisir un code postal
 address:
   address_homeless: L'adresse est-elle celle d'un domicile fixe ?
   real address: Adresse d'un domicile
-  consider homeless: N'est pas l'adresse d'un domicile (SDF)
+  consider homeless: Cette adresse est incomplète
 address more:
   floor: ét
   corridor: coul
@@ -86,6 +86,10 @@ address more:
 Create a new address: Créer une nouvelle adresse
 Create an address: Créer une adresse
 Update address: Modifier l'adresse
+City or postal code: Ville ou code postal
+
+# contact
+Part of the phonenumber: Partie du numéro de téléphone
 
 #serach
 Your search is empty. Please provide search terms.: La recherche est vide. Merci de fournir des termes de recherche.
@@ -190,7 +194,7 @@ Location: Localisation
 Location type list: Liste des types de localisation
 Create a new location type: Créer un nouveau type de localisation
 Available for users: Disponible aux utilisateurs
-Address required: Adresse requise? 
+Address required: Adresse requise?
 Contact data: Données de contact?
 optional: optionnel
 required: requis