Issue #3: Remove public prefix and align routes.

composer.json

@@ -13,7 +13,7 @@
             "Chill\\EventBundle\\": "src/Bundle/ChillEventBundle",
             "Chill\\FamilyMemberBundle\\": "src/Bundle/ChillFamilyMemberBundle",
             "Chill\\MainBundle\\": "src/Bundle/ChillMainBundle",
-            "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle/src",
+            "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle",
             "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle",
             "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
             "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle"

src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php

@@ -27,7 +27,6 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Chill\MainBundle\Form\Type\DataTransformer\ObjectToIdTransformer;
 use Doctrine\Persistence\ObjectManager;
 use Chill\MainBundle\Form\Type\Select2ChoiceType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 
 /**
  * Extends choice to allow adding select2 library on widget
@@ -42,26 +41,15 @@ class Select2CountryType extends AbstractType
      */
     private $requestStack;
 
-    /**
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-
     /**
      * @var ObjectManager
      */
     private $em;
 
-    public function __construct(
+    public function __construct(RequestStack $requestStack,ObjectManager $em)
-        RequestStack $requestStack,
-        ObjectManager $em,
-        TranslatableStringHelper $translatableStringHelper
-        )
     {
         $this->requestStack = $requestStack;
         $this->em = $em;
-        $this->translatableStringHelper = $translatableStringHelper;
     }
 
     public function getBlockPrefix()
@@ -87,7 +75,7 @@ class Select2CountryType extends AbstractType
         $choices = array();
 
         foreach ($countries as $c) {
-            $choices[$c->getId()] = $this->translatableStringHelper->localize($c->getName());
+            $choices[$c->getId()] = $c->getName()[$locale];
         }
 
         asort($choices, SORT_STRING | SORT_FLAG_CASE);

src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php

@@ -27,7 +27,6 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Chill\MainBundle\Form\Type\DataTransformer\MultipleObjectsToIdTransformer;
 use Doctrine\Persistence\ObjectManager;
 use Chill\MainBundle\Form\Type\Select2ChoiceType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 
 /**
  * Extends choice to allow adding select2 library on widget for languages (multiple)
@@ -44,21 +43,10 @@ class Select2LanguageType extends AbstractType
      */
     private $em;
 
-    /**
+    public function __construct(RequestStack $requestStack,ObjectManager $em)
-     *
-     * @var TranslatableStringHelper
-     */
-    protected $translatableStringHelper;
-
-    public function __construct(
-        RequestStack $requestStack,
-        ObjectManager $em,
-        TranslatableStringHelper $translatableStringHelper
-        )
     {
         $this->requestStack = $requestStack;
         $this->em = $em;
-        $this->translatableStringHelper = $translatableStringHelper;
     }
 
     public function getBlockPrefix()
@@ -84,7 +72,7 @@ class Select2LanguageType extends AbstractType
         $choices = array();
 
         foreach ($languages as $l) {
-            $choices[$l->getId()] = $this->translatableStringHelper->localize($l->getName());
+            $choices[$l->getId()] = $l->getName()[$locale];
         }
 
         asort($choices, SORT_STRING | SORT_FLAG_CASE);

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

@@ -32,34 +32,34 @@ use Chill\MainBundle\Entity\GroupCenter;
 use Chill\MainBundle\Entity\RoleScope;
 
 /**
- * Helper for authorizations.
+ * Helper for authorizations. 
- *
+ * 
  * Provides methods for user and entities information.
  *
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
-class AuthorizationHelper implements AuthorizationHelperInterface
+class AuthorizationHelper
 {
     /**
      *
      * @var RoleHierarchyInterface
      */
     protected $roleHierarchy;
-
+    
     /**
-     * The role in a hierarchy, given by the parameter
+     * The role in a hierarchy, given by the parameter 
      * `security.role_hierarchy.roles` from the container.
      *
      * @var string[]
      */
     protected $hierarchy;
-
+    
     /**
      *
      * @var EntityManagerInterface
      */
     protected $em;
-
+    
     public function __construct(
         RoleHierarchyInterface $roleHierarchy,
         $hierarchy,
@@ -69,10 +69,10 @@ class AuthorizationHelper implements AuthorizationHelperInterface
         $this->hierarchy     = $hierarchy;
         $this->em = $em;
     }
-
+    
     /**
      * Determines if a user is active on this center
-     *
+     * 
      * @param User $user
      * @param Center $center
      * @return bool
@@ -81,21 +81,21 @@ class AuthorizationHelper implements AuthorizationHelperInterface
     {
         foreach ($user->getGroupCenters() as $groupCenter) {
             if ($center->getId() === $groupCenter->getCenter()->getId()) {
-
+                
                 return true;
             }
         }
-
+        
         return false;
     }
-
+    
     /**
-     *
+     * 
      * Determines if the user has access to the given entity.
-     *
+     * 
      * if the entity implements Chill\MainBundle\Entity\HasScopeInterface,
      * the scope is taken into account.
-     *
+     * 
      * @param User $user
      * @param HasCenterInterface $entity the entity may also implement HasScopeInterface
      * @param string|Role $attribute
@@ -103,15 +103,15 @@ class AuthorizationHelper implements AuthorizationHelperInterface
      */
     public function userHasAccess(User $user, HasCenterInterface $entity, $attribute)
     {
-
+        
         $center = $entity->getCenter();
-
+        
         if (!$this->userCanReachCenter($user, $center)) {
             return false;
         }
-
+        
         $role = ($attribute instanceof Role) ? $attribute : new Role($attribute);
-
+        
         foreach ($user->getGroupCenters() as $groupCenter){
             //filter on center
             if ($groupCenter->getCenter()->getId() === $entity->getCenter()->getId()) {
@@ -119,7 +119,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface
                 //iterate on roleScopes
                 foreach($permissionGroup->getRoleScopes() as $roleScope) {
                     //check that the role allow to reach the required role
-                    if ($this->isRoleReached($role,
+                    if ($this->isRoleReached($role, 
                           new Role($roleScope->getRole()))){
                         //if yes, we have a right on something...
                         // perform check on scope if necessary
@@ -137,17 +137,17 @@ class AuthorizationHelper implements AuthorizationHelperInterface
                         }
                     }
                 }
-
+                
             }
         }
-
+        
         return false;
     }
-
+    
     /**
      * Get reachable Centers for the given user, role,
      * and optionnaly Scope
-     *
+     * 
      * @param User $user
      * @param Role $role
      * @param null|Scope $scope
@@ -156,13 +156,13 @@ class AuthorizationHelper implements AuthorizationHelperInterface
     public function getReachableCenters(User $user, Role $role, Scope $scope = null)
     {
         $centers = array();
-
+        
         foreach ($user->getGroupCenters() as $groupCenter){
             $permissionGroup = $groupCenter->getPermissionsGroup();
             //iterate on roleScopes
             foreach($permissionGroup->getRoleScopes() as $roleScope) {
                 //check that the role is in the reachable roles
-                if ($this->isRoleReached($role,
+                if ($this->isRoleReached($role, 
                       new Role($roleScope->getRole()))) {
                     if ($scope === null) {
                         $centers[] = $groupCenter->getCenter();
@@ -171,19 +171,19 @@ class AuthorizationHelper implements AuthorizationHelperInterface
                         if ($scope->getId() == $roleScope->getScope()->getId()){
                             $centers[] = $groupCenter->getCenter();
                             break 1;
-                        }
+                        }      
                     }
                 }
             }
-
+            
         }
-
+        
         return $centers;
     }
-
+    
     /**
      * Return all reachable scope for a given user, center and role
-     *
+     * 
      * @deprecated Use getReachableCircles
      *
      * @param User $user
@@ -195,10 +195,10 @@ class AuthorizationHelper implements AuthorizationHelperInterface
     {
         return $this->getReachableCircles($user, $role, $center);
     }
-
+    
     /**
      * Return all reachable circle for a given user, center and role
-     *
+     * 
      * @param User $user
      * @param Role $role
      * @param Center $center
@@ -207,7 +207,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface
     public function getReachableCircles(User $user, Role $role, Center $center)
     {
         $scopes = array();
-
+        
         foreach ($user->getGroupCenters() as $groupCenter){
             if ($center->getId() === $groupCenter->getCenter()->getId()) {
                 //iterate on permissionGroup
@@ -215,7 +215,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface
                 //iterate on roleScopes
                 foreach($permissionGroup->getRoleScopes() as $roleScope) {
                     //check that the role is in the reachable roles
-                    if ($this->isRoleReached($role,
+                    if ($this->isRoleReached($role, 
                           new Role($roleScope->getRole()))) {
 
                         $scopes[] = $roleScope->getScope();
@@ -223,12 +223,12 @@ class AuthorizationHelper implements AuthorizationHelperInterface
                 }
             }
         }
-
+        
         return $scopes;
     }
-
+    
     /**
-     *
+     * 
      * @param Role $role
      * @param Center $center
      * @param Scope $circle
@@ -239,7 +239,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface
         $parents = $this->getParentRoles($role);
         $parents[] = $role;
         $parentRolesString = \array_map(function(Role $r) { return $r->getRole(); }, $parents);
-
+        
         $qb = $this->em->createQueryBuilder();
         $qb
             ->select('u')
@@ -250,21 +250,21 @@ class AuthorizationHelper implements AuthorizationHelperInterface
             ->where('gc.center = :center')
             ->andWhere($qb->expr()->in('rs.role', $parentRolesString))
             ;
-
+        
         $qb->setParameter('center', $center);
-
+        
         if ($circle !== null) {
             $qb->andWhere('rs.scope = :circle')
                 ->setParameter('circle', $circle)
                 ;
         }
-
+        
         return $qb->getQuery()->getResult();
     }
-
+    
     /**
      * Test if a parent role may give access to a given child role
-     *
+     * 
      * @param Role $childRole The role we want to test if he is reachable
      * @param Role $parentRole The role which should give access to $childRole
      * @return boolean true if the child role is granted by parent role
@@ -273,14 +273,14 @@ class AuthorizationHelper implements AuthorizationHelperInterface
     {
         $reachableRoles = $this->roleHierarchy
                 ->getReachableRoles([$parentRole]);
-
+        
         return in_array($childRole, $reachableRoles);
     }
-
+    
     /**
-     * Return all the role which give access to the given role. Only the role
+     * Return all the role which give access to the given role. Only the role 
      * which are registered into Chill are taken into account.
-     *
+     * 
      * @param Role $role
      * @return Role[] the role which give access to the given $role
      */
@@ -291,18 +291,18 @@ class AuthorizationHelper implements AuthorizationHelperInterface
         $roles = \array_map(
                 function($string) {
                     return new Role($string);
-                },
+                }, 
                 \array_keys($this->hierarchy)
                 );
-
+        
         foreach ($roles as $r) {
             $childRoles = $this->roleHierarchy->getReachableRoleNames([$r->getRole()]);
-
+            
             if (\in_array($role, $childRoles)) {
                 $parentRoles[] = $r;
             }
         }
-
+        
         return $parentRoles;
     }
 }

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

@@ -1,87 +0,0 @@
-<?php
-
-namespace Chill\MainBundle\Security\Authorization;
-
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Entity\Center;
-use Chill\MainBundle\Entity\HasCenterInterface;
-use Symfony\Component\Security\Core\Role\Role;
-use Chill\MainBundle\Entity\Scope;
-
-interface AuthorizationHelperInterface
-{
-
-    /**
-     * Determines if a user is active on this center
-     *
-     * @param User $user
-     * @param Center $center
-     * @return bool
-     */
-    public function userCanReachCenter(User $user, Center $center);
-
-    /**
-     *
-     * Determines if the user has access to the given entity.
-     *
-     * if the entity implements Chill\MainBundle\Entity\HasScopeInterface,
-     * the scope is taken into account.
-     *
-     * @param User $user
-     * @param HasCenterInterface $entity the entity may also implement HasScopeInterface
-     * @param string|Role $attribute
-     * @return boolean true if the user has access
-     */
-    public function userHasAccess(User $user, HasCenterInterface $entity, $attribute);
-
-    /**
-     * Get reachable Centers for the given user, role,
-     * and optionnaly Scope
-     *
-     * @param User $user
-     * @param Role $role
-     * @param null|Scope $scope
-     * @return Center[]
-     */
-    public function getReachableCenters(User $user, Role $role, Scope $scope = null);
-
-    /**
-     * Return all reachable scope for a given user, center and role
-     *
-     * @deprecated Use getReachableCircles
-     *
-     * @param User $user
-     * @param Role $role
-     * @param Center $center
-     * @return Scope[]
-     */
-    public function getReachableScopes(User $user, Role $role, Center $center);
-
-    /**
-     * Return all reachable circle for a given user, center and role
-     *
-     * @param User $user
-     * @param Role $role
-     * @param Center $center
-     * @return Scope[]
-     */
-    public function getReachableCircles(User $user, Role $role, Center $center);
-
-    /**
-     *
-     * @param Role $role
-     * @param Center $center
-     * @param Scope $circle
-     * @return Users
-     */
-    public function findUsersReaching(Role $role, Center $center, Scope $circle = null);
-
-    /**
-     * Return all the role which give access to the given role. Only the role
-     * which are registered into Chill are taken into account.
-     *
-     * @param Role $role
-     * @return Role[] the role which give access to the given $role
-     */
-    public function getParentRoles(Role $role);
-}

src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtension.php

@@ -2,7 +2,7 @@
 /*
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2019, Champs Libres Cooperative SCRLFS,
+ * Copyright (C) 2014-2019, Champs Libres Cooperative SCRLFS, 
  * <http://www.champs-libres.coop>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -28,18 +28,18 @@ use Twig\TwigFilter;
  *
  * @package Chill\MainBundle\Templating\Entity
  */
-class ChillEntityRenderExtension extends AbstractExtension implements ChillEntityRenderExtensionInterface
+class ChillEntityRenderExtension extends AbstractExtension
 {
     /**
-     * @var ChillEntityRenderInterface
+     * @var ChillEntityRenderInterface 
      */
     protected $renders = [];
-
+    
     /**
      * @var ChillEntityRender
      */
     protected $defaultRender;
-
+    
     /**
      * ChillEntityRenderExtension constructor.
      */
@@ -47,7 +47,7 @@ class ChillEntityRenderExtension extends AbstractExtension implements ChillEntit
     {
         $this->defaultRender = new ChillEntityRender();
     }
-
+    
     /**
      * @return array|TwigFilter[]
      */
@@ -62,7 +62,7 @@ class ChillEntityRenderExtension extends AbstractExtension implements ChillEntit
             ])
         ];
     }
-
+    
     /**
      * @param $entity
      * @param array $options
@@ -76,7 +76,7 @@ class ChillEntityRenderExtension extends AbstractExtension implements ChillEntit
         return $this->getRender($entity, $options)
             ->renderString($entity, $options);
     }
-
+    
     /**
      * @param $entity
      * @param array $options
@@ -90,7 +90,7 @@ class ChillEntityRenderExtension extends AbstractExtension implements ChillEntit
         return $this->getRender($entity, $options)
             ->renderBox($entity, $options);
     }
-
+    
     /**
      * @param ChillEntityRenderInterface $render
      */
@@ -98,7 +98,7 @@ class ChillEntityRenderExtension extends AbstractExtension implements ChillEntit
     {
         $this->renders[] = $render;
     }
-
+    
     /**
      * @param $entity
      * @param $options

src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderExtensionInterface.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace Chill\MainBundle\Templating\Entity;
-
-use Twig\Extension\ExtensionInterface;
-use Twig\TwigFilter;
-
-interface ChillEntityRenderExtensionInterface extends ExtensionInterface
-{
-    /**
-     * @return array|TwigFilter[]
-     */
-    public function getFilters();
-
-    /**
-     * @param $entity
-     * @param array $options
-     * @return string
-     */
-    public function renderString($entity, array $options = []): string;
-
-    /**
-     * @param $entity
-     * @param array $options
-     * @return string
-     */
-    public function renderBox($entity, array $options = []): string;
-
-    /**
-     * @param ChillEntityRenderInterface $render
-     */
-    public function addRender(ChillEntityRenderInterface $render);
-}

src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php

@@ -23,36 +23,36 @@ use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Translation\Translator;
 
 /**
- *
+ * 
  * This helper helps to find the string in current locale from translatable_strings
- *
+ * 
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  *
  */
-class TranslatableStringHelper implements TranslatableStringHelperInterface
+class TranslatableStringHelper
 {
     /**
-     *
+     * 
      * @var RequestStack
      */
     private $requestStack;
-
+    
     private $fallbackLocales;
-
+    
     public function __construct(RequestStack $requestStack, Translator $translator)
     {
         $this->requestStack = $requestStack;
         $this->fallbackLocales = $translator->getFallbackLocales();
     }
-
+    
     /**
      * 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
      */
@@ -61,32 +61,32 @@ class TranslatableStringHelper implements TranslatableStringHelperInterface
         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];
                 }
             }
-
+            
         }
-
+        
         // no fallback translation... trying the  first available
         $langs = array_keys($translatableStrings);
-
+        
         if (count($langs) === 0) {
             return '';
         }
-
+    
         return $translatableStrings[$langs[0]];
 
     }
 
-}
+}

src/Bundle/ChillMainBundle/Templating/TranslatableStringHelperInterface.php

@@ -1,19 +0,0 @@
-<?php
-
-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.
-     * Return NULL if $translatableString is NULL
-     *
-     * @param array $translatableStrings
-     * @return string
-     */
-    public function localize(array $translatableStrings);
-}

src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php

@@ -29,40 +29,40 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface;
  *
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
-class TimelineBuilder implements ContainerAwareInterface, TimelineBuilderInterface
+class TimelineBuilder implements ContainerAwareInterface
 {
-
+    
     use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
-
+    
     /**
      *
      * @var \Doctrine\ORM\EntityManagerInterface
      */
     private $em;
-
+    
     /**
      * Record provider
-     *
+     * 
      * This array has the structure `[ 'service id' => $service ]`
      *
      * @var TimelineProviderInterface[]
      */
     private $providers = [];
-
+    
     /**
      * Record provider and their context
-     *
+     * 
      * This array has the structure `[ 'context' => [ 'service id' ] ]`
      *
      * @var array
      */
     private $providersByContext = [];
-
+    
     public function __construct(EntityManagerInterface $em)
     {
         $this->em = $em;
     }
-
+    
     /**
      * return an HTML string with timeline
      *
@@ -79,18 +79,18 @@ class TimelineBuilder implements ContainerAwareInterface, TimelineBuilderInterfa
     public function getTimelineHTML($context, array $args, $firstItem = 0, $number = 20)
     {
         $union = $this->buildUnionQuery($context, $args);
-
+        
         //add ORDER BY clause and LIMIT
         $query = $union . sprintf(' ORDER BY date DESC LIMIT %d OFFSET %d',
             $number, $firstItem);
-
+        
         // run query and handle results
         $fetched = $this->runUnionQuery($query);
         $entitiesByKey = $this->getEntities($fetched, $context);
-
+        
         return $this->render($fetched, $entitiesByKey, $context, $args);
     }
-
+    
     /**
      * Return the number of items for the given context and args
      *
@@ -101,17 +101,17 @@ class TimelineBuilder implements ContainerAwareInterface, TimelineBuilderInterfa
     public function countItems($context, array $args)
     {
         $union = $this->buildUnionQuery($context, $args);
-
+        
         // embed the union query inside a count query
         $count = sprintf('SELECT COUNT(sq.id) AS total FROM (%s) as sq', $union);
-
+        
         $rsm = (new ResultSetMapping())
             ->addScalarResult('total', 'total', Type::INTEGER);
-
+        
         return $this->em->createNativeQuery($count, $rsm)
             ->getSingleScalarResult();
     }
-
+    
     /**
      * add a provider id
      *
@@ -125,7 +125,7 @@ class TimelineBuilder implements ContainerAwareInterface, TimelineBuilderInterfa
         $this->providersByContext[$context][] = $id;
         $this->providers[$id] = $provider;
     }
-
+    
     /**
      * Get providers by context
      *
@@ -139,16 +139,16 @@ class TimelineBuilder implements ContainerAwareInterface, TimelineBuilderInterfa
             throw new \LogicException(sprintf('No builders have been defined for "%s"'
                     . ' context', $context));
         }
-
+    
         $providers = [];
-
+        
         foreach($this->providersByContext[$context] as $providerId) {
             $providers[] = $this->providers[$providerId];
         }
-
+        
         return $providers;
     }
-
+    
     /**
      * build the UNION query with all providers
      *
@@ -170,10 +170,10 @@ class TimelineBuilder implements ContainerAwareInterface, TimelineBuilderInterfa
             $append = ($union === '') ?  $select : ' UNION '.$select;
             $union .= $append;
         }
-
+        
         return $union;
     }
-
+    
     /**
      * return the SQL SELECT query as a string,
      *
@@ -186,7 +186,7 @@ class TimelineBuilder implements ContainerAwareInterface, TimelineBuilderInterfa
     private function buildSelectQuery(TimelineProviderInterface $provider, $context, array $args)
     {
         $data = $provider->fetchQuery($context, $args);
-
+        
         return sprintf(
                 'SELECT %s AS id, '
                 . '%s AS "date", '
@@ -199,7 +199,7 @@ class TimelineBuilder implements ContainerAwareInterface, TimelineBuilderInterfa
                 $data['FROM'],
                 $data['WHERE']);
     }
-
+    
     /**
      * run the UNION query and return result as an array
      *
@@ -212,11 +212,11 @@ class TimelineBuilder implements ContainerAwareInterface, TimelineBuilderInterfa
                 ->addScalarResult('id', 'id')
                 ->addScalarResult('type', 'type')
                 ->addScalarResult('date', 'date');
-
+        
         return $this->em->createNativeQuery($query, $resultSetMapping)
                 ->getArrayResult();
     }
-
+    
     /**
      *
      * @param array $queriedIds
@@ -227,11 +227,11 @@ class TimelineBuilder implements ContainerAwareInterface, TimelineBuilderInterfa
     {
         //gather entities by type to pass all id with same type to the TimelineProvider.
         $idsByType = array();
-
+        
         foreach($queriedIds as $result) {
             $idsByType[$result['type']][] = $result['id'];
         }
-
+        
         //fetch entities from providers
         $entitiesByType = array();
         foreach ($idsByType as $type => $ids) {
@@ -243,10 +243,10 @@ class TimelineBuilder implements ContainerAwareInterface, TimelineBuilderInterfa
                 }
             }
         }
-
+        
         return $entitiesByType;
     }
-
+    
     /**
      * render the timeline as HTML
      *
@@ -269,17 +269,17 @@ class TimelineBuilder implements ContainerAwareInterface, TimelineBuilderInterfa
             $timelineEntry['date'] = new \DateTime($result['date']);
             $timelineEntry['template'] = $data['template'];
             $timelineEntry['template_data'] = $data['template_data'];
-
+            
             $timelineEntries[] = $timelineEntry;
         }
-
+        
         return $this->container->get('templating')
                 ->render('@ChillMain/Timeline/index.html.twig', array(
                     'results' => $timelineEntries
                 ));
-
+        
     }
-
+    
     /**
      * get the template data from the provider for the given entity, by type.
      *

src/Bundle/ChillMainBundle/Timeline/TimelineBuilderInterface.php

@@ -1,24 +0,0 @@
-<?php
-
-/*
- * 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/>.
- */
-
-namespace Chill\MainBundle\Timeline;
-
-interface TimelineBuilderInterface
-{
-}

src/Bundle/ChillMainBundle/config/routes.yaml

@@ -28,7 +28,7 @@ chill_password:
 
 chill_password_recover:
     resource: "@ChillMainBundle/config/routes/password_recover.yaml"
-    prefix: "public/{_locale}/password"
+    prefix: "{_locale}/password"
 
 chill_crud:
     resource: "@ChillMainBundle"
@@ -86,3 +86,7 @@ login_check:
 
 logout:
     path:    /logout
+
+chill_main_test:
+    path: /{_locale}/main/test
+    controller: Chill\MainBundle\Controller\DefaultController::testAction

src/Bundle/ChillMainBundle/config/services.yaml

@@ -10,7 +10,6 @@ services:
             - "@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
@@ -20,14 +19,14 @@ services:
             - [ setContainer, ["@service_container"]]
         tags:
             - { name: twig.extension }
-
+            
     chill.main.twig.widget:
         class: Chill\MainBundle\Templating\Widget\WidgetRenderingTwig
         arguments:
             - "@event_dispatcher"
         tags:
             - { name: twig.extension }
-
+            
     chill.main.twig.csv_cell:
         class: Chill\MainBundle\Templating\CSVCellTwig
         tags:

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

@@ -23,7 +23,6 @@ services:
         arguments:
             - "@request_stack"
             - "@doctrine.orm.entity_manager"
-            - "@chill.main.helper.translatable_string"
         tags:
             - { name: form.type, alias: select2_chill_country }
 
@@ -32,7 +31,6 @@ services:
         arguments:
             - "@request_stack"
             - "@doctrine.orm.entity_manager"
-            - "@chill.main.helper.translatable_string"
         tags:
             - { name: form.type, alias: select2_chill_language }
 

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

@@ -1,4 +1,4 @@
-services:
+services:    
     chill.main.security.authorization.helper:
         class: Chill\MainBundle\Security\Authorization\AuthorizationHelper
         arguments:
@@ -6,48 +6,47 @@ services:
             $hierarchy: "%security.role_hierarchy.roles%"
             $em: '@Doctrine\ORM\EntityManagerInterface'
     Chill\MainBundle\Security\Authorization\AuthorizationHelper: '@chill.main.security.authorization.helper'
-    Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface: Chill\MainBundle\Security\Authorization\AuthorizationHelper
+            
-
     chill.main.role_provider:
         class: Chill\MainBundle\Security\RoleProvider
-
+        
     chill.main.user_provider:
         class: Chill\MainBundle\Security\UserProvider\UserProvider
         arguments:
             $em: '@Doctrine\ORM\EntityManagerInterface'
-
+            
     Chill\MainBundle\Security\Authorization\ChillExportVoter:
         arguments:
             $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
         tags:
             - { name: security.voter }
-
+            
-    Chill\MainBundle\Security\PasswordRecover\TokenManager:
+    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%"
-
+        
     Chill\MainBundle\Security\PasswordRecover\PasswordRecoverEventSubscriber:
         arguments:
             $locker: '@Chill\MainBundle\Security\PasswordRecover\PasswordRecoverLocker'
         tags:
             - { name: kernel.event_subscriber }
-
+            
     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 }
+            - { name: security.voter }

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

@@ -30,7 +30,6 @@ services:
     Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension:
         tags:
             - { name: twig.extension }
-    Chill\MainBundle\Templating\Entity\ChillEntityRenderExtensionInterface: Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension
 
     Chill\MainBundle\Templating\Entity\CommentRender:
         arguments:
@@ -38,7 +37,7 @@ services:
             - '@Symfony\Component\Templating\EngineInterface'
         tags:
             - { name: 'chill.render_entity' }
-
+            
     Chill\MainBundle\Templating\ChillMarkdownRenderExtension:
         tags:
             - { name: twig.extension }

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

@@ -4,6 +4,4 @@ services:
         arguments:
             - "@doctrine.orm.entity_manager"
         calls:
-            - [ setContainer, ["@service_container"]]
+            - [ setContainer, ["@service_container"]]
-
-    Chill\MainBundle\Timeline\TimelineBuilderInterface: "@chill_main.timeline_builder"

src/Bundle/ChillPersonBundle/Actions/ActionEvent.php

@@ -17,57 +17,57 @@
  */
 namespace Chill\PersonBundle\Actions;
 
-use Symfony\Contracts\EventDispatcher\Event;
+use Symfony\Component\EventDispatcher\Event;
 
 /**
  * Event triggered when an entity attached to a person is removed.
- *
+ * 
  *
  */
-class ActionEvent implements Event
+class ActionEvent extends Event
 {
     const DELETE = 'CHILL_PERSON.DELETE_ASSOCIATED_ENTITY';
     const MOVE   = 'CHILL_PERSON.MOVE_ASSOCIATED_ENTITY';
-
+    
     /**
      *
      * @var int
      */
     protected $personId;
-
+    
     /**
      * the FQDN class name as recorded in doctrine
      *
      * @var string
      */
     protected $entity;
-
+    
     /**
      * an array of key value data to describe the movement
      *
      * @var array
      */
     protected $metadata;
-
+    
     /**
      * the sql statement
      *
-     * @var string
+     * @var string 
      */
     protected $sqlStatement;
-
+    
     /**
      *
      * @var string[]
      */
     protected $preSql = [];
-
+    
     /**
      *
      * @var string[]
      */
     protected $postSql = [];
-
+    
     public function __construct($personId, $entity, $sqlStatement, $metadata = [])
     {
         $this->personId = $personId;
@@ -77,7 +77,7 @@ class ActionEvent implements Event
     }
 
     /**
-     *
+     * 
      * @return string[]
      */
     public function getPreSql(): array
@@ -86,7 +86,7 @@ class ActionEvent implements Event
     }
 
     /**
-     *
+     * 
      * @return string[]
      */
     public function getPostSql(): array
@@ -105,7 +105,7 @@ class ActionEvent implements Event
 
     /**
      * Add Sql which will be executed **after** the delete statement
-     *
+     * 
      * @param type $postSql
      * @return $this
      */
@@ -122,22 +122,22 @@ class ActionEvent implements Event
 
     /**
      * get the entity name, as recorded in doctrine
-     *
+     * 
      * @return string
      */
     public function getEntity(): string
     {
         return $this->entity;
     }
-
+    
     public function getSqlStatement()
     {
         return $this->sqlStatement;
     }
-
+    
     public function getMetadata()
     {
         return $this->metadata;
     }
-
+    
 }

src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php

@@ -5,10 +5,10 @@ namespace Chill\PersonBundle\Config;
 
 /**
  * Give help to interact with the config for alt names
- *
+ * 
  *
  */
-class ConfigPersonAltNamesHelper implements ConfigPersonAltNamesHelperInterface
+class ConfigPersonAltNamesHelper
 {
     /**
      * the raw config, directly from the container parameter
@@ -16,32 +16,32 @@ class ConfigPersonAltNamesHelper implements ConfigPersonAltNamesHelperInterface
      * @var array
      */
     private $config = [];
-
+    
     public function __construct($config)
     {
         $this->config = $config;
     }
-
+    
     /**
      * Return true if at least one alt name is configured
-     *
+     * 
      * @return bool
      */
     public function hasAltNames(): bool
     {
         return count($this->config) > 0;
     }
-
+    
     /**
      * get the choices as key => values
-     *
+     * 
      * @return array
      */
     public function getChoices(): array
     {
         $choices = [];
         foreach ($this->config as $entry) {
-
+            
             $labels = $entry['labels'];
             $lang = false;
             $label = false;
@@ -50,11 +50,11 @@ class ConfigPersonAltNamesHelper implements ConfigPersonAltNamesHelperInterface
                 if (key($labels) === 'lang') {
                     $lang = current($labels);
                 }
-
+                
                 if (key($labels) === 'label') {
                     $label = current($labels);
                 }
-
+                
                 if ($lang !== FALSE && $label !== FALSE) {
                     $choices[$entry['key']][$lang] = $label;
                     $lang = false;
@@ -63,7 +63,7 @@ class ConfigPersonAltNamesHelper implements ConfigPersonAltNamesHelperInterface
                 $cur = next($labels);
             }
         }
-
+        
         return $choices;
     }
 

src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php

@@ -26,7 +26,7 @@ use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Doctrine\DBAL\Exception;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Form\Type\AccompanyingPeriodType;
+use Chill\PersonBundle\Form\AccompanyingPeriodType;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\Common\Collections\Criteria;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
@@ -47,12 +47,12 @@ class AccompanyingPeriodController extends AbstractController
      * @var EventDispatcherInterface
      */
     protected $eventDispatcher;
-
+    
     /**
      * @var ValidatorInterface
      */
     protected $validator;
-
+    
     /**
      * AccompanyingPeriodController constructor.
      *
@@ -64,17 +64,11 @@ class AccompanyingPeriodController extends AbstractController
         $this->eventDispatcher = $eventDispatcher;
         $this->validator = $validator;
     }
-
+    
-    /**
-     * @Route(
-     *  name="chill_person_accompanying_period_list",
-     *  path="/{_locale}/person/{person_id}/accompanying-period"
-     * )
-     */
     public function listAction(int $person_id): Response
     {
         $person = $this->_getPerson($person_id);
-
+    
         $event = new PrivacyEvent($person, [
             'element_class' => AccompanyingPeriod::class,
             'action' => 'list'
@@ -86,13 +80,7 @@ class AccompanyingPeriodController extends AbstractController
             'person' => $person
         ]);
     }
-
+    
-    /**
-     * @Route(
-     *  name="chill_person_accompanying_period_create",
-     *  path="/{_locale}/person/{person_id}/accompanying-period/create"
-     * )
-     */
     public function createAction(int $person_id, Request $request): Response
     {
         $person = $this->_getPerson($person_id);
@@ -102,17 +90,17 @@ class AccompanyingPeriodController extends AbstractController
 
         $accompanyingPeriod = new AccompanyingPeriod(new \DateTime('now'));
         $accompanyingPeriod->setClosingDate(new \DateTime('now'));
-
+        
         $accompanyingPeriod->addPerson($person);
         //or $person->addAccompanyingPeriod($accompanyingPeriod);
-
+        
         $form = $this->createForm(
             AccompanyingPeriodType::class,
             $accompanyingPeriod, [
                 'period_action' => 'create',
                 'center' => $person->getCenter()
             ]);
-
+        
         if ($request->getMethod() === 'POST') {
             $form->handleRequest($request);
             $errors = $this->_validatePerson($person);
@@ -132,7 +120,7 @@ class AccompanyingPeriodController extends AbstractController
                     $this->generateUrl('chill_person_accompanying_period_list', [
                         'person_id' => $person->getId()
                     ]));
-
+                
             } else {
                 $flashBag->add('error', $this->get('translator')
                         ->trans('Error! Period not created!'));
@@ -149,12 +137,9 @@ class AccompanyingPeriodController extends AbstractController
             'accompanying_period' => $accompanyingPeriod
         ]);
     }
-
+    
     /**
-     * @Route(
+     * @throws Exception
-     *  name="chill_person_accompanying_period_update",
-     *  path="/{_locale}/person/{person_id}/accompanying-period/{period_id}/update"
-     * )
      */
     public function updateAction(int $person_id, int $period_id, Request $request): Response
     {
@@ -169,7 +154,7 @@ class AccompanyingPeriodController extends AbstractController
 
         /** @var Person $person */
         $person = $this->_getPerson($person_id);
-
+        
         // CHECK
         if (! $accompanyingPeriod->containsPerson($person)) {
             throw new Exception("Accompanying period " . $period_id . " does not contain person " . $person_id);
@@ -191,7 +176,7 @@ class AccompanyingPeriodController extends AbstractController
 
             if ($form->isValid(['Default', 'closed'])
                     && count($errors) === 0) {
-
+                
                 $em->flush();
 
                 $flashBag->add('success',
@@ -201,9 +186,9 @@ class AccompanyingPeriodController extends AbstractController
                     $this->generateUrl('chill_person_accompanying_period_list', [
                         'person_id' => $person->getId()
                 ]));
-
+                
             } else {
-
+                
                 $flashBag->add('error', $this->get('translator')
                         ->trans('Error when updating the period'));
 
@@ -219,22 +204,19 @@ class AccompanyingPeriodController extends AbstractController
             'accompanying_period' => $accompanyingPeriod
         ]);
     }
-
+    
     /**
-     * @Route(
+     * @throws \Exception
-     *  name="chill_person_accompanying_period_close",
-     *  path="/{_locale}/person/{person_id}/accompanying-period/close"
-     * )
      */
     public function closeAction(int $person_id, Request $request): Response
     {
-
+        
         $person = $this->_getPerson($person_id);
 
         $this->denyAccessUnlessGranted(PersonVoter::UPDATE, $person, 'You are not allowed to update this person');
 
         if ($person->isOpen() === false) {
-
+            
             $this->get('session')->getFlashBag()
                 ->add('error', $this->get('translator')
                     ->trans('Beware period is closed', ['%name%' => $person->__toString()]
@@ -247,7 +229,7 @@ class AccompanyingPeriodController extends AbstractController
         }
 
         $current = $person->getCurrentAccompanyingPeriod();
-
+        
         $form = $this->createForm(AccompanyingPeriodType::class, $current, [
             'period_action' => 'close',
             'center' => $person->getCenter()
@@ -274,7 +256,7 @@ class AccompanyingPeriodController extends AbstractController
                             'person_id' => $person->getId()
                         ])
                     );
-
+                    
                 } else {
                     $this->get('session')->getFlashBag()
                             ->add('error', $this->get('translator')
@@ -285,7 +267,7 @@ class AccompanyingPeriodController extends AbstractController
                             ->add('info', $error->getMessage());
                     }
                 }
-
+                
             } else { //if form is not valid
                 $this->get('session')->getFlashBag()
                     ->add('error',
@@ -306,7 +288,7 @@ class AccompanyingPeriodController extends AbstractController
             'accompanying_period' => $current
         ]);
     }
-
+    
     private function _validatePerson(Person $person): ConstraintViolationListInterface
     {
         $errors = $this->validator->validate($person, null,
@@ -314,10 +296,10 @@ class AccompanyingPeriodController extends AbstractController
 
         // Can be disabled with config
         if (false === $this->container->getParameter('chill_person.allow_multiple_simultaneous_accompanying_periods')) {
-
+            
             $errors_accompanying_period = $this->validator->validate($person, null,
                 ['accompanying_period_consistent']);
-
+    
             foreach($errors_accompanying_period as $error ) {
                 $errors->add($error);
             }
@@ -325,13 +307,7 @@ class AccompanyingPeriodController extends AbstractController
 
         return $errors;
     }
-
+    
-    /**
-     * @Route(
-     *  name="chill_person_accompanying_period_open",
-     *  path="/{_locale}/person/{person_id}/accompanying-period/open"
-     * )
-     */
     public function openAction(int $person_id, Request $request): Response
     {
         $person = $this->_getPerson($person_id);
@@ -408,13 +384,7 @@ class AccompanyingPeriodController extends AbstractController
             'accompanying_period' => $accompanyingPeriod
         ]);
     }
-
+    
-    /**
-     * @Route(
-     *  name="chill_person_accompanying_period_re_open",
-     *  path="/{_locale}/person/{person_id}/accompanying-period/re-open"
-     * )
-     */
     public function reOpenAction(int $person_id, int $period_id, Request $request): Response
     {
         /** @var Person $person */
@@ -447,13 +417,13 @@ class AccompanyingPeriodController extends AbstractController
             return $this->redirectToRoute('chill_person_accompanying_period_list', [
                 'person_id' => $person->getId()
             ]);
-
+            
         } elseif ($confirm === false && $period->canBeReOpened($person)) {
             return $this->render('ChillPersonBundle:AccompanyingPeriod:re_open.html.twig', [
                 'period' => $period,
                 'person' => $person
             ]);
-
+            
         } else {
             return (new Response())
                 ->setStatusCode(Response::HTTP_BAD_REQUEST)

src/Bundle/ChillPersonBundle/Controller/AdminController.php

@@ -13,29 +13,16 @@ use Symfony\Component\Routing\Annotation\Route;
 class AdminController extends AbstractController
 {
     /**
-     * @Route(
+     * @param $_locale
-     *  name="chill_person_admin",
+     * @return \Symfony\Component\HttpFoundation\Response
-     *  path="/{_locale}/admin/person"
-     * )
      */
     public function indexAction($_locale)
     {
         return $this->render('ChillPersonBundle:Admin:layout.html.twig', []);
     }
-
+    
     /**
-     * @Route(
+     * @return \Symfony\Component\HttpFoundation\RedirectResponse
-     *  name="chill_person_admin_redirect_to_admin_index",
-     *  path="/{_locale}/admin/person_redirect_to_main",
-     *  options={
-     *      menus={
-     *          admin_person={
-     *              order="0",
-     *              label="Main admin menu"
-     *          }
-     *      }
-     *  }
-     * )
      */
     public function redirectToAdminIndexAction()
     {

src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php

@@ -30,7 +30,6 @@ use Chill\MainBundle\Entity\Address;
 use Doctrine\Common\Collections\Criteria;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * Class PersonAddressController
@@ -46,7 +45,7 @@ class PersonAddressController extends AbstractController
      * @var ValidatorInterface
      */
     protected $validator;
-
+    
     /**
      * PersonAddressController constructor.
      *
@@ -56,13 +55,7 @@ class PersonAddressController extends AbstractController
     {
         $this->validator = $validator;
     }
-
+    
-    /**
-     * @Route(
-     *  name="chill_person_address_list",
-     *  path="/{_locale}/person/{person_id}/address/list"
-     * )
-     */
     public function listAction($person_id)
     {
         $person = $this->getDoctrine()->getManager()
@@ -85,13 +78,6 @@ class PersonAddressController extends AbstractController
         ));
     }
 
-    /**
-     * @Route(
-     *  name="chill_person_address_create",
-     *  path="/{_locale}/person/{person_id}/address/create",
-     *  methods={"POST"}
-     * )
-     */
     public function newAction($person_id)
     {
         $person = $this->getDoctrine()->getManager()
@@ -119,12 +105,6 @@ class PersonAddressController extends AbstractController
         ));
     }
 
-    /**
-     * @Route(
-     *  name="chill_person_address_new",
-     *  path="/{_locale}/person/{person_id}/address/new"
-     * )
-     */
     public function createAction($person_id, Request $request)
     {
         $person = $this->getDoctrine()->getManager()
@@ -181,12 +161,6 @@ class PersonAddressController extends AbstractController
         ));
     }
 
-    /**
-     * @Route(
-     *  name="chill_person_address_edit",
-     *  path="/{_locale}/person/{person_id}/address/{address_id}/edit"
-     * )
-     */
     public function editAction($person_id, $address_id)
     {
         $person = $this->getDoctrine()->getManager()
@@ -215,12 +189,6 @@ class PersonAddressController extends AbstractController
         ));
     }
 
-    /**
-     * @Route(
-     *  name="chill_person_address_update",
-     *  path="/{_locale}/person/{person_id}/address/{address_id}/update"
-     * )
-     */
     public function updateAction($person_id, $address_id, Request $request)
     {
         $person = $this->getDoctrine()->getManager()

src/Bundle/ChillPersonBundle/Controller/PersonController.php

@@ -34,14 +34,12 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Chill\PersonBundle\Search\SimilarPersonMatcher;
+use Symfony\Component\Translation\TranslatorInterface;
 use Chill\MainBundle\Search\SearchProvider;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
-use Chill\PersonBundle\Repository\PersonNotDuplicateRepository;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 final class PersonController extends AbstractController
 {
@@ -119,12 +117,6 @@ final class PersonController extends AbstractController
         return $cFGroup;
     }
 
-    /**
-     * @Route(
-     *  name="chill_person_view",
-     *  path="/{_locale}/person/{person_id}/general"
-     * )
-     */
     public function viewAction($person_id)
     {
         $person = $this->_getPerson($person_id);
@@ -148,12 +140,6 @@ final class PersonController extends AbstractController
             ));
     }
 
-    /**
-     * @Route(
-     *  name="chill_person_general_edit",
-     *  path="/{_locale}/person/{person_id}/general/edit"
-     * )
-     */
     public function editAction($person_id)
     {
         $person = $this->_getPerson($person_id);
@@ -177,13 +163,7 @@ final class PersonController extends AbstractController
             array('person' => $person, 'form' => $form->createView()));
     }
 
-    /**
+    public function updateAction($person_id, Request $request)
-     * @Route(
-     *  name="chill_person_general_update",
-     *  path="/{_locale}/person/{person_id}/general/update"
-     * )
-     */
-    public function updateAction($person_id, Request $request, TranslatorInterface $translator)
     {
         $person = $this->_getPerson($person_id);
 
@@ -212,7 +192,7 @@ final class PersonController extends AbstractController
 
             $this->get('session')->getFlashBag()
                     ->add('success',
-                            $translator
+                            $this->get('translator')
                             ->trans('The person data has been updated')
                             );
 
@@ -226,12 +206,6 @@ final class PersonController extends AbstractController
         }
     }
 
-    /**
-     * @Route(
-     *  name="chill_person_new",
-     *  path="/{_locale}/person/new"
-     * )
-     */
     public function newAction()
     {
         // this is a dummy default center.
@@ -316,13 +290,7 @@ final class PersonController extends AbstractController
         return $errors;
     }
 
-    /**
+    public function reviewAction(Request $request)
-     * @Route(
-     *  name="chill_person_review",
-     *  path="/{_locale}/person/review"
-     * )
-     */
-    public function reviewAction(Request $request, PersonNotDuplicateRepository $personNotDuplicateRepository)
     {
         if ($request->getMethod() !== 'POST') {
             $r = new Response("You must send something to review the creation of a new Person");
@@ -374,7 +342,8 @@ final class PersonController extends AbstractController
 
         $this->em->persist($person);
 
-        $alternatePersons = $this->similarPersonMatcher->matchPerson($person, $personNotDuplicateRepository);
+        $alternatePersons = $this->similarPersonMatcher
+            ->matchPerson($person);
 
         if (count($alternatePersons) === 0) {
             return $this->forward('ChillPersonBundle:Person:create');
@@ -398,12 +367,6 @@ final class PersonController extends AbstractController
                 'form' => $form->createView()));
     }
 
-    /**
-     * @Route(
-     *  name="chill_person_create",
-     *  path="/{_locale}/person/create"
-     * )
-     */
     public function createAction(Request $request)
     {
 

src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php

@@ -12,17 +12,16 @@ use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Search\SimilarPersonMatcher;
 use http\Exception\InvalidArgumentException;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Translation\TranslatorInterface;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\EventBundle\Entity\Participation;
-use Chill\PersonBundle\Repository\PersonNotDuplicateRepository;
 use Chill\TaskBundle\Entity\SingleTask;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
-class PersonDuplicateController extends AbstractController
+class PersonDuplicateController extends Controller
 {
     /**
      * @var \Chill\PersonBundle\Search\SimilarPersonMatcher
@@ -63,13 +62,7 @@ class PersonDuplicateController extends AbstractController
         $this->eventDispatcher = $eventDispatcher;
     }
 
-    /**
+    public function viewAction($person_id)
-     * @Route(
-     *  name="chill_person_duplicate_view",
-     *  path="/{_locale}/person/{person_id}/duplicate/view"
-     * )
-     */
-    public function viewAction($person_id, PersonNotDuplicateRepository $personNotDuplicateRepository)
     {
         $person = $this->_getPerson($person_id);
         if ($person === null) {
@@ -83,7 +76,8 @@ class PersonDuplicateController extends AbstractController
         $duplicatePersons = $this->similarPersonMatcher->
             matchPerson($person, 0.5, SimilarPersonMatcher::SIMILAR_SEARCH_ORDER_BY_ALPHABETICAL);
 
-        $notDuplicatePersons = $personNotDuplicateRepository->findNotDuplicatePerson($person);
+        $notDuplicatePersons = $this->getDoctrine()->getRepository(PersonNotDuplicate::class)
+            ->findNotDuplicatePerson($person);
 
         return $this->render('ChillPersonBundle:PersonDuplicate:view.html.twig', [
             'person' => $person,
@@ -92,12 +86,6 @@ class PersonDuplicateController extends AbstractController
         ]);
     }
 
-    /**
-     * @Route(
-     *  name="chill_person_duplicate_confirm",
-     *  path="/{_locale}/person/{person1_id}/duplicate/{person2_id}/confirm"
-     * )
-     */
     public function confirmAction($person1_id, $person2_id, Request $request)
     {
         if ($person1_id === $person2_id) {
@@ -109,7 +97,7 @@ class PersonDuplicateController extends AbstractController
 
         $person1->counters = $this->_getCounters($person1_id);
         $person2->counters = $this->_getCounters($person2_id);
-
+        
         if ($person1 === null) {
             throw $this->createNotFoundException("Person with id $person1_id not"
                 . " found on this server");
@@ -155,12 +143,6 @@ class PersonDuplicateController extends AbstractController
         ]);
     }
 
-    /**
-     * @Route(
-     *  name="chill_person_duplicate_not_duplicate",
-     *  path="/{_locale}/person/{person1_id}/duplicate/{person2_id}/not-duplicate"
-     * )
-     */
     public function notDuplicateAction($person1_id, $person2_id)
     {
         [$person1, $person2] = $this->_getPersonsByPriority($person1_id, $person2_id);
@@ -184,12 +166,6 @@ class PersonDuplicateController extends AbstractController
         return $this->redirectToRoute('chill_person_duplicate_view', ['person_id' => $person1->getId()]);
     }
 
-    /**
-     * @Route(
-     *  name="chill_person_remove_duplicate_not_duplicate",
-     *  path="/{_locale}/person/{person1_id}/duplicate/{person2_id}/remove-not-duplicate"
-     * )
-     */
     public function removeNotDuplicateAction($person1_id, $person2_id)
     {
         [$person1, $person2] = $this->_getPersonsByPriority($person1_id, $person2_id);
@@ -208,12 +184,6 @@ class PersonDuplicateController extends AbstractController
         return $this->redirectToRoute('chill_person_duplicate_view', ['person_id' => $person1->getId()]);
     }
 
-    /**
-     * @Route(
-     *  name="chill_person_find_manually_duplicate",
-     *  path="/{_locale}/person/{person_id}/find-manually"
-     * )
-     */
     public function findManuallyDuplicateAction($person_id, Request $request)
     {
         $person = $this->_getPerson($person_id);
@@ -294,17 +264,17 @@ class PersonDuplicateController extends AbstractController
 
         return [$person1, $person2];
     }
-
+    
     private function _getCounters($id): ?array
     {
         $em = $this->getDoctrine()->getManager();
-
+        
         $nb_activity = $em->getRepository(Activity::class)->findBy(['person'=>$id]);
         $nb_document = $em->getRepository(PersonDocument::class)->findBy(['person'=>$id]);
         $nb_event = $em->getRepository(Participation::class)->findBy(['person'=>$id]);
         $nb_task = $em->getRepository(SingleTask::class)->countByParameters(['person'=>$id]);
         $person = $em->getRepository(Person::class)->findOneBy(['id'=>$id]);
-
+        
         return [
             'nb_activity' => count($nb_activity),
             'nb_document' => count($nb_document),

src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php

@@ -26,9 +26,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
 use Chill\MainBundle\Timeline\TimelineBuilder;
 use Chill\MainBundle\Pagination\PaginatorFactory;
-use Chill\MainBundle\Timeline\TimelineBuilderInterface;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * Class TimelinePersonController
@@ -38,24 +36,24 @@ use Symfony\Component\Routing\Annotation\Route;
  */
 class TimelinePersonController extends AbstractController
 {
-
+    
     /**
      * @var EventDispatcherInterface
      */
     protected $eventDispatcher;
-
+    
     /**
      *
-     * @var TimelineBuilderInterface
+     * @var TimelineBuilder
      */
     protected $timelineBuilder;
-
+    
     /**
      *
      * @var PaginatorFactory
      */
     protected $paginatorFactory;
-
+    
     /**
      * TimelinePersonController constructor.
      *
@@ -63,28 +61,15 @@ class TimelinePersonController extends AbstractController
      */
     public function __construct(
         EventDispatcherInterface $eventDispatcher,
-        TimelineBuilderInterface $timelineBuilder,
+        TimelineBuilder $timelineBuilder,
         PaginatorFactory $paginatorFactory
     ) {
         $this->eventDispatcher = $eventDispatcher;
         $this->timelineBuilder = $timelineBuilder;
         $this->paginatorFactory = $paginatorFactory;
     }
-
+    
-    /**
+    
-     * @Route(
-     *  name="chill_person_timeline",
-     *  path="/{_locale}/person/{person_id}/timeline",
-     *  options={
-     *      menus={
-     *          person={
-     *              order="60",
-     *              label="Timeline"
-     *          }
-     *      }
-     *  }
-     * )
-     */
     public function personAction(Request $request, $person_id)
     {
         $person = $this->getDoctrine()
@@ -94,22 +79,22 @@ class TimelinePersonController extends AbstractController
         if ($person === NULL) {
             throw $this->createNotFoundException();
         }
-
+        
         $this->denyAccessUnlessGranted(PersonVoter::SEE, $person);
-
+        
-        $nbItems = $this->timelineBuilder->countItems('person',
+        $nbItems = $this->timelineBuilder->countItems('person', 
             [ 'person' => $person ]
             );
-
+        
         $paginator = $this->paginatorFactory->create($nbItems);
-
+        
         $event = new PrivacyEvent($person, array('action' => 'timeline'));
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-
+        
         return $this->render('ChillPersonBundle:Timeline:index.html.twig', array
             (
                 'timeline' => $this->timelineBuilder->getTimelineHTML(
-                    'person',
+                    'person', 
                     array('person' => $person),
                     $paginator->getCurrentPage()->getFirstItemNumber(),
                     $paginator->getItemsPerPage()

src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php

@@ -60,14 +60,20 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         $container->setParameter('chill_person.allow_multiple_simultaneous_accompanying_periods',
                 $config['allow_multiple_simultaneous_accompanying_periods']);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(dirname(__DIR__, 2).'/config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
         $loader->load('services/widgets.yaml');
         $loader->load('services/exports.yaml');
         $loader->load('services/fixtures.yaml');
+        $loader->load('services/controller.yaml');
         $loader->load('services/search.yaml');
+        $loader->load('services/menu.yaml');
+        $loader->load('services/privacyEvent.yaml');
         $loader->load('services/command.yaml');
+        $loader->load('services/actions.yaml');
         $loader->load('services/form.yaml');
+        $loader->load('services/repository.yaml');
+        $loader->load('services/templating.yaml');
         $loader->load('services/alt_names.yaml');
         $loader->load('services/serializer.yaml');
 
@@ -179,7 +185,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
          $container->prependExtensionConfig('chill_main', array(
            'routing' => array(
               'resources' => array(
-                    dirname(__DIR__, 2) . '/config/routes.yaml'
+                 '@ChillPersonBundle/config/routes.yaml'
               )
            )
         ));

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -37,43 +37,43 @@ use Chill\MainBundle\Entity\User;
 /**
  * AccompanyingPeriod Class
  *
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass="Chill\PersonBundle\Repository\AccompanyingPeriodRepository")
  * @ORM\Table(name="chill_person_accompanying_period")
  */
 class AccompanyingPeriod
 {
     /**
      * Mark an accompanying period as "occasional"
-     *
+     * 
      * used in INTENSITY
      */
     public const INTENSITY_OCCASIONAL = 'occasional';
-
+    
     /**
      * Mark an accompanying period as "regular"
-     *
+     * 
      * used in INTENSITY
      */
     public const INTENSITY_REGULAR = 'regular';
-
+    
     public const INTENSITIES = [self::INTENSITY_OCCASIONAL, self::INTENSITY_REGULAR];
-
+    
     /**
      * Mark an accompanying period as "draft".
-     *
+     * 
-     * This means that the accompanying period is not yet
+     * This means that the accompanying period is not yet 
      * confirmed by the creator
      */
     public const STEP_DRAFT = 'DRAFT';
-
+    
     /**
      * Mark an accompanying period as "confirmed".
-     *
+     * 
-     * This means that the accompanying period **is**
+     * This means that the accompanying period **is** 
      * confirmed by the creator
      */
     public const STEP_CONFIRMED = 'CONFIRMED';
-
+    
     /**
      * @var integer
      *
@@ -148,7 +148,7 @@ class AccompanyingPeriod
      * @ORM\Column(type="string", length=32, nullable=true)
      */
     private $step = self::STEP_DRAFT;
-
+    
     /**
      * @ORM\ManyToOne(targetEntity=Origin::class)
      * @ORM\JoinColumn(nullable=true)

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php

@@ -4,6 +4,7 @@ namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\SocialWork\Result;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
@@ -12,7 +13,7 @@ use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass=AccompanyingPeriodWorkRepository::class)
  * @ORM\Table(name="chill_person_accompanying_period_work")
  */
  class AccompanyingPeriodWork

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php

@@ -4,12 +4,13 @@ namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\PersonBundle\Entity\SocialWork\Goal;
 use Chill\PersonBundle\Entity\SocialWork\Result;
+use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkGoalRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass=AccompanyingPeriodWorkGoalRepository::class)
  * @ORM\Table(name="chill_person_accompanying_period_work_goal")
  */
 class AccompanyingPeriodWorkGoal

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php

@@ -29,7 +29,8 @@ use Doctrine\Common\Collections\ArrayCollection;
 /**
  * ClosingMotive give an explanation why we closed the Accompanying period
  *
- * @ORM\Entity
+ * @ORM\Entity(
+ *     repositoryClass="Chill\PersonBundle\Repository\AccompanyingPeriod\ClosingMotiveRepository")
  * @ORM\Table(name="chill_person_accompanying_period_closingmotive")
  */
 class ClosingMotive
@@ -49,14 +50,14 @@ class ClosingMotive
      * @ORM\Column(type="json")
      */
     private $name;
-
+    
     /**
      * @var boolean
      *
      * @ORM\Column(type="boolean")
      */
     private $active = true;
-
+    
     /**
      * @var self
      *
@@ -65,7 +66,7 @@ class ClosingMotive
      *     inversedBy="children")
      */
     private $parent = null;
-
+    
     /**
      * Child Accompanying periods
      * @var Collection
@@ -75,15 +76,15 @@ class ClosingMotive
      *     mappedBy="parent")
      */
     private $children;
-
+    
     /**
      * @var float
      *
      * @ORM\Column(type="float")
      */
     private $ordering = 0.0;
-
+    
-
+    
     /**
      * ClosingMotive constructor.
      */
@@ -91,7 +92,7 @@ class ClosingMotive
     {
         $this->children = new ArrayCollection();
     }
-
+    
     /**
      * Get id
      *
@@ -125,7 +126,7 @@ class ClosingMotive
     {
         return $this->name;
     }
-
+    
     /**
      * @return bool
      */
@@ -133,7 +134,7 @@ class ClosingMotive
     {
         return $this->active;
     }
-
+    
     /**
      * @param bool $active
      * @return $this
@@ -141,16 +142,16 @@ class ClosingMotive
     public function setActive(bool $active)
     {
         $this->active = $active;
-
+        
         if ($this->active === FALSE) {
             foreach ($this->getChildren() as $child) {
                 $child->setActive(FALSE);
             }
         }
-
+        
         return $this;
     }
-
+    
     /**
      * @return ClosingMotive
      */
@@ -158,7 +159,7 @@ class ClosingMotive
     {
         return $this->parent;
     }
-
+    
     /**
      * @return Collection
      */
@@ -166,7 +167,7 @@ class ClosingMotive
     {
         return $this->children;
     }
-
+    
     /**
      * @param ClosingMotive|null $parent
      * @return ClosingMotive
@@ -174,14 +175,14 @@ class ClosingMotive
     public function setParent(?ClosingMotive $parent): ClosingMotive
     {
         $this->parent = $parent;
-
+        
         if (NULL !== $parent) {
             //$parent->addChildren($this);
         }
-
+        
         return $this;
     }
-
+    
     /**
      * @param Collection $children
      * @return ClosingMotive
@@ -189,10 +190,10 @@ class ClosingMotive
     public function setChildren(Collection $children): ClosingMotive
     {
         $this->children = $children;
-
+        
         return $this;
     }
-
+    
     /**
      * @param ClosingMotive $child
      * @return ClosingMotive
@@ -202,13 +203,13 @@ class ClosingMotive
         if ($this->children->contains($child)) {
             return $this;
         }
-
+        
         $this->children->add($child);
         $child->setParent($this);
-
+        
         return $this;
     }
-
+    
     /**
      * @param ClosingMotive $child
      * @return ClosingMotive
@@ -218,10 +219,10 @@ class ClosingMotive
         if ($this->children->removeElement($child)) {
             $child->setParent(null);
         }
-
+        
         return $this;
     }
-
+    
     /**
      * @return float
      */
@@ -229,7 +230,7 @@ class ClosingMotive
     {
         return $this->ordering;
     }
-
+    
     /**
      * @param float $ordering
      * @return $this
@@ -237,10 +238,10 @@ class ClosingMotive
     public function setOrdering(float $ordering)
     {
         $this->ordering = $ordering;
-
+        
         return $this;
     }
-
+    
     /**
      * @return bool
      */
@@ -248,7 +249,7 @@ class ClosingMotive
     {
         return $this->parent !== null;
     }
-
+    
     /**
      * @return bool
      */
@@ -256,7 +257,7 @@ class ClosingMotive
     {
         return $this->children->count() > 0;
     }
-
+    
     /**
      * @return bool
      */
@@ -264,7 +265,7 @@ class ClosingMotive
     {
         return $this->children->count() === 0;
     }
-
+    
     /**
      * @return bool
      */

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php

@@ -22,12 +22,13 @@
 
 namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
+use Chill\PersonBundle\Repository\AccompanyingPeriod\CommentRepository;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass=CommentRepository::class)
  * @ORM\Table(name="chill_person_accompanying_period_comment")
  */
 class Comment

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php

@@ -22,10 +22,11 @@
 
 namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
+use Chill\PersonBundle\Entity\AccompanyingPeriod\OriginRepository;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass=OriginRepository::class)
  * @ORM\Table(name="chill_person_accompanying_period_origin")
  */
 class Origin

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Resource.php

@@ -22,6 +22,7 @@
 
 namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
+use Chill\PersonBundle\Repository\AccompanyingPeriod\ResourceRepository;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\Comment;
 use Chill\PersonBundle\Entity\Person;
@@ -29,7 +30,7 @@ use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass=ResourceRepository::class)
  * @ORM\Table(name="chill_person_accompanying_period_resource")
  */
 class Resource
@@ -120,7 +121,7 @@ class Resource
 
         return $this;
     }
-
+    
     /**
      * @return Person|ThirdParty
      */

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php

@@ -22,6 +22,7 @@
 
 namespace Chill\PersonBundle\Entity;
 
+use Chill\PersonBundle\Repository\AccompanyingPeriodParticipationRepository;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\Mapping as ORM;
@@ -30,7 +31,7 @@ use Doctrine\ORM\Mapping as ORM;
  * AccompanyingPeriodParticipation Class
  *
  * @package Chill\PersonBundle\Entity
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass=AccompanyingPeriodParticipationRepository::class)
  * @ORM\Table(name="chill_person_accompanying_period_participation")
  */
 class AccompanyingPeriodParticipation
@@ -41,83 +42,83 @@ class AccompanyingPeriodParticipation
      * @ORM\Column(type="integer")
      */
     private $id;
-
+    
     /**
      * @ORM\ManyToOne(targetEntity=Person::class, inversedBy="accompanyingPeriodParticipations")
      * @ORM\JoinColumn(name="person_id", referencedColumnName="id", nullable=false)
      */
     private $person;
-
+    
     /**
      * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class, inversedBy="participations", cascade={"persist"})
      * @ORM\JoinColumn(name="accompanyingperiod_id", referencedColumnName="id", nullable=false)
      */
     private $accompanyingPeriod;
-
+    
     /**
      * @ORM\Column(type="date", nullable=false)
      */
     private $startDate;
-
+    
     /**
      * @ORM\Column(type="date", nullable=true)
      */
     private $endDate = null;
-
+    
     public function __construct(AccompanyingPeriod $accompanyingPeriod, Person $person)
     {
         $this->startDate = new \DateTimeImmutable('now');
         $this->accompanyingPeriod = $accompanyingPeriod;
         $this->person = $person;
     }
-
+    
     public function getId(): ?int
     {
         return $this->id;
     }
-
+    
     public function getPerson(): ?Person
     {
         return $this->person;
     }
-
+    
     public function setPerson(?Person $person): self
     {
         $this->person = $person;
-
+        
         return $this;
     }
-
+    
     public function getAccompanyingPeriod(): ?AccompanyingPeriod
     {
         return $this->accompanyingPeriod;
     }
-
+    
     public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
     {
         $this->accompanyingPeriod = $accompanyingPeriod;
-
+        
         return $this;
     }
-
+    
     public function getStartDate(): ?\DateTimeInterface
     {
         return $this->startDate;
     }
-
+    
     /*
      * public function setStartDate(\DateTimeInterface $startDate): self { $this->startDate = $startDate; return $this; }
      */
-
+    
     public function getEndDate(): ?\DateTimeInterface
     {
         return $this->endDate;
     }
-
+    
     public function setEndDate(?\DateTimeInterface $endDate): self
     {
         $this->endDate = $endDate;
-
+        
         return $this;
     }
 }

src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php

@@ -25,7 +25,7 @@ use Doctrine\ORM\Mapping as ORM;
 /**
  * MaritalStatus
  *
- * @ORM\Entity
+ * @ORM\Entity()
  * @ORM\Table(name="chill_person_marital_status")
  * @ORM\HasLifecycleCallbacks()
  */
@@ -48,7 +48,7 @@ class MaritalStatus
     /**
      * Get id
      *
-     * @return string
+     * @return string 
      */
     public function getId()
     {
@@ -57,7 +57,7 @@ class MaritalStatus
 
     /**
      * Set id
-     *
+     * 
      * @param string $id
      * @return MaritalStatus
      */
@@ -76,17 +76,17 @@ class MaritalStatus
     public function setName($name)
     {
         $this->name = $name;
-
+    
         return $this;
     }
 
     /**
      * Get name
      *
-     * @return string array
+     * @return string array 
      */
     public function getName()
     {
         return $this->name;
-    }
+    } 
 }

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -22,23 +22,21 @@ namespace Chill\PersonBundle\Entity;
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-use ArrayIterator;
+use Doctrine\ORM\Mapping as ORM;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Criteria;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Country;
 use Chill\PersonBundle\Entity\MaritalStatus;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\Address;
-use DateTime;
-use Doctrine\ORM\Mapping as ORM;
-use Doctrine\Common\Collections\Collection;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Criteria;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
  * Person Class
  *
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass="Chill\PersonBundle\Repository\PersonRepository")
  * @ORM\Table(name="chill_person_person",
  *     indexes={@ORM\Index(
  *          name="person_names",
@@ -287,7 +285,7 @@ class Person implements HasCenterInterface
 
         $this->open(new AccompanyingPeriod($opening));
     }
-
+    
     /**
      * This private function scan accompanyingPeriodParticipations Collection,
      * searching for a given AccompanyingPeriod
@@ -299,10 +297,10 @@ class Person implements HasCenterInterface
             if ($accompanyingPeriod === $participation->getAccompanyingPeriod()) {
                 return $participation;
         }}
-
+        
         return null;
     }
-
+    
     /**
      * This public function is the same but return only true or false
      */
@@ -310,7 +308,7 @@ class Person implements HasCenterInterface
     {
         return ($this->participationsContainAccompanyingPeriod($accompanyingPeriod)) ? false : true;
     }
-
+    
     /**
      * Add AccompanyingPeriodParticipation
      *
@@ -320,7 +318,7 @@ class Person implements HasCenterInterface
     {
         $participation = new AccompanyingPeriodParticipation($accompanyingPeriod, $this);
         $this->accompanyingPeriodParticipations->add($participation);
-
+        
         return $this;
     }
 
@@ -330,7 +328,7 @@ class Person implements HasCenterInterface
     public function removeAccompanyingPeriod(AccompanyingPeriod $accompanyingPeriod) : void
     {
         $participation = $this->participationsContainAccompanyingPeriod($accompanyingPeriod);
-
+        
         if (! null === $participation) {
             $participation->setEndDate(\DateTimeImmutable::class);
             $this->accompanyingPeriodParticipations->removeElement($participation);
@@ -408,7 +406,7 @@ class Person implements HasCenterInterface
         }
         return $accompanyingPeriods;
     }
-
+    
     /**
      * Get AccompanyingPeriodParticipations Collection
      */
@@ -1010,28 +1008,32 @@ class Person implements HasCenterInterface
     /**
      * By default, the addresses are ordered by date, descending (the most
      * recent first)
+     *
+     * @return \Chill\MainBundle\Entity\Address[]
      */
-    public function getAddresses(): Collection
+    public function getAddresses()
     {
         return $this->addresses;
     }
 
-    public function getLastAddress(DateTime $from = null)
+    /**
+     * @param \DateTime|null $date
+     * @return null
+     */
+    public function getLastAddress(\DateTime $date = null)
     {
-        $from ??= new DateTime('now');
+        if ($date === null) {
+            $date = new \DateTime('now');
+        }
 
-        /** @var ArrayIterator $addressesIterator */
+        $addresses = $this->getAddresses();
-        $addressesIterator = $this->getAddresses()
-            ->filter(static fn (Address $address): bool => $address->getValidFrom() <= $from)
-            ->getIterator();
 
-        $addressesIterator->uasort(
+        if ($addresses == null) {
-            static fn (Address $left, Address $right): int => $right->getValidFrom() <=> $left->getValidFrom()
-        );
 
-        return [] === ($addresses = iterator_to_array($addressesIterator)) ?
+            return null;
-            null :
+        }
-            current($addresses);
+
+        return $addresses->first();
     }
 
     /**
@@ -1140,12 +1142,12 @@ class Person implements HasCenterInterface
 
         return true;
     }
-
+    
     public function getFullnameCanonical() : string
     {
         return $this->fullnameCanonical;
     }
-
+    
     public function setFullnameCanonical($fullnameCanonical) : Person
     {
         $this->fullnameCanonical = $fullnameCanonical;

src/Bundle/ChillPersonBundle/Entity/PersonAltName.php

@@ -8,7 +8,7 @@ use Doctrine\ORM\Mapping as ORM;
  * PersonAltName
  *
  * @ORM\Table(name="chill_person_alt_name")
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass="Chill\PersonBundle\Repository\PersonAltNameRepository")
  */
 class PersonAltName
 {
@@ -34,7 +34,7 @@ class PersonAltName
      * @ORM\Column(name="label", type="text")
      */
     private $label;
-
+    
     /**
      * @var Person
      *
@@ -45,7 +45,7 @@ class PersonAltName
      */
     private $person;
 
-
+    
     /**
      * Get id.
      *
@@ -103,7 +103,7 @@ class PersonAltName
     {
         return $this->label;
     }
-
+    
     /**
      * @return Person
      */
@@ -111,7 +111,7 @@ class PersonAltName
     {
         return $this->person;
     }
-
+    
     /**
      * @param Person|null $person
      * @return $this
@@ -119,7 +119,7 @@ class PersonAltName
     public function setPerson(?Person $person = null)
     {
         $this->person = $person;
-
+        
         return $this;
     }
 }

src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php

@@ -9,7 +9,7 @@ use Chill\MainBundle\Entity\User;
  * PersonNotDuplicate
  *
  * @ORM\Table(name="chill_person_not_duplicate")
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass="Chill\PersonBundle\Repository\PersonNotDuplicateRepository")
  */
 class PersonNotDuplicate
 {

src/Bundle/ChillPersonBundle/Entity/PersonPhone.php

@@ -8,7 +8,7 @@ use Doctrine\ORM\Mapping as ORM;
 /**
  * Person Phones
  *
- * @ORM\Entity
+ * @ORM\Entity()
  * @ORM\Table(name="chill_person_phone")
  */
 class PersonPhone
@@ -107,7 +107,7 @@ class PersonPhone
     {
         $this->date = $date;
     }
-
+    
     public function isEmpty(): bool
     {
         return empty($this->getDescription()) && empty($this->getPhonenumber());

src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php

@@ -2,10 +2,11 @@
 
 namespace Chill\PersonBundle\Entity\SocialWork;
 
+use Chill\PersonBundle\Repository\SocialWork\EvaluationRepository;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass=EvaluationRepository::class)
  * @ORM\Table(name="chill_person_social_work_evaluation")
  */
 class Evaluation

src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php

@@ -2,12 +2,13 @@
 
 namespace Chill\PersonBundle\Entity\SocialWork;
 
+use Chill\PersonBundle\Repository\SocialWork\GoalRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass=GoalRepository::class)
  * @ORM\Table(name="chill_person_social_work_goal")
  */
 class Goal

src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php

@@ -4,12 +4,13 @@ namespace Chill\PersonBundle\Entity\SocialWork;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
+use Chill\PersonBundle\Repository\SocialWork\ResultRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass=ResultRepository::class)
  * @ORM\Table(name="chill_person_social_work_result")
  */
 class Result

src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php

@@ -2,12 +2,13 @@
 
 namespace Chill\PersonBundle\Entity\SocialWork;
 
+use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass=SocialActionRepository::class)
  * @ORM\Table(name="chill_person_social_action")
  */
 class SocialAction

src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php

@@ -1,12 +1,14 @@
 <?php
 namespace Chill\PersonBundle\Entity\SocialWork;
 
+
+use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass=SocialIssueRepository::class)
  * @ORM\Table(name="chill_person_social_issue")
  */
 class SocialIssue

src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Chill\PersonBundle\Form\Type;
+namespace Chill\PersonBundle\Form;
 
 use Chill\MainBundle\Entity\Center;
 use Symfony\Component\Form\AbstractType;
@@ -14,10 +14,12 @@ use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Chill\MainBundle\Form\Type\UserPickerType;
 use Symfony\Component\Security\Core\Role\Role;
 use Chill\PersonBundle\Form\Type\ClosingMotivePickerType;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+
 
 /**
  * Class AccompanyingPeriodType
+ *
+ * @package Chill\PersonBundle\Form
  */
 class AccompanyingPeriodType extends AbstractType
 {
@@ -31,11 +33,15 @@ class AccompanyingPeriodType extends AbstractType
      */
     protected $config = [];
 
-    public function __construct(ParameterBagInterface $parameterBag)
+    /**
+     *
+     * @param string[] $config configuration of visibility of some fields
+     */
+    public function __construct(array $config)
     {
-        $this->config = $parameterBag->get('chill_person.accompanying_period_fields');
+        $this->config = $config;
     }
-
+    
     /**
      * @param FormBuilderInterface $builder
      * @param array $options
@@ -52,12 +58,12 @@ class AccompanyingPeriodType extends AbstractType
                 ])
             ;
         }
-
+        
         // closingDate should be seen only if
         // period_action = close
         // OR ( period_action = update AND accompanying period is already closed )
         $accompanyingPeriod = $options['data'];
-
+        
         if (
               ($options['period_action'] === 'close')
               OR
@@ -65,16 +71,16 @@ class AccompanyingPeriodType extends AbstractType
               OR
               ($options['period_action'] === 'update' AND !$accompanyingPeriod->isOpen())
         ) {
-
+            
             $builder->add('closingDate', DateType::class, [
                 'required' => true,
                 'widget' => 'single_text',
                 'format' => 'dd-MM-yyyy'
             ]);
-
+            
             $builder->add('closingMotive', ClosingMotivePickerType::class);
         }
-
+    
         if ($this->config['user'] === 'visible') {
             $builder->add('user', UserPickerType::class, [
                 'center' => $options['center'],
@@ -104,7 +110,7 @@ class AccompanyingPeriodType extends AbstractType
             ->setAllowedTypes('center', Center::class)
             ;
     }
-
+    
     /**
      * @param FormView $view
      * @param FormInterface $form

src/Bundle/ChillPersonBundle/Form/Type/ClosingMotivePickerType.php

@@ -3,11 +3,13 @@
 namespace Chill\PersonBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
-use Chill\MainBundle\Templating\Entity\ChillEntityRenderExtensionInterface;
+use Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Symfony\Component\OptionsResolver\Options;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\ClosingMotiveRepository;
 
@@ -21,12 +23,12 @@ class ClosingMotivePickerType extends AbstractType
 {
 
     /**
-     * @var TranslatableStringHelperInterface
+     * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
 
     /**
-     * @var ChillEntityRenderExtensionInterface
+     * @var ChillEntityRenderExtension
      */
     protected $entityRenderExtension;
 
@@ -38,20 +40,20 @@ class ClosingMotivePickerType extends AbstractType
     /**
      * ClosingMotivePickerType constructor.
      *
-     * @param TranslatableStringHelperInterface $translatableStringHelper
+     * @param TranslatableStringHelper $translatableStringHelper
-     * @param ChillEntityRenderExtensionInterface $chillEntityRenderExtension
+     * @param ChillEntityRenderExtension $chillEntityRenderExtension
      * @param ClosingMotiveRepository $closingMotiveRepository
      */
     public function __construct(
-        TranslatableStringHelperInterface $translatableStringHelper,
+        TranslatableStringHelper $translatableStringHelper,
-        ChillEntityRenderExtensionInterface $chillEntityRenderExtension,
+        ChillEntityRenderExtension $chillEntityRenderExtension,
         ClosingMotiveRepository $closingMotiveRepository
     ) {
         $this->translatableStringHelper = $translatableStringHelper;
         $this->entityRenderExtension = $chillEntityRenderExtension;
         $this->repository = $closingMotiveRepository;
     }
-
+    
     /**
      * @return string
      */
@@ -59,7 +61,7 @@ class ClosingMotivePickerType extends AbstractType
     {
         return 'closing_motive';
     }
-
+    
     /**
      * @return null|string
      */
@@ -67,13 +69,13 @@ class ClosingMotivePickerType extends AbstractType
     {
         return EntityType::class;
     }
-
+    
     /**
      * @param OptionsResolver $resolver
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-
+        
         $resolver->setDefaults([
             'class' => ClosingMotive::class,
             'empty_data' => null,
@@ -83,7 +85,7 @@ class ClosingMotivePickerType extends AbstractType
             },
             'only_leaf' => true
         ]);
-
+        
         $resolver
             ->setAllowedTypes('only_leaf', 'bool')
             ->setNormalizer('choices', function (Options $options) {