fix person last address (from @loophp on old framagit repo)

See https://framagit.org/Chill-project/Chill-Person/-/merge_requests/13

.gitignore

@@ -1,8 +1,8 @@
 .composer/*
 composer.phar
 composer.lock
+
 docs/build/
-.php_cs.cache
 
 ###> symfony/framework-bundle ###
 /.env.local
@@ -19,4 +19,3 @@ docs/build/
 /phpunit.xml
 .phpunit.result.cache
 ###< phpunit/phpunit ###
-

.gitlab-ci.yml

@@ -30,10 +30,6 @@ variables:
   POSTGRES_PASSWORD: postgres
   # fetch the chill-app using git submodules
   GIT_SUBMODULE_STRATEGY: recursive
-  REDIS_HOST: redis
-  REDIS_PORT: 6379
-  REDIS_URL: redis://redis:6379
-
 
 # Run our tests
 test:

README.md

@@ -1,9 +0,0 @@
-# Chill framework
-
-Documentation of the Chill software.
-
-The online documentation can be found at http://docs.chill.social
-
-See the [`docs`][1] directory for more.
-
-[1]: docs/README.md

docs/source/development/timelines.rst

@@ -97,7 +97,7 @@ The has the following signature :
          * 
          * @param string $context
          * @param mixed[] $args the argument to the context.
-         * @return TimelineSingleQuery
+         * @return string[]
          * @throw  \LogicException if the context is not supported
          */
         public function fetchQuery($context, array $args);
@@ -163,16 +163,18 @@ The has the following signature :
 The `fetchQuery` function
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
-The fetchQuery function help to build the UNION query to gather events. This function should return an instance of :code:`TimelineSingleQuery`. For you convenience, this object may be build using an associative array with the following keys:
+The fetchQuery function help to build the UNION query to gather events. This function should return an associative array MUST have the following key :
 
 * `id` : the name of the id column
 * `type`: a string to indicate the type
 * `date`: the name of the datetime column, used to order entities by date
-* `FROM`: the FROM clause. May contains JOIN instructions
+* `FROM` (in capital) : the FROM clause. May contains JOIN instructions
-* `WHERE`: the WHERE clause;
-* `parameters`: the parameters to pass to the query
 
-The parameters should be replaced into the query by :code:`?`. They will be replaced into the query using prepared statements.
+Those key are optional:
+
+* `WHERE` (in capital) : the WHERE clause. 
+
+ Where relevant, the data must be quoted to avoid SQL injection.
 
 `$context` and `$args` are defined by the bundle which will call the timeline rendering. You may use them to build a different query depending on this context.
 
@@ -184,15 +186,6 @@ For instance, if the context is `'person'`, the args will be this array :
         'person' => $person //a \Chill\PersonBundle\Entity\Person entity
     );
 
-For the context :code:`center`, the args will be:
-
-.. code-block:: php
-
-    array(
-        'centers' => [ ]  // an array of \Chill\MainBundle\Entity\Center entities
-    );
-
-
 You should find in the bundle documentation which contexts are arguments the bundle defines.
 
 .. note::
@@ -206,12 +199,13 @@ Example of an implementation :
     namespace Chill\ReportBundle\Timeline;
 
     use Chill\MainBundle\Timeline\TimelineProviderInterface;
-    use Chill\MainBundle\Timeline\TimelineSingleQuery;
     use Doctrine\ORM\EntityManager;
 
     /**
      * Provide report for inclusion in timeline
      *
+     * @author Julien Fastré <julien.fastre@champs-libres.coop>
+     * @author Champs Libres <info@champs-libres.coop>
      */
     class TimelineReportProvider implements TimelineProviderInterface
     {
@@ -233,17 +227,16 @@ Example of an implementation :
                 
                 $metadata = $this->em->getClassMetadata('ChillReportBundle:Report');
                 
-                return TimelineSingleQuery::fromArray([
+                return array(
                    'id' => $metadata->getColumnName('id'),
                    'type' => 'report',
                    'date' => $metadata->getColumnName('date'),
                    'FROM' => $metadata->getTableName(),
-                   'WHERE' => sprintf('%s = ?',
+                   'WHERE' => sprintf('%s = %d',
                          $metadata
-                            ->getAssociationMapping('person')['joinColumns'][0]['name'])
+                            ->getAssociationMapping('person')['joinColumns'][0]['name'],
-                         )
+                         $args['person']->getId())
-                   'parameters' => [ $args['person']->getId() ]
+                );
-                ]);
             }
 
         //....

phpunit.xml.dist

@@ -18,11 +18,11 @@
        <testsuite name="MainBundle">
          <directory suffix="Test.php">src/Bundle/ChillMainBundle/Tests/</directory>
        </testsuite>
-       <!--
+
        <testsuite name="PersonBundle">
          <directory suffix="Test.php">src/Bundle/ChillPersonBundle/Tests/</directory>
         </testsuite>
-      -->
+
       </testsuites>
 
     <listeners>

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -38,7 +38,7 @@ use Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency;
  * Class Activity
  *
  * @package Chill\ActivityBundle\Entity
- * @ORM\Entity(repositoryClass="Chill\ActivityBundle\Repository\ActivityRepository")
+ * @ORM\Entity()
  * @ORM\Table(name="activity")
  * @ORM\HasLifecycleCallbacks()
  * @UserCircleConsistency(

src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php

@@ -1,169 +0,0 @@
-<?php
-
-/*
- * Chill is a software for social workers
- *
- * Copyright (C) 2021, Champs Libres Cooperative SCRLFS,
- * <http://www.champs-libres.coop>, <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\ActivityBundle\Repository;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\PersonBundle\Entity\Person;
-use Chill\ActivityBundle\Repository\ActivityRepository;
-use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
-use Chill\MainBundle\Entity\Scope;
-use Doctrine\ORM\QueryBuilder;
-use Doctrine\ORM\Query\Expr\Orx;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Role\Role;
-use Doctrine\ORM\EntityManagerInterface;
-
-
-final class ActivityACLAwareRepository 
-{
-    private AuthorizationHelper $authorizationHelper;
-
-    private TokenStorageInterface $tokenStorage;
-
-    private ActivityRepository $repository;
-
-    private EntityManagerInterface $em;
-
-    public function __construct(
-        AuthorizationHelper $authorizationHelper,
-        TokenStorageInterface $tokenStorage,
-        ActivityRepository $repository,
-        EntityManagerInterface $em
-    ) {
-        $this->authorizationHelper = $authorizationHelper;
-        $this->tokenStorage = $tokenStorage;
-        $this->repository = $repository;
-        $this->em = $em;
-    }
-
-    public function queryTimelineIndexer(string $context, array $args = []): array
-    {
-        $metadataActivity = $this->em->getClassMetadata(Activity::class);
-
-        $from = $this->getFromClauseCenter($args);
-        [$where, $parameters] = $this->getWhereClause($context, $args);
-
-        return [
-           'id' => $metadataActivity->getTableName()
-                .'.'.$metadataActivity->getColumnName('id'),
-           'type' => 'activity',
-           'date' => $metadataActivity->getTableName()
-                .'.'.$metadataActivity->getColumnName('date'),
-           'FROM' => $from,
-           'WHERE' => $where,
-           'parameters' => $parameters
-       ];
-    }
-
-    private function getFromClauseCenter(array $args): string
-    {
-        $metadataActivity = $this->em->getClassMetadata(Activity::class);
-        $metadataPerson = $this->em->getClassMetadata(Person::class);
-        $associationMapping = $metadataActivity->getAssociationMapping('person');
-        
-        return $metadataActivity->getTableName().' JOIN '
-            .$metadataPerson->getTableName().' ON '
-            .$metadataPerson->getTableName().'.'.
-                $associationMapping['joinColumns'][0]['referencedColumnName']
-            .' = '
-            .$associationMapping['joinColumns'][0]['name']
-            ;
-    }
-
-    private function getWhereClause(string $context, array $args): array
-    {
-        $where = '';
-        $parameters = [];
-        
-        $metadataActivity = $this->em->getClassMetadata(Activity::class);
-        $metadataPerson = $this->em->getClassMetadata(Person::class);
-        $activityToPerson = $metadataActivity->getAssociationMapping('person')['joinColumns'][0]['name'];
-        $activityToScope  = $metadataActivity->getAssociationMapping('scope')['joinColumns'][0]['name'];
-        $personToCenter = $metadataPerson->getAssociationMapping('center')['joinColumns'][0]['name'];
-
-
-        // acls:
-        $role = new Role(ActivityVoter::SEE);
-        $reachableCenters = $this->authorizationHelper->getReachableCenters($this->tokenStorage->getToken()->getUser(), 
-                $role);
-        
-        if (count($reachableCenters) === 0) {
-            // insert a dummy condition
-            return 'FALSE = TRUE';
-        }
-
-        if ($context === 'person') { 
-            // we start with activities having the person_id linked to person 
-            $where .= sprintf('%s = ? AND ', $activityToPerson);
-            $parameters[] = $person->getId();
-        }
-        
-        // we add acl (reachable center and scopes)
-        $where .= '('; // first loop for the for centers
-        $centersI = 0; // like centers#i
-        foreach ($reachableCenters as $center) {
-            // we pass if not in centers
-            if (!\in_array($center, $args['centers'])) {
-                continue;
-            }
-            // we get all the reachable scopes for this center
-            $reachableScopes = $this->authorizationHelper->getReachableScopes($this->tokenStorage->getToken()->getUser(), $role, $center);
-            // we get the ids for those scopes
-            $reachablesScopesId = array_map(
-                function(Scope $scope) { return $scope->getId(); }, 
-                $reachableScopes
-            );
-
-            // if not the first center
-            if ($centersI > 0) {
-                $where .= ') OR (';
-            }
-
-            // condition for the center
-            $where .= sprintf(' %s.%s = ? ', $metadataPerson->getTableName(), $personToCenter);
-            $parameters[] = $center->getId();
-
-            // begin loop for scopes
-            $where .= ' AND (';
-            $scopesI = 0; //like scope#i
-
-            foreach ($reachablesScopesId as $scopeId) {
-                if ($scopesI > 0) {
-                    $where .= ' OR ';
-                }
-                $where .= sprintf(' %s.%s = ? ', $metadataActivity->getTableName(), $activityToScope);
-                $parameters[] = $scopeId;
-                $scopesI ++;
-            }
-            // close loop for scopes
-            $where .= ') ';
-            $centersI++;
-        }
-        // close loop for centers
-        $where .= ')';
-        
-        return [$where, $parameters];
-    }
-
-}

src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php

@@ -1,42 +0,0 @@
-<?php
-
-/*
- * Chill is a software for social workers
- *
- * Copyright (C) 2021, Champs Libres Cooperative SCRLFS,
- * <http://www.champs-libres.coop>, <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\ActivityBundle\Repository;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
-
-/**
- * @method AccompanyingPeriodParticipation|null find($id, $lockMode = null, $lockVersion = null)
- * @method AccompanyingPeriodParticipation|null findOneBy(array $criteria, array $orderBy = null)
- * @method AccompanyingPeriodParticipation[]    findAll()
- * @method AccompanyingPeriodParticipation[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
- */
-class ActivityRepository extends ServiceEntityRepository
-{
-    public function __construct(ManagerRegistry $registry)
-    {
-        parent::__construct($registry, Activity::class);
-    }
-    
-}

src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig

@@ -1,11 +1,11 @@
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
 
 <div>
-  <h3>{{ activity.date|format_date('long') }}<span class="activity"> / {{ 'Activity'|trans }}</span>{% if 'person' != context %} / {{ activity.person|chill_entity_render_box({'addLink': true}) }}{% endif %}</h3>
+    <h3>{{ activity.date|format_date('long') }}<span class="activity"> / {{ 'Activity'|trans }}</span></h3>
     <div class="statement">
         <span class="statement">{{ '%user% has done an %activity_type%'|trans(
            {
-             '%user%' : activity.user,
+             '%user%' : user,
              '%activity_type%': activity.type.name|localize_translatable_string,
              '%date%' : activity.date|format_date('long') }
         ) }}</span>
@@ -29,13 +29,13 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_activity_activity_show', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="sc-button bt-view">
+            <a href="{{ path('chill_activity_activity_show', { 'person_id': person.id, 'id': activity.id} ) }}" class="sc-button bt-view">
                 {{ 'Show the activity'|trans }}
             </a>
         </li>
         {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
         <li>
-            <a href="{{ path('chill_activity_activity_edit', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="sc-button bt-edit">
+            <a href="{{ path('chill_activity_activity_edit', { 'person_id': person.id, 'id': activity.id} ) }}" class="sc-button bt-edit">
                 {{ 'Edit the activity'|trans }}
             </a>
         </li>

src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php

@@ -21,7 +21,6 @@
 namespace Chill\ActivityBundle\Timeline;
 
 use Chill\MainBundle\Timeline\TimelineProviderInterface;
-use Chill\ActivityBundle\Repository\ActivityACLAwareRepository;
 use Doctrine\ORM\EntityManager;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
@@ -29,13 +28,13 @@ use Symfony\Component\Security\Core\Role\Role;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Entity\Scope;
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\MainBundle\Timeline\TimelineSingleQuery;
 
 /**
  * Provide activity for inclusion in timeline
  *
-*/
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @author Champs Libres <info@champs-libres.coop>
+ */
 class TimelineActivityProvider implements TimelineProviderInterface
 {
     
@@ -56,10 +55,6 @@ class TimelineActivityProvider implements TimelineProviderInterface
      * @var \Chill\MainBundle\Entity\User 
      */
     protected $user;
-
-    protected ActivityACLAwareRepository $aclAwareRepository;
-
-    private const SUPPORTED_CONTEXTS = [ 'center', 'person'];
     
     /**
      * TimelineActivityProvider constructor.
@@ -71,13 +66,11 @@ class TimelineActivityProvider implements TimelineProviderInterface
     public function __construct(
         EntityManager $em,
         AuthorizationHelper $helper,
-        TokenStorageInterface $storage,
+        TokenStorageInterface $storage
-        ActivityACLAwareRepository $aclAwareRepository
     )
     {
         $this->em = $em;
         $this->helper = $helper;
-        $this->aclAwareRepository = $aclAwareRepository;
         
         if (!$storage->getToken()->getUser() instanceof \Chill\MainBundle\Entity\User)
         {
@@ -93,69 +86,67 @@ class TimelineActivityProvider implements TimelineProviderInterface
      */
     public function fetchQuery($context, array $args)
     {
-        if ('center' === $context) {
+        $this->checkContext($context);
-            return TimelineSingleQuery::fromArray($this->aclAwareRepository
-                ->queryTimelineIndexer($context, $args));
-        }
         
-        $metadataActivity = $this->em->getClassMetadata(Activity::class);
+        $metadataActivity = $this->em->getClassMetadata('ChillActivityBundle:Activity');
-
+        $metadataPerson = $this->em->getClassMetadata('ChillPersonBundle:Person');
-        [$where, $parameters] =  $this->getWhereClauseForPerson($args['person']);
         
-        return TimelineSingleQuery::fromArray([
+        return array(
            'id' => $metadataActivity->getTableName()
                 .'.'.$metadataActivity->getColumnName('id'),
            'type' => 'activity',
            'date' => $metadataActivity->getTableName()
                 .'.'.$metadataActivity->getColumnName('date'),
-           'FROM' => $this->getFromClausePerson($args['person']),
+           'FROM' => $this->getFromClause($metadataActivity, $metadataPerson),
-           'WHERE' => $where,
+           'WHERE' => $this->getWhereClause($metadataActivity, $metadataPerson,
-           'parameters' => $parameters
+                   $args['person'])
-       ]);
+        );
     }
     
-    private function getWhereClauseForPerson(Person $person)
+    private function getWhereClause(ClassMetadata $metadataActivity, 
+            ClassMetadata $metadataPerson, Person $person)
     {
-        $parameters = [];
-        $metadataActivity = $this->em->getClassMetadata(Activity::class);
-        $associationMapping = $metadataActivity->getAssociationMapping('person');
         $role = new Role('CHILL_ACTIVITY_SEE');
-        $reachableScopes =  $this->helper->getReachableScopes($this->user,
+        $reachableCenters = $this->helper->getReachableCenters($this->user, 
-            $role, $person->getCenter());
+                $role);
-        $whereClause = sprintf(' {activity.person_id} = ? AND {activity.scope_id} IN ({scopes_ids}) ');
+        $associationMapping = $metadataActivity->getAssociationMapping('person');
-        $scopes_ids = [];
+        
-
+        if (count($reachableCenters) === 0) {
-        // first parameter: activity.person_id 
+            return 'FALSE = TRUE';
-        $parameters[] = $person->getId();
-
-        // loop on reachable scopes 
-        foreach ($reachableScopes as $scope) {
-            if (\in_array($scope->getId(), $scopes_ids)) {
-                continue;
-            }
-            $scopes_ids[] = '?'; 
-            $parameters[] = $scope->getId();
         }
-
+        
-        return [
+        // we start with activities having the person_id linked to person 
-            \strtr(
+        // (currently only context "person" is supported)
-                $whereClause,
+        $whereClause = sprintf('%s = %d',
-                [
+                 $associationMapping['joinColumns'][0]['name'],
-                    '{activity.person_id}' => $associationMapping['joinColumns'][0]['name'],
+                 $person->getId());
-                    '{activity.scope_id}' => $metadataActivity->getTableName().'.'.
+        
+        // we add acl (reachable center and scopes)
+        $centerAndScopeLines = array();
+        foreach ($reachableCenters as $center) {
+            $reachablesScopesId = array_map(
+                    function(Scope $scope) { return $scope->getId(); },
+                    $this->helper->getReachableScopes($this->user, $role, 
+                        $person->getCenter())
+                );
+                    
+            $centerAndScopeLines[] = sprintf('(%s = %d AND %s IN (%s))',
+                    $metadataPerson->getTableName().'.'.
+                        $metadataPerson->getAssociationMapping('center')['joinColumns'][0]['name'],
+                    $center->getId(),
+                    $metadataActivity->getTableName().'.'.
                         $metadataActivity->getAssociationMapping('scope')['joinColumns'][0]['name'],
-                    '{scopes_ids}' => \implode(", ", $scopes_ids)
+                    implode(',', $reachablesScopesId));
-,
+            
-                ]
+        }
-            ),
+        $whereClause .= ' AND ('.implode(' OR ', $centerAndScopeLines).')';
-            $parameters
+        
-        ];
+        return $whereClause;
     }
     
-    private function getFromClausePerson()
+    private function getFromClause(ClassMetadata $metadataActivity,
+            ClassMetadata $metadataPerson)
     {
-        $metadataActivity = $this->em->getClassMetadata(Activity::class);
-        $metadataPerson = $this->em->getClassMetadata(Person::class);
         $associationMapping = $metadataActivity->getAssociationMapping('person');
         
         return $metadataActivity->getTableName().' JOIN '
@@ -166,14 +157,14 @@ class TimelineActivityProvider implements TimelineProviderInterface
             .$associationMapping['joinColumns'][0]['name']
             ;
     }
-    
+
     /**
      * 
      * {@inheritDoc}
      */
     public function getEntities(array $ids)
     {
-        $activities = $this->em->getRepository(Activity::class)
+        $activities = $this->em->getRepository('ChillActivityBundle:Activity')
               ->findBy(array('id' => $ids));
         
         $result = array();
@@ -192,13 +183,14 @@ class TimelineActivityProvider implements TimelineProviderInterface
     {
         $this->checkContext($context);
         
-        return [
+        return array(
            'template' => 'ChillActivityBundle:Timeline:activity_person_context.html.twig',
-           'template_data' => [
+           'template_data' => array(
               'activity' => $entity,
-              'context' => $context
+              'person' => $args['person'],
-            ]
+              'user' => $entity->getUser()
-        ];
+           )
+        );
     }
 
     /**
@@ -218,7 +210,7 @@ class TimelineActivityProvider implements TimelineProviderInterface
      */
     private function checkContext($context)
     {
-        if (FALSE === \in_array($context, self::SUPPORTED_CONTEXTS)) {
+        if ($context !== 'person') {
             throw new \LogicException("The context '$context' is not "
                   . "supported. Currently only 'person' is supported");
         }

src/Bundle/ChillActivityBundle/config/services.yaml

@@ -22,8 +22,6 @@ services:
             - '@doctrine.orm.entity_manager'
             - '@chill.main.security.authorization.helper'
             - '@security.token_storage'
-            - '@Chill\ActivityBundle\Repository\ActivityACLAwareRepository'
         public: true
         tags:
             - { name: chill.timeline, context: 'person' }
-            - { name: chill.timeline, context: 'center' }

src/Bundle/ChillActivityBundle/config/services/repositories.yaml

@@ -1,32 +1,18 @@
----
 services:
     chill_activity.repository.activity_type:
         class: Doctrine\ORM\EntityRepository
         factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments:
             - 'Chill\ActivityBundle\Entity\ActivityType'
-
+            
     chill_activity.repository.reason:
         class: Doctrine\ORM\EntityRepository
         factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments:
             - 'Chill\ActivityBundle\Entity\ActivityReason'
-
+            
     chill_activity.repository.reason_category:
         class: Doctrine\ORM\EntityRepository
         factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments:
             - 'Chill\ActivityBundle\Entity\ActivityReasonCategory'
-
-    Chill\ActivityBundle\Repository\ActivityRepository:
-        tags: [doctrine.repository_service]
-        arguments:
-            - '@Doctrine\Persistence\ManagerRegistry'
-
-    Chill\ActivityBundle\Repository\ActivityACLAwareRepository:
-        arguments:
-            $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
-            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
-            $repository: '@Chill\ActivityBundle\Repository\ActivityRepository'
-            $em: '@Doctrine\ORM\EntityManagerInterface'
-

src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php

@@ -22,12 +22,13 @@ class ChoiceWithOtherType extends AbstractType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
+
         //add an 'other' entry in choices array
         $options['choices'][$this->otherValueLabel] = '_other';
         //ChoiceWithOther must always be expanded
         $options['expanded'] = true;
         // adding a default value for choice
-        $options['empty_data'] = $options['multiple'] ? [] : null;
+        $options['empty_data'] = null;
 
         $builder
             ->add('_other', TextType::class, array('required' => false))

src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php

@@ -23,7 +23,6 @@ namespace Chill\EventBundle\Timeline;
 use Chill\EventBundle\Entity\Event;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Timeline\TimelineProviderInterface;
-use Chill\MainBundle\Timeline\TimelineSingleQuery;
 use Doctrine\ORM\EntityManager;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
@@ -89,14 +88,13 @@ class TimelineEventProvider implements TimelineProviderInterface
         $metadataParticipation = $this->em->getClassMetadata('ChillEventBundle:Participation');
         $metadataPerson = $this->em->getClassMetadata('ChillPersonBundle:Person');
         
-        $query = TimelineSingleQuery::fromArray([
+        $query = array(
             'id' => $metadataEvent->getTableName().'.'.$metadataEvent->getColumnName('id'),
             'type' => 'event',
             'date' => $metadataEvent->getTableName().'.'.$metadataEvent->getColumnName('date'),
             'FROM' => $this->getFromClause($metadataEvent, $metadataParticipation, $metadataPerson),
-            'WHERE' => $this->getWhereClause($metadataEvent, $metadataParticipation, $metadataPerson, $args['person']),
+            'WHERE' => $this->getWhereClause($metadataEvent, $metadataParticipation, $metadataPerson, $args['person'])
-            'parameters' => []
+        );
-        ]);
         
         return $query;
     }
@@ -240,4 +238,4 @@ class TimelineEventProvider implements TimelineProviderInterface
         );
     }
     
-}
+}

src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php

@@ -1,91 +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\Controller;
-
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Request;
-use Chill\MainBundle\Timeline\TimelineBuilder;
-use Chill\MainBundle\Pagination\PaginatorFactory;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Security\Core\Security;
-
-class TimelineCenterController extends AbstractController
-{
-    
-    protected TimelineBuilder $timelineBuilder;
-    
-    protected PaginatorFactory $paginatorFactory;
-
-    private Security $security;
-    
-    public function __construct(
-        TimelineBuilder $timelineBuilder,
-        PaginatorFactory $paginatorFactory,
-        Security $security
-    ) {
-        $this->timelineBuilder = $timelineBuilder;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->security = $security;
-    }
-
-    /**
-     * @Route("/{_locale}/center/timeline",
-     *    name="chill_center_timeline",
-     *    methods={"GET"}
-     *  )
-     */ 
-    public function centerAction(Request $request)
-    {
-        // collect reachable center for each group
-        $user = $this->security->getUser();
-        $centers = [];
-        foreach ($user->getGroupCenters() as $group) {
-            $centers[] = $group->getCenter();
-        }
-
-        if (0 === count($centers)) {
-            throw $this->createNotFoundException();
-        }
-        
-        $nbItems = $this->timelineBuilder->countItems('center', 
-            [ 'centers' => $centers ]
-            );
-        
-        $paginator = $this->paginatorFactory->create($nbItems);
-        
-        return $this->render('@ChillMain/Timeline/index.html.twig', array
-            (
-                'timeline' => $this->timelineBuilder->getTimelineHTML(
-                    'center', 
-                    [ 'centers' => $centers ],
-                    $paginator->getCurrentPage()->getFirstItemNumber(),
-                    $paginator->getItemsPerPage()
-                    ),
-                'nb_items' => $nbItems,
-                'paginator' => $paginator
-            )
-        );
-    }
-}

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/Resources/views/Timeline/chain_timelines.html.twig

@@ -1,7 +0,0 @@
-<div class="timeline">
-    {% for result in results %}
-        <div class="timeline-item {% if loop.index0 is even %}even{% else %}odd{% endif %}">
-            {% include result.template with result.template_data %}
-        </div>
-    {% endfor %}
-</div>

src/Bundle/ChillMainBundle/Resources/views/Timeline/index.html.twig

@@ -1,15 +1,7 @@
-{% extends "@ChillMain/layout.html.twig"  %}
+<div class="timeline">
-
+    {% for result in results %}
-{% block content %}
+        <div class="timeline-item {% if loop.index0 is even %}even{% else %}odd{% endif %}">
-  <div id="container content">
+            {% include result.template with result.template_data %}
-    <div class="grid-8 centered">
+        </div>
-      <h1>{{ 'Global timeline'|trans }}</h1>
+    {% endfor %}
-
+</div>
-      {{ timeline|raw }}
-      
-      {% if nb_items > paginator.getItemsPerPage %}
-      {{ chill_pagination(paginator) }}
-      {% endif %}
-    </div>
-  </div>
-  {% endblock content %}

src/Bundle/ChillMainBundle/Routing/MenuBuilder/SectionMenuBuilder.php

@@ -68,14 +68,6 @@ class SectionMenuBuilder implements LocalMenuBuilderInterface
                 'icons' => ['home'],
                 'order' => 0
             ]);
-
-        $menu->addChild($this->translator->trans('Global timeline'), [
-            'route' => 'chill_center_timeline',
-        ])
-            ->setExtras([
-                'order' => 10
-            ]
-        );
         
         if ($this->authorizationChecker->isGranted(ChillExportVoter::EXPORT)) {
             $menu->addChild($this->translator->trans('Export Menu'), [

src/Bundle/ChillMainBundle/Search/SearchProvider.php

@@ -204,7 +204,7 @@ class SearchProvider
     }
     
     public function getResultByName($pattern, $name, $start = 0, $limit = 50,
-          array $options = array(), $format = 'html') 
+          array $options = array(), $format) 
     {
         $terms = $this->parse($pattern);
         $search = $this->getByName($name);

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

@@ -110,6 +110,8 @@ class AuthorizationHelper
             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()) {
@@ -117,7 +119,8 @@ class AuthorizationHelper
                 //iterate on roleScopes
                 foreach($permissionGroup->getRoleScopes() as $roleScope) {
                     //check that the role allow to reach the required role
-                    if ($this->isRoleReached($attribute, $roleScope->getRole())) {
+                    if ($this->isRoleReached($role, 
+                          new Role($roleScope->getRole()))){
                         //if yes, we have a right on something...
                         // perform check on scope if necessary
                         if ($entity instanceof HasScopeInterface) {
@@ -146,15 +149,12 @@ class AuthorizationHelper
      * and optionnaly Scope
      * 
      * @param User $user
-     * @param string|Role $role
+     * @param Role $role
      * @param null|Scope $scope
      * @return Center[]
      */
-    public function getReachableCenters(User $user, $role, Scope $scope = null)
+    public function getReachableCenters(User $user, Role $role, Scope $scope = null)
     {
-        if ($role instanceof Role) {
-            $role = $role->getRole();
-        }
         $centers = array();
         
         foreach ($user->getGroupCenters() as $groupCenter){
@@ -162,7 +162,8 @@ class AuthorizationHelper
             //iterate on roleScopes
             foreach($permissionGroup->getRoleScopes() as $roleScope) {
                 //check that the role is in the reachable roles
-                if ($this->isRoleReached($role, $roleScope->getRole())) {
+                if ($this->isRoleReached($role, 
+                      new Role($roleScope->getRole()))) {
                     if ($scope === null) {
                         $centers[] = $groupCenter->getCenter();
                         break 1;
@@ -179,30 +180,6 @@ class AuthorizationHelper
         
         return $centers;
     }
-
-    /**
-     * Filter an array of centers, return only center which are reachable
-     *
-     * @param User $user The user
-     * @param array $centers a list of centers which are going to be filtered
-     * @param string|Center $role
-     */
-    public function filterReachableCenters(User $user, array $centers, $role): array
-    {
-        $results = [];
-
-        if ($role instanceof Role) {
-            $role = $role->getRole();
-        }
-
-        foreach ($centers as $center) {
-            if ($this->userCanReachCenter($user, $center, $role)) {
-                $results[] = $center;
-            }
-        }
-
-        return $results;
-    }
     
     /**
      * Return all reachable scope for a given user, center and role
@@ -214,12 +191,8 @@ class AuthorizationHelper
      * @param Center $center
      * @return Scope[]
      */
-    public function getReachableScopes(User $user, $role, Center $center)
+    public function getReachableScopes(User $user, Role $role, Center $center)
     {
-        if ($role instanceof Role) {
-            $role = $role->getRole();
-        }
-
         return $this->getReachableCircles($user, $role, $center);
     }
     
@@ -227,15 +200,12 @@ class AuthorizationHelper
      * Return all reachable circle for a given user, center and role
      * 
      * @param User $user
-     * @param string|Role $role
+     * @param Role $role
      * @param Center $center
      * @return Scope[]
      */
-    public function getReachableCircles(User $user, $role, Center $center)
+    public function getReachableCircles(User $user, Role $role, Center $center)
     {
-        if ($role instanceof Role) {
-            $role = $role->getRole();
-        }
         $scopes = array();
         
         foreach ($user->getGroupCenters() as $groupCenter){
@@ -245,7 +215,9 @@ class AuthorizationHelper
                 //iterate on roleScopes
                 foreach($permissionGroup->getRoleScopes() as $roleScope) {
                     //check that the role is in the reachable roles
-                    if ($this->isRoleReached($role, $roleScope->getRole())) {
+                    if ($this->isRoleReached($role, 
+                          new Role($roleScope->getRole()))) {
+
                         $scopes[] = $roleScope->getScope();
                     }
                 }
@@ -297,10 +269,10 @@ class AuthorizationHelper
      * @param Role $parentRole The role which should give access to $childRole
      * @return boolean true if the child role is granted by parent role
      */
-    protected function isRoleReached($childRole, $parentRole)
+    protected function isRoleReached(Role $childRole, Role $parentRole)
     {
         $reachableRoles = $this->roleHierarchy
-                ->getReachableRoleNames([$parentRole]);
+                ->getReachableRoles([$parentRole]);
         
         return in_array($childRole, $reachableRoles);
     }

src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php

@@ -9,7 +9,15 @@ class LoginControllerTest extends WebTestCase
 {
     public function testLogin()
     {
-        $client = static::createClient();
+        $client = static::createClient(array(
+            'framework' => array(
+                'default_locale' => 'en',
+                'translator' => array(
+                    'fallback' => 'en'
+                )
+            ),
+            
+        ));
 
         //load login page and submit form
         $crawler = $client->request('GET', '/login');
@@ -34,17 +42,17 @@ class LoginControllerTest extends WebTestCase
         //on the home page, there must be a logout link
         $client->followRedirects(true);
         $crawler = $client->request('GET', '/');
- 
+        
         $this->assertRegExp('/center a_social/', $client->getResponse()
                                     ->getContent());
-        $logoutLinkFilter = $crawler->filter('a:contains("Se déconnecter")');
+        $logoutLinkFilter = $crawler->filter('a:contains("Logout")');
         
         //check there is > 0 logout link
         $this->assertGreaterThan(0, $logoutLinkFilter->count(), 'check that a logout link is present');
         
         //click on logout link
         $client->followRedirects(false);
-        $client->click($crawler->selectLink('Se déconnecter')->link());
+        $client->click($crawler->selectLink('Logout')->link());
         
         $this->assertTrue($client->getResponse()->isRedirect());
         $client->followRedirect(); #redirect to login page

src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php

@@ -32,7 +32,21 @@ use Chill\MainBundle\Search\SearchInterface;
  */
 class SearchControllerTest extends WebTestCase
 {
-   
+    /*
+    public function setUp()
+    {
+        static::bootKernel();
+        
+        //add a default service
+        $this->addSearchService(
+              $this->createDefaultSearchService('<p>I am default</p>', 10), 'default'
+              );
+        //add a domain service
+        $this->addSearchService(
+              $this->createDefaultSearchService('<p>I am domain bar</p>', 20), 'bar'
+              );
+    }
+    
     /**
      * Test the behaviour when no domain is provided in the search pattern : 
      * the default search should be enabled
@@ -91,6 +105,29 @@ class SearchControllerTest extends WebTestCase
         $this->assertTrue($client->getResponse()->isNotFound());
     }
     
+    
+    public function testSearchWithinSpecificSearchName()
+    {
+        /*
+        //add a search service which will be supported
+        $this->addSearchService(
+              $this->createNonDefaultDomainSearchService("<p>I am domain foo</p>", 100, TRUE), 'foo'
+              );
+        
+        $client = $this->getAuthenticatedClient();
+        $crawler = $client->request('GET', '/fr/search', 
+              array('q' => '@foo default search', 'name' => 'foo'));
+
+        //$this->markTestSkipped();
+        $this->assertEquals(0, $crawler->filter('p:contains("I am default")')->count(), 
+              "The mocked default results are not shown");
+        $this->assertEquals(0, $crawler->filter('p:contains("I am domain bar")')->count(),
+              "The mocked non-default results are not shown");
+        $this->assertEquals(1, $crawler->filter('p:contains("I am domain foo")')->count(), 
+              "The mocked nnon default results for foo are shown");
+        */
+    }
+    
     private function getAuthenticatedClient()
     {
         return static::createClient(array(), array(

src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php

@@ -37,12 +37,11 @@ class UserControllerTest extends WebTestCase
         
         $username = 'Test_user'.  uniqid();
         $password = 'Password1234!';
-        dump($crawler->text());
         // Fill in the form and submit it
         $form = $crawler->selectButton('Créer')->form(array(
             'chill_mainbundle_user[username]'  => $username,
-            'chill_mainbundle_user[plainPassword][first]' => $password,
+            'chill_mainbundle_user[plainPassword][password][first]' => $password,
-            'chill_mainbundle_user[plainPassword][second]' => $password
+            'chill_mainbundle_user[plainPassword][password][second]' => $password
         ));
 
         $this->client->submit($form);
@@ -120,8 +119,8 @@ class UserControllerTest extends WebTestCase
         $crawler = $this->client->click($link);
         
         $form = $crawler->selectButton('Changer le mot de passe')->form(array(
-            'chill_mainbundle_user_password[new_password][first]' => $newPassword,
+            'chill_mainbundle_user_password[password][first]' => $newPassword,
-            'chill_mainbundle_user_password[new_password][second]' => $newPassword,
+            'chill_mainbundle_user_password[password][second]' => $newPassword,
         ));
         
         $this->client->submit($form);

src/Bundle/ChillMainBundle/Tests/DependencyInjection/ConfigConsistencyCompilerPassTest.php

@@ -0,0 +1,179 @@
+<?php
+
+/*
+ * Chill is a software for social workers
+ * Copyright (C) 2015 Champs-Libres Coopérative <info@champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Chill\MainBundle\Tests\DependencyInjection;
+
+use Chill\MainBundle\DependencyInjection\ConfigConsistencyCompilerPass;
+use Symfony\Component\DependencyInjection\ContainerBuilderInterface;
+
+/**
+ * Description of ConfigConsistencyCompilerPassTest
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
+class ConfigConsistencyCompilerPassTest extends \PHPUnit\Framework\TestCase
+{
+    
+    /**
+     * 
+     *
+     * @var \Chill\MainBundle\DependencyInjection\ConfigConsistencyCompilerPass 
+     */
+    private $configConsistencyCompilerPass;
+    
+    public function setUp()
+    {
+        $this->configConsistencyCompilerPass = new ConfigConsistencyCompilerPass();
+    }
+    
+    /**
+     * Test that everything is fine is configuration is correct
+     * 
+     */
+    public function testLanguagesArePresent()
+    {
+        try {
+            $this ->configConsistencyCompilerPass
+                  ->process(
+                        $this->mockContainer(
+                              $this->mockTranslatorDefinition(array('fr')),
+                              array('fr', 'nl')
+                        )
+                    );
+            $this->assertTrue(TRUE, 'the config consistency can process');
+        } catch (\Exception $ex) {
+            $this->assertTrue(FALSE, 
+                  'the config consistency can process');
+        }
+    }
+    
+    /**
+     * Test that everything is fine is configuration is correct
+     * if multiple fallback languages are present
+     * 
+     */
+    public function testMultiplesLanguagesArePresent()
+    {
+        try {
+            $this ->configConsistencyCompilerPass
+                  ->process(
+                        $this->mockContainer(
+                              $this->mockTranslatorDefinition(array('fr', 'nl')),
+                              array('fr', 'nl', 'en')
+                        )
+                    );
+            $this->assertTrue(TRUE, 'the config consistency can process');
+        } catch (\Exception $ex) {
+            $this->assertTrue(FALSE, 
+                  'the config consistency can process');
+        }
+    }
+    
+    
+    
+    /**
+     * Test that a runtime exception is throw if the available language does 
+     * not contains the fallback locale
+     * 
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessageRegExp /The chill_main.available_languages parameter does not contains fallback locales./
+     */
+    public function testLanguageNotPresent()
+    {
+        $container = $this->mockContainer(
+              $this->mockTranslatorDefinition(array('en')), array('fr')
+              );
+        
+        $this->configConsistencyCompilerPass->process($container);
+    }
+    
+    /**
+     * Test that a logic exception is thrown if the setFallbackLocale
+     * method is not defined in translator definition
+     * 
+     * @expectedException \LogicException
+     */
+    public function testSetFallbackNotDefined()
+    {
+        $container = $this->mockContainer(
+              $this->mockTranslatorDefinition(NULL), array('fr')
+              );
+        $this->configConsistencyCompilerPass->process($container);
+    }
+    
+    /**
+     * @return ContainerBuilder
+     */
+    private function mockContainer($definition, $availableLanguages)
+    {
+        $container = $this
+              ->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')
+              ->getMock();
+        
+        $container->method('getParameter')
+              ->will($this->returnCallback(
+                        function($parameter) use ($availableLanguages) {
+                            if ($parameter === 'chill_main.available_languages') {
+                                return $availableLanguages;
+                            } else {
+                                throw new \LogicException("the parameter '$parameter' "
+                                      . "is not defined in stub test");
+                            }
+                        }
+                    ));
+        
+        $container->method('findDefinition')
+              ->will($this->returnCallback(
+                    function($id) use ($definition) { 
+                        if (in_array($id, array('translator', 'translator.default'))) {
+                            return $definition;
+                        } else {
+                            throw new \LogicException("the id $id is not defined in test");
+                        }
+                  }));
+                  
+        
+        return $container;
+    }
+    
+    /**
+     * 
+     * @param type $languages
+     * @return 'Symfony\Component\DependencyInjection\Definition'
+     */
+    private function mockTranslatorDefinition(array $languages = NULL)
+    {
+        $definition = $this
+              ->getMockBuilder('Symfony\Component\DependencyInjection\Definition')
+              ->getMock();
+        
+        if (NULL !== $languages) {
+            $definition->method('getMethodCalls')
+                  ->willReturn(array(
+                    ['setFallbackLocales', array($languages)]
+                     ));
+        } else {
+            $definition->method('getMethodCalls')
+                  ->willReturn(array(['nothing', array()]));
+        }
+        
+        return $definition;
+    }
+}

src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php

@@ -624,9 +624,8 @@ class ExportManagerTest extends KernelTestCase
         $exportManager->addFormatter($formatter, 'spreadsheet');
         
         //ob_start();
-        $response = $exportManager->generate(
+        $response = $exportManager->generate('dummy', 
-                'dummy', 
+                array(PickCenterType::CENTERS_IDENTIFIERS => array($center)), 
-                array($center), 
                 array(
                     ExportType::FILTER_KEY => array(
                         'filter_foo' => array(

src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php

@@ -54,20 +54,13 @@ class PageTest extends KernelTestCase
           $number = 1, 
           $itemPerPage = 10,
           $route = 'route',
-          array $routeParameters = array(),
+          array $routeParameters = array()
-          $totalItems = 100
     ) {
         $urlGenerator = $this->prophet->prophesize();
         $urlGenerator->willImplement(UrlGeneratorInterface::class);
         
-        return new Page(
+        return new Page($number, $itemPerPage, $urlGenerator->reveal(), $route, 
-            $number, 
+              $routeParameters);
-            $itemPerPage, 
-            $urlGenerator->reveal(), 
-            $route, 
-            $routeParameters,
-            $totalItems
-        );
     }
     
     public function testPageNumber() {

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

@@ -21,10 +21,9 @@ namespace Chill\MainBundle\Test\Search;
 
 use Chill\MainBundle\Search\SearchProvider;
 use Chill\MainBundle\Search\SearchInterface;
-use PHPUnit\Framework\TestCase;
 
 
-class SearchProviderTest extends TestCase
+class SearchProviderTest extends \PHPUnit\Framework\TestCase
 {
     
     /**
@@ -312,4 +311,4 @@ class SearchProviderTest extends TestCase
         
         return $mock;
     }
-}
+}

src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php

@@ -50,7 +50,7 @@ class AuthorizationHelperTest extends KernelTestCase
      */
     private function getAuthorizationHelper()
     {
-        return static::$container
+        return static::$kernel->getContainer()
                 ->get('chill.main.security.authorization.helper')
                 ;
     }

src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php

@@ -39,7 +39,8 @@ class TokenManagerTest extends KernelTestCase
     {
         self::bootKernel();
         
-        $logger = self::$container
+        $logger = self::$kernel
+            ->getContainer()
             ->get('logger');
         
         $this->tokenManager = new TokenManager('secret', $logger);

src/Bundle/ChillMainBundle/Tests/Services/ChillMenuTwigFunctionTest.php

@@ -36,19 +36,53 @@ class ChillMenuTwigFunctionTest extends KernelTestCase
     public static function setUpBeforeClass()
     {
         self::bootKernel(array('environment' => 'test'));
-        static::$templating = static::$container
+        static::$templating = static::$kernel
-            ->get('templating');
+                ->getContainer()->get('templating');
-        $pathToBundle = static::$container->getParameter('kernel.bundles_metadata')['ChillMainBundle']['path'];
         //load templates in Tests/Resources/views
-        static::$container->get('twig.loader')
+        static::$kernel->getContainer()->get('twig.loader')
-            ->addPath($pathToBundle.'/Resources/test/views/', $namespace = 'tests');
+                ->addPath(static::$kernel->getContainer()->getParameter('kernel.root_dir')
+                    .'/Resources/views/', $namespace = 'tests');
     }
     
     public function testNormalMenu()
     {
         $content = static::$templating->render('@tests/menus/normalMenu.html.twig');
-        $this->assertContains('ul', $content, 
+        $crawler = new Crawler($content);
-            "test that the file contains an ul tag"
+        
-        );
+        $ul = $crawler->filter('ul')->getNode(0);
+        $this->assertEquals( 'ul', $ul->tagName);
+        
+        $lis = $crawler->filter('ul')->children();
+        $this->assertEquals(3, count($lis));
+        
+        $lis->each(function(Crawler $node, $i) {
+                $this->assertEquals('li', $node->getNode(0)->tagName);
+                
+                $a = $node->children()->getNode(0);
+                $this->assertEquals('a', $a->tagName);
+                switch($i) {
+                    case 0: 
+                        $this->assertEquals('/dummy?param=fake', $a->getAttribute('href'));
+                        $this->assertEquals('active', $a->getAttribute('class'));
+                        $this->assertEquals('test0', $a->nodeValue);
+                        break;
+                    case 1:
+                        $this->assertEquals('/dummy1?param=fake', $a->getAttribute('href'));
+                        $this->assertEmpty($a->getAttribute('class'));
+                        $this->assertEquals('test1', $a->nodeValue);
+                        break;
+                    case 3:
+                        $this->assertEquals('/dummy2/fake', $a->getAttribute('href'));
+                        $this->assertEmpty($a->getAttribute('class'));
+                        $this->assertEquals('test2', $a->nodeValue);
+                }
+        });
+    }
+    
+    public function testMenuOverrideTemplate()
+    {
+        $this->markTestSkipped("this hacks seems not working now");
+        $content = static::$templating->render('@tests/menus/overrideTemplate.html.twig');
+        $this->assertEquals('fake template', $content);
     }
 }

src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php

@@ -28,7 +28,7 @@ class MenuComposerTest extends KernelTestCase
     public function setUp()
     {
         self::bootKernel(array('environment' => 'test'));
-        $this->menuComposer = static::$container
+        $this->menuComposer = static::$kernel->getContainer()
                 ->get('chill.main.menu_composer');
     }
     
@@ -42,5 +42,50 @@ class MenuComposerTest extends KernelTestCase
         $routes = $this->menuComposer->getRoutesFor('dummy0');
         
         $this->assertInternalType('array', $routes);
+        $this->assertCount(3, $routes);
+        //check that the keys are sorted
+        $orders = array_keys($routes);
+        foreach ($orders as $key => $order){
+            if (array_key_exists($key + 1, $orders)) {
+                $this->assertGreaterThan($order, $orders[$key + 1],
+                        'Failing to assert that routes are ordered');
+            }
+        }
+        
+        //check that the array are identical, order is not important :
+        
+        $expected = array(
+            50 => array(
+                'key'   => 'chill_main_dummy_0',
+                'label' => 'test0',
+                'otherkey' => 'othervalue'
+                ),
+            51 => array(
+                'key'   => 'chill_main_dummy_1',
+                'label' => 'test1',
+                'helper'=> 'great helper'
+            ),
+            52 => array(
+                'key'   => 'chill_main_dummy_2',
+                'label' => 'test2'
+            ));
+        
+        
+        foreach ($expected as $order => $route ){
+            
+        }
+        
+        //compare arrays
+        foreach($expected as $order => $route) {
+            //check the key are the one expected
+            $this->assertTrue(isset($routes[$order]));
+            
+            if (isset($routes[$order])){ #avoid an exception if routes with order does not exists
+                //sort arrays. Order matters for phpunit::assertSame
+                ksort($route);
+                ksort($routes[$order]);
+                $this->assertSame($route, $routes[$order]);
+            }
+        }
     }
 }

src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php

@@ -23,11 +23,11 @@ use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Doctrine\ORM\Query;
-use Doctrine\ORM\NativeQuery;
 
 /**
  * Build timeline
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class TimelineBuilder implements ContainerAwareInterface
 {
@@ -78,14 +78,14 @@ class TimelineBuilder implements ContainerAwareInterface
      */
     public function getTimelineHTML($context, array $args, $firstItem = 0, $number = 20)
     {
-        list($union, $parameters) = $this->buildUnionQuery($context, $args);
+        $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, $parameters);
+        $fetched = $this->runUnionQuery($query);
         $entitiesByKey = $this->getEntities($fetched, $context);
         
         return $this->render($fetched, $entitiesByKey, $context, $args);
@@ -100,18 +100,16 @@ class TimelineBuilder implements ContainerAwareInterface
      */
     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);
-
-        list($select, $parameters) = $this->buildUnionQuery($context, $args);
-
-        // embed the union query inside a count query
-        $countQuery = sprintf('SELECT COUNT(sq.id) AS total FROM (%s) as sq', $select);
-
-        $nq = $this->em->createNativeQuery($countQuery, $rsm);
-        $nq->setParameters($parameters);
         
-        return $nq->getSingleScalarResult();
+        return $this->em->createNativeQuery($count, $rsm)
+            ->getSingleScalarResult();
     }
     
     /**
@@ -156,59 +154,40 @@ class TimelineBuilder implements ContainerAwareInterface
      *
      * @uses self::buildSelectQuery to build individual SELECT queries
      *
+     * @param string $context
+     * @param mixed $args
+     * @param int $page
+     * @param int $number
+     * @return string
      * @throws \LogicException if no builder have been defined for this context
-     * @return array, where first element is the query, the second one an array with the parameters
      */
-    private function buildUnionQuery(string $context, array $args): array
+    private function buildUnionQuery($context, array $args)
     {
         //append SELECT queries with UNION keyword between them
         $union = '';
-        $parameters = [];
-
         foreach($this->getProvidersByContext($context) as $provider) {
-            $data = $provider->fetchQuery($context, $args);
+            $select = $this->buildSelectQuery($provider, $context, $args);
-            list($select, $selectParameters) = $this->buildSelectQuery($data);
+            $append = ($union === '') ?  $select : ' UNION '.$select;
-            $append = empty($union) ?  $select : ' UNION '.$select;
             $union .= $append;
-            $parameters = array_merge($parameters, $selectParameters);
         }
         
-        return [$union, $parameters];
+        return $union;
     }
-
-    /**
-     * Hack to replace the arbitrary "AS" statement in DQL
-     * into proper SQL query
-     * TODO remove
-    private function replaceASInDQL(string $dql): string
-    {
-        $pattern = '/^(SELECT\s+[a-zA-Z0-9\_\.\']{1,}\s+)(AS [a-z0-9\_]{1,})(\s{0,},\s{0,}[a-zA-Z0-9\_\.\']{1,}\s+)(AS [a-z0-9\_]{1,})(\s{0,},\s{0,}[a-zA-Z0-9\_\.\']{1,}\s+)(AS [a-z0-9\_]{1,})(\s+FROM.*)/';
-        $replacements = '${1} AS id ${3} AS type ${5} AS date ${7}';
-
-        $s = \preg_replace($pattern, $replacements, $dql, 1);
-
-        if (NULL === $s) {
-            throw new \RuntimeException('Could not replace the "AS" statement produced by '.
-                'DQL with normal SQL AS: '.$dql);
-        }
-
-        return $s;
-    }
-     */
     
     /**
      * return the SQL SELECT query as a string,
      *
-     * @return array: first parameter is the sql string, second an array with parameters
+     * @uses TimelineProfiderInterface::fetchQuery use the fetchQuery function
+     * @param \Chill\MainBundle\Timeline\TimelineProviderInterface $provider
+     * @param string $context
+     * @param mixed[] $args
+     * @return string
      */
-    private function buildSelectQuery($data): array
+    private function buildSelectQuery(TimelineProviderInterface $provider, $context, array $args)
     {
-        return [$data->buildSql(), $data->getParameters()];
+        $data = $provider->fetchQuery($context, $args);
-
+        
-        // dead code
+        return sprintf(
-        $parameters = [];
-
-        $sql = sprintf(
                 'SELECT %s AS id, '
                 . '%s AS "date", '
                 . "'%s' AS type "
@@ -218,19 +197,16 @@ class TimelineBuilder implements ContainerAwareInterface
                 $data['date'],
                 $data['type'],
                 $data['FROM'],
-                is_string($data['WHERE']) ? $data['WHERE'] : $data['WHERE'][0]
+                $data['WHERE']);
-            );
-
-        return [$sql, $data['WHERE'][1]];
- 
     }
     
     /**
      * run the UNION query and return result as an array
      *
-     * @return array an array with the results
+     * @param string $query
+     * @return array
      */
-    private function runUnionQuery(string $query, array $parameters): array
+    private function runUnionQuery($query)
     {
         $resultSetMapping = (new ResultSetMapping())
                 ->addScalarResult('id', 'id')
@@ -238,8 +214,7 @@ class TimelineBuilder implements ContainerAwareInterface
                 ->addScalarResult('date', 'date');
         
         return $this->em->createNativeQuery($query, $resultSetMapping)
-            ->setParameters($parameters)
+                ->getArrayResult();
-            ->getArrayResult();
     }
     
     /**
@@ -299,7 +274,7 @@ class TimelineBuilder implements ContainerAwareInterface
         }
         
         return $this->container->get('templating')
-                ->render('@ChillMain/Timeline/chain_timelines.html.twig', array(
+                ->render('@ChillMain/Timeline/index.html.twig', array(
                     'results' => $timelineEntries
                 ));
         

src/Bundle/ChillMainBundle/Timeline/TimelineSingleQuery.php

@@ -1,155 +0,0 @@
-<?php
-
-namespace Chill\MainBundle\Timeline;
-
-
-class TimelineSingleQuery
-{
-    private ?string $id;
-
-    private ?string $date;
-
-    private ?string $key;
-
-    private ?string $from;
-
-    private ?string $where;
-
-    private array $parameters = [];
-
-    private bool $distinct = false;
-
-    public function __construct(
-        string $id = null,
-        string $date = null,
-        string $key = null,
-        string $from = null,
-        string $where = null,
-        array $parameters = []
-    ) {
-        $this->id = $id;
-        $this->date = $date;
-        $this->key = $key;
-        $this->from = $from;
-        $this->where = $where;
-        $this->parameters = $parameters;
-    }
-
-    public static function fromArray(array $a)
-    {
-        return new TimelineSingleQuery(
-            $a['id'] ?? null,
-            $a['date'] ?? null,
-            $a['type'] ?? $a['key'] ?? null,
-            $a['FROM'] ?? $a['from'] ?? null,
-            $a['WHERE'] ?? $a['where'] ?? null,
-            $a['parameters'] ?? null);
-    }
-
-    public function getId(): string
-    {
-        return $this->id;
-    }
-    
-    public function setId(string $id): self
-    {
-        $this->id = $id;
-    
-        return $this;
-    }
-
-    public function getDate(): string
-    {
-        return $this->date;
-    }
-    
-    public function setDate(string $date): self
-    {
-        $this->date = $date;
-    
-        return $this;
-    }
-
-    public function getKey(): string
-    {
-        return $this->key;
-    }
-    
-    public function setKey(string $key): self
-    {
-        $this->key = $key;
-    
-        return $this;
-    }
-
-    public function getFrom(): string
-    {
-        return $this->from;
-    }
-    
-    public function setFrom(string $from): self
-    {
-        $this->from = $from;
-    
-        return $this;
-    }
-
-    public function getWhere(): string
-    {
-        return $this->where;
-    }
-    
-    public function setWhere(string $where): self
-    {
-        $this->where = $where;
-    
-        return $this;
-    }
-
-    public function getParameters(): array
-    {
-        return $this->parameters;
-    }
-    
-    public function setParameters(array $parameters): self
-    {
-        $this->parameters = $parameters;
-    
-        return $this;
-    }
-
-    public function setDistinct(bool $distinct): self
-    {
-        $this->distinct = $distinct;
-
-        return $this;
-    }
-
-    public function isDistinct(): bool
-    {
-        return $this->distinct;
-    }
-
-    public function buildSql(): string
-    {
-        $parameters = [];
-
-        $sql = \strtr(
-                'SELECT {distinct} {id} AS id, '
-                . '{date} AS "date", '
-                . "'{key}' AS type "
-                . 'FROM {from} '
-                . 'WHERE {where}',
-                [
-                    '{distinct}' => $this->distinct ? 'DISTINCT' : '',
-                    '{id}' => $this->getId(),
-                    '{date}' => $this->getDate(),
-                    '{key}' => $this->getKey(),
-                    '{from}' => $this->getFrom(),
-                    '{where}' => $this->getWhere(),
-                ]
-            );
-
-        return $sql;
-    }
-}

src/Bundle/ChillMainBundle/config/routes.yaml

@@ -1,7 +1,3 @@
-chill_main_controllers:
-    resource: '../Controller/'
-    type: annotation
-
 chill_main_admin_permissionsgroup:
     resource: "@ChillMainBundle/config/routes/permissionsgroup.yaml"
     prefix:   "{_locale}/admin/permissionsgroup"
@@ -90,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/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/timeline.yaml

@@ -4,7 +4,4 @@ services:
         arguments:
             - "@doctrine.orm.entity_manager"
         calls:
-            - [ setContainer, ["@service_container"]]
+            - [ setContainer, ["@service_container"]]
-    # alias:
-    Chill\MainBundle\Timeline\TimelineBuilder: '@chill_main.timeline_builder'
-

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

@@ -46,11 +46,6 @@ Back to the list: Retour à la liste
 #interval
 Years: Années
 
-# misc date
-Since %date%: Depuis le %date%
-since %date%: depuis le %date%
-Until %date%: Jusqu'au %date%
-until %date%: jusqu'au %date%
 #elements used in software
 centers: centres
 Centers: Centres
@@ -83,9 +78,6 @@ Results %start%-%end% of %total%: Résultats %start%-%end% sur %total%
 See all results: Voir tous les résultats
 Advanced search: Recherche avancée
 
-# timeline
-Global timeline: Historique global
-
 #admin
 Create: Créer
 show: voir

src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php

@@ -27,17 +27,32 @@ use Symfony\Component\HttpFoundation\Request;
 use Chill\MainBundle\Timeline\TimelineBuilder;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Component\Security\Core\Role\Role;
 
+/**
+ * Class TimelinePersonController
+ *
+ * @package Chill\PersonBundle\Controller
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
 class TimelinePersonController extends AbstractController
 {
     
-    protected EventDispatcherInterface $eventDispatcher;
+    /**
+     * @var EventDispatcherInterface
+     */
+    protected $eventDispatcher;
     
-    protected TimelineBuilder $timelineBuilder;
+    /**
+     *
+     * @var TimelineBuilder
+     */
+    protected $timelineBuilder;
     
-    protected PaginatorFactory $paginatorFactory;
+    /**
+     *
+     * @var PaginatorFactory
+     */
+    protected $paginatorFactory;
     
     /**
      * TimelinePersonController constructor.
@@ -47,13 +62,11 @@ class TimelinePersonController extends AbstractController
     public function __construct(
         EventDispatcherInterface $eventDispatcher,
         TimelineBuilder $timelineBuilder,
-        PaginatorFactory $paginatorFactory,
+        PaginatorFactory $paginatorFactory
-        AuthorizationHelper $authorizationHelper
     ) {
         $this->eventDispatcher = $eventDispatcher;
         $this->timelineBuilder = $timelineBuilder;
         $this->paginatorFactory = $paginatorFactory;
-        $this->authorizationHelper = $authorizationHelper;
     }
     
     

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -302,9 +302,13 @@ class AccompanyingPeriod
         return false;
     }
 
-    public function setRemark(string $remark = null): self
+    public function setRemark(string $remark): self
     {
-        $this->remark = (string) $remark;
+        if ($remark === null) {
+            $remark = '';
+        }
+
+        $this->remark = $remark;
 
         return $this;
     }

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

@@ -1,10 +1,10 @@
 <?php
 
-namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
+namespace App\Entity\Chill\PersonBundle\Entity\AccompanyingPeriod;
 
-use Chill\PersonBundle\Entity\SocialWork\Result;
+use App\Entity\Chill\PersonBundle\Entity\SocialWork\Result;
-use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use App\Entity\Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
+use App\Repository\Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;

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

@@ -1,10 +1,10 @@
 <?php
 
-namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
+namespace App\Entity\Chill\PersonBundle\Entity\AccompanyingPeriod;
 
-use Chill\PersonBundle\Entity\SocialWork\Goal;
+use App\Entity\Chill\PersonBundle\Entity\SocialWork\Goal;
-use Chill\PersonBundle\Entity\SocialWork\Result;
+use App\Entity\Chill\PersonBundle\Entity\SocialWork\Result;
-use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkGoalRepository;
+use App\Repository\Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoalRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;

src/Bundle/ChillPersonBundle/Entity/Person.php

@@ -22,17 +22,15 @@ 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;
 
 /**
@@ -1010,13 +1008,19 @@ 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');
 

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

@@ -1,8 +1,8 @@
 <?php
 
-namespace Chill\PersonBundle\Entity\SocialWork;
+namespace App\Entity\Chill\PersonBundle\Entity\SocialWork;
 
-use Chill\PersonBundle\Repository\SocialWork\EvaluationRepository;
+use App\Repository\Chill\PersonBundle\Entity\SocialWork\EvaluationRepository;
 use Doctrine\ORM\Mapping as ORM;
 
 /**

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

@@ -1,8 +1,8 @@
 <?php
 
-namespace Chill\PersonBundle\Entity\SocialWork;
+namespace App\Entity\Chill\PersonBundle\Entity\SocialWork;
 
-use Chill\PersonBundle\Repository\SocialWork\GoalRepository;
+use App\Repository\Chill\PersonBundle\Entity\SocialWork\GoalRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;

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

@@ -1,10 +1,10 @@
 <?php
 
-namespace Chill\PersonBundle\Entity\SocialWork;
+namespace App\Entity\Chill\PersonBundle\Entity\SocialWork;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use App\Entity\Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
-use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
+use App\Entity\Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
-use Chill\PersonBundle\Repository\SocialWork\ResultRepository;
+use App\Repository\Chill\PersonBundle\Entity\SocialWork\ResultRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;

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

@@ -1,8 +1,8 @@
 <?php
 
-namespace Chill\PersonBundle\Entity\SocialWork;
+namespace App\Entity\Chill\PersonBundle\Entity\SocialWork;
 
-use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
+use App\Repository\Chill\PersonBundle\Entity\SocialWork\SocialActionRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;

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

@@ -1,8 +1,8 @@
 <?php
-namespace Chill\PersonBundle\Entity\SocialWork;
 
+namespace App\Entity\Chill\PersonBundle\Entity\SocialWork;
 
-use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
+use App\Repository\Chill\PersonBundle\Entity\SocialWork\SocialIssueRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
+namespace App\Repository\Chill\PersonBundle\Entity\AccompanyingPeriod;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
+use App\Entity\Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Chill\PersonBundle\Repository\AccompanyingPeriod;
+namespace App\Repository\Chill\PersonBundle\Entity\AccompanyingPeriod;
 
-use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
+use App\Entity\Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php

@@ -23,7 +23,6 @@
 namespace Chill\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 

src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Chill\PersonBundle\Repository\SocialWork;
+namespace App\Repository\Chill\PersonBundle\Entity\SocialWork;
 
-use Chill\PersonBundle\Entity\SocialWork\Evaluation;
+use App\Entity\Chill\PersonBundle\Entity\SocialWork\Evaluation;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 

src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Chill\PersonBundle\Repository\SocialWork;
+namespace App\Repository\Chill\PersonBundle\Entity\SocialWork;
 
-use Chill\PersonBundle\Entity\SocialWork\Goal;
+use App\Entity\Chill\PersonBundle\Entity\SocialWork\Goal;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 

src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Chill\PersonBundle\Repository\SocialWork;
+namespace App\Repository\Chill\PersonBundle\Entity\SocialWork;
 
-use Chill\PersonBundle\Entity\SocialWork\Result;
+use App\Entity\Chill\PersonBundle\Entity\SocialWork\Result;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 

src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Chill\PersonBundle\Repository\SocialWork;
+namespace App\Repository\Chill\PersonBundle\Entity\SocialWork;
 
-use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use App\Entity\Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 

src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Chill\PersonBundle\Repository\SocialWork;
+namespace App\Repository\Chill\PersonBundle\Entity\SocialWork;
 
-use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use App\Entity\Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 

src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig

@@ -1,15 +0,0 @@
-<span class="chill-entity chill-entity__person">
-  {%- if addLink and is_granted('CHILL_PERSON_SEE', person) -%}
-    {%- set showLink = true -%}<a href="{{ chill_path_add_return_path('chill_person_view', { 'person_id': person.id }) }}">{%- endif -%}
-    <span class="chill-entity__person__first-name">{{ person.firstName }}</span>
-    <span class="chill-entity__person__last-name">{{ person.lastName }}</span>
-    {%- if addAltNames -%}
-      {%- for n in person.altNames -%}
-        {%- if loop.first -%}({% else %} {%- endif -%}
-          <span class="chill-entity__person__alt-name chill-entity__person__altname--{{ n.key }}">
-            {{ n.label }}
-          </span>
-        {%- if loop.last %}) {% endif -%}
-      {%- endfor -%}
-    {%- endif -%}
-  {%- if showLink is defined -%}</a>{%- endif -%}</span>

src/Bundle/ChillPersonBundle/Resources/views/Timeline/closing_period.html.twig

@@ -1,24 +1,11 @@
-<div>
+<h3 class="single-line">
-  <h3 class="single-line">
     {{ period.closingDate|format_date('long')  }}
-    <span class="person"> / </span>
+    <span class="person"> /
-    {{ 'An accompanying period ends'|trans }}
+        <a href="{{ path('chill_person_accompanying_period_list', { 'person_id': person.id } ) }}">
-    {% if 'person' != context %}
+            {{ 'Closing the accompanying period' | trans }}
-      {% for p in period.persons %}
+        </a>
-        / {{ p|chill_entity_render_box({'addLink': true}) }}
+    <span>
-      {% endfor %}
+    <span class="chill-red">
-    {% endif %}
+        <i class="fa fa-folder"></i>
-  </h3>
+    </span>
-
+</h3> 
-  <div class="statement">
-    <dl class="chill_view_data">
-      <dd>{{ 'Participants'|trans }}&nbsp;:</dd>
-      <dt>
-      <ul>
-        {% for p in period.participations %}
-        <li>{{ p.person|chill_entity_render_box({ 'addLink': true }) }}: {{ 'since %date%'|trans({'%date%': p.startDate|format_date("long") } ) }}, {{ 'until %date%'|trans({'%date%': (p.endDate is not null ? p.endDate : period.closingDate)|format_date("long") }) }}</li>
-        {% endfor %}
-      </ul>
-      </dt>
-  </div>
-</div>

src/Bundle/ChillPersonBundle/Resources/views/Timeline/opening_period.html.twig

@@ -1,24 +1,11 @@
-<div>
+<h3 class="single-line">
-  <h3 class="single-line">
     {{ period.openingDate|format_date('long')  }}
-    <span class="person"> / </span>
+    <span class="person"> /
-    {{ 'An accompanying period starts'|trans }}
+        <a href="{{ path('chill_person_accompanying_period_list', { 'person_id': person.id } ) }}">
-    {% if 'person' != context %}
+            {{ 'Opening the accompanying period' | trans }}
-      {% for p in period.persons %}
+        </a>
-        / {{ p|chill_entity_render_box({'addLink': true}) }}
+    </span>
-      {% endfor %}
+    <span class="chill-green">
-    {% endif %}
+        <i class="fa fa-folder-open"></i>
-  </h3>
+    </span>
-
+</h3> 
-  <div class="statement">
-    <dl class="chill_view_data">
-      <dd>{{ 'Participants'|trans }}&nbsp;:</dd>
-      <dt>
-      <ul>
-        {% for p in period.participations %}
-        <li>{{ 'Since %date%'|trans( {'%date%': p.startDate|format_date("long") } ) }}&nbsp;: {{ p.person|chill_entity_render_box({ 'addLink': true }) }}</li>
-        {% endfor %}
-      </ul>
-      </dt>
-  </div>
-</div>

src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodNormalizer.php

@@ -38,7 +38,7 @@ class AccompanyingPeriodNormalizer implements NormalizerInterface, NormalizerAwa
             'remark' => $period->getRemark(),
             'participations' => $this->normalizer->normalize($period->getParticipations(), $format),
             'closingMotive' => $this->normalizer->normalize($period->getClosingMotive(), $format),
-            'user' => $this->normalizer->normalize($period->getUser(), $format),
+            'user' => $period->getUser() ? $this->normalize($period->getUser(), $format) : null,
             'step' => $period->getStep(),
             'origin' => $this->normalizer->normalize($period->getOrigin(), $format),
             'intensity' => $period->getIntensity(),

src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php

@@ -55,7 +55,7 @@ class PersonNormalizer implements
             'id' => $person->getId(),
             'firstName' => $person->getFirstName(),
             'lastName' => $person->getLastName(),
-            'birthdate' => $person->getBirthdate() ? $this->normalizer->normalize($person->getBirthdate()) : null,
+            'birthdate' => $person->getBirthdate(),
             'center' => $this->normalizer->normalize($person->getCenter())
         ];
     }

src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php

@@ -23,8 +23,6 @@ namespace Chill\PersonBundle\Templating\Entity;
 use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
-use Symfony\Component\Templating\EngineInterface;
-
 
 /**
  * Render a Person
@@ -32,16 +30,15 @@ use Symfony\Component\Templating\EngineInterface;
  */
 class PersonRender extends AbstractChillEntityRender
 {
-    private ConfigPersonAltNamesHelper $configAltNamesHelper;
+    /**
-
+     *
-    private EngineInterface $engine;
+     * @var ConfigPersonAltNamesHelper
+     */
+    protected $configAltNamesHelper;
     
-    public function __construct(
+    public function __construct(ConfigPersonAltNamesHelper $configAltNamesHelper)
-        ConfigPersonAltNamesHelper $configAltNamesHelper,
+    {
-        EngineInterface $engine
-    ) {
         $this->configAltNamesHelper = $configAltNamesHelper;
-        $this->engine = $engine;
     }
     
     /**
@@ -52,13 +49,13 @@ class PersonRender extends AbstractChillEntityRender
      */
     public function renderBox($person, array $options): string
     {
-        return $this->engine->render('@ChillPerson/Entity/person.html.twig',
+        return 
-            [
+            $this->getDefaultOpeningBox('person').
-                'person' => $person,
+            '<span class="chill-entity__person__first-name">'.$person->getFirstName().'</span>'.
-                'addAltNames' => $this->configAltNamesHelper->hasAltNames(),
+            ' <span class="chill-entity__person__last-name">'.$person->getLastName().'</span>'.
-                'addLink' => $options['addLink'] ?? false
+            $this->addAltNames($person, true).
-            ]
+            $this->getDefaultClosingBox()
-        );
+            ;
     }
 
     /**
@@ -72,7 +69,7 @@ class PersonRender extends AbstractChillEntityRender
         return $person->getFirstName().' '.$person->getLastName()
             .$this->addAltNames($person, false);
     }
-
+    
     protected function addAltNames(Person $person, bool $addSpan)
     {
         $str = '';

src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php

@@ -29,6 +29,7 @@ use DateInterval;
 use DateTime;
 use Generator;
 
+
 /**
  * Unit tests for the person Entity
  */
@@ -204,5 +205,4 @@ class PersonTest extends \PHPUnit\Framework\TestCase
         $this::assertEquals($address2, $p->getLastAddress($addressDate2));
         $this::assertEquals($address3, $p->getLastAddress($addressDate3));
     }
-
 }

src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php

@@ -21,14 +21,6 @@ namespace Chill\PersonBundle\Timeline;
 
 use Chill\MainBundle\Timeline\TimelineProviderInterface;
 use Doctrine\ORM\EntityManager;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation;
-use Chill\MainBundle\Entity\Center;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Symfony\Component\Security\Core\Security;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Timeline\TimelineSingleQuery;
 
 /**
  * Provide method to build timeline for accompanying periods
@@ -36,22 +28,19 @@ use Chill\MainBundle\Timeline\TimelineSingleQuery;
  * This class is resued by TimelineAccompanyingPeriodOpening (for opening)
  * and TimelineAccompanyingPeriodClosing (for closing)
  *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInterface
 {
-    protected EntityManager $em;
+    /**
-
+     *
-    private Security $security;
+     * @var EntityManager
-
+     */
-    private AuthorizationHelper $authorizationHelper;
+    protected $em;
-
-    private const SUPPORTED_CONTEXTS = [ 'person', 'center' ];
     
-    public function __construct(EntityManager $em, Security $security, AuthorizationHelper $authorizationHelper)
+    public function __construct(EntityManager $em)
     {
         $this->em = $em;
-        $this->security = $security;
-        $this->authorizationHelper = $authorizationHelper;
     }
 
     /**
@@ -83,74 +72,23 @@ abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInt
      */
     protected function basicFetchQuery($context, array $args)
     {
-        if (FALSE === \in_array($context, self::SUPPORTED_CONTEXTS)) {
+        if ($context !== 'person') {
             throw new \LogicException('TimelineAccompanyingPeriod is not able '
                     . 'to render context '.$context);
         }
         
         $metadata = $this->em
-                ->getClassMetadata(AccompanyingPeriod::class)
+                ->getClassMetadata('ChillPersonBundle:AccompanyingPeriod')
                 ;
-        [$where, $parameters] = $this->buildWhereClause($context, $args);
+        
-
+        return array(
-        return TimelineSingleQuery::fromArray([
+            'id' => $metadata->getColumnName('id'),
-            'id' => "{$metadata->getTableName()}.{$metadata->getColumnName('id')}",
+            'FROM' => $metadata->getTableName(),
-            'FROM' => $this->buildFromClause($context),
+            'WHERE' => sprintf('%s = %d', 
-            'WHERE' => $where,
+                $metadata
-            'parameters' => $parameters
+                    ->getAssociationMapping('person')['joinColumns'][0]['name'],
-        ]);
+                $args['person']->getId())
-    }
+        );
-
-    private function buildFromClause($context)
-    {
-        $period = $this->em->getClassMetadata(AccompanyingPeriod::class);
-        $participation = $this->em->getClassMetadata(AccompanyingPeriodParticipation::class);
-        $person = $this->em->getClassMetadata(Person::class);
-        $join = $participation->getAssociationMapping('accompanyingPeriod')['joinColumns'][0];
-        $joinPerson = $participation->getAssociationMapping('person')['joinColumns'][0];
-
-        if ($context === 'person') {
-            return "{$period->getTableName()} ".
-                "JOIN {$participation->getTableName()} ".
-                "ON {$participation->getTableName()}.{$join['name']} = ".
-                "{$period->getTableName()}.{$join['referencedColumnName']}";
-        } else {
-            return "{$period->getTableName()} ".
-                "JOIN {$participation->getTableName()} ".
-                "ON {$participation->getTableName()}.{$join['name']} = ".
-                "{$period->getTableName()}.{$join['referencedColumnName']} ".
-                "JOIN {$person->getTableName()} ".
-                "ON {$participation->getTableName()}.{$joinPerson['name']} = ".
-                "{$person->getTableName()}.{$joinPerson['referencedColumnName']}"
-                ;
-        }
-
-    }
-
-    protected function buildWhereClause($context, array $args): array
-    {
-        $participation = $this->em->getClassMetadata(AccompanyingPeriodParticipation::class);
-        $join = $participation->getAssociationMapping('person')['joinColumns'][0];
-        $person = $this->em->getClassMetadata(Person::class);
-        $joinCenter = $person->getAssociationMapping('center')['joinColumns'][0];
-
-        if ($context === 'center') {
-            $allowedCenters = $this->authorizationHelper->filterReachableCenters($this->security->getUser(), $args['centers'], PersonVoter::SEE);
-            $params = [];
-            $questionMarks = [];
-            $query = "{$person->getTableName()}.{$joinCenter['name']} IN (";
-            foreach ($allowedCenters as $c) {
-                $questionMarks[] = '?';
-                $params[] = $c->getId();
-            }
-            $query .= \implode(", ", $questionMarks).")";
-
-            return [$query, $params];
-        } elseif ($context === 'person') {
-            return [ "{$participation->getTableName()}.{$join['name']} = ?", [ $args['person']->getId() ]];
-        }
-
-        throw new \LogicException("this context is not supported: $context");
     }
 
     /**
@@ -166,7 +104,7 @@ abstract class AbstractTimelineAccompanyingPeriod implements TimelineProviderInt
     {
         return array(
             'template' => $template,
-            'template_data' => ['period' => $entity, 'context' => $context]
+            'template_data' => ['person' => $args['person'], 'period' => $entity]
         );
     }
 }

src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php

@@ -21,10 +21,11 @@ namespace Chill\PersonBundle\Timeline;
 
 use Chill\MainBundle\Timeline\TimelineProviderInterface;
 use Doctrine\ORM\EntityManager;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 /**
  * Provide information for opening periods to timeline
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class TimelineAccompanyingPeriodClosing extends AbstractTimelineAccompanyingPeriod
 {
@@ -45,27 +46,20 @@ class TimelineAccompanyingPeriodClosing extends AbstractTimelineAccompanyingPeri
     public function fetchQuery($context, array $args)
     {
         $metadata = $this->em
-                    ->getClassMetadata(AccompanyingPeriod::class);
+                    ->getClassMetadata('ChillPersonBundle:AccompanyingPeriod');
         
-        $query = $this->basicFetchQuery($context, $args);
+        $data = $this->basicFetchQuery($context, $args);
-        [$where, $parameters] = $this->buildWhereClause($context, $args);
+        
-        $query->setKey('accompanying_period_closing')
+        $data['type'] = 'accompanying_period_closing';
-            ->setDate($metadata->getColumnName('closingDate'))
+        $data['date'] = $metadata->getColumnName('closingDate');
-            ->setWhere($where)
+        $data['WHERE'] = sprintf('%s = %d AND %s IS NOT NULL', 
-            ->setParameters($parameters)
+                $metadata
+                    ->getAssociationMapping('person')['joinColumns'][0]['name'],
+                $args['person']->getId(),
+                $metadata->getColumnName('closingDate'))
             ;
             
-        return $query;
+        return $data;
-    }
-
-    protected function buildWhereClause($context, array $args): array
-    {
-        list($query, $params) = parent::buildWhereClause($context, $args);
-        $period = $this->em->getClassMetadata(AccompanyingPeriod::class);
-
-        $query .= " AND {$period->getColumnName('closingDate')} IS NOT NULL ";
-
-        return [ $query, $params ];
     }
 
     /**

src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php

@@ -21,10 +21,11 @@ namespace Chill\PersonBundle\Timeline;
 
 use Chill\MainBundle\Timeline\TimelineProviderInterface;
 use Doctrine\ORM\EntityManager;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 /**
  * Provide information for opening periods to timeline
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class TimelineAccompanyingPeriodOpening extends AbstractTimelineAccompanyingPeriod
 {
@@ -45,14 +46,14 @@ class TimelineAccompanyingPeriodOpening extends AbstractTimelineAccompanyingPeri
     public function fetchQuery($context, array $args)
     {
         $metadata = $this->em
-                    ->getClassMetadata(AccompanyingPeriod::class);
+                    ->getClassMetadata('ChillPersonBundle:AccompanyingPeriod');
         
-        $query = $this->basicFetchQuery($context, $args);
+        $data = $this->basicFetchQuery($context, $args);
         
-        $query->setKey('accompanying_period_opening')
+        $data['type'] = 'accompanying_period_opening';
-            ->setDate($metadata->getColumnName('openingDate'));
+        $data['date'] = $metadata->getColumnName('openingDate');
         
-        return $query;
+        return $data;
     }
 
     /**

src/Bundle/ChillPersonBundle/config/services.yaml

@@ -16,23 +16,17 @@ services:
         class: Chill\PersonBundle\Timeline\TimelineAccompanyingPeriodOpening
         arguments:
             - "@doctrine.orm.entity_manager"
-            - '@Symfony\Component\Security\Core\Security'
-            - '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
         public: true
         tags:
             - { name: chill.timeline, context: 'person' }
-            - { name: chill.timeline, context: 'center' }
 
     chill.person.timeline.accompanying_period_closing:
         class: Chill\PersonBundle\Timeline\TimelineAccompanyingPeriodClosing
         arguments:
             - "@doctrine.orm.entity_manager"
-            - '@Symfony\Component\Security\Core\Security'
-            - '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
         public: true
         tags:
             - { name: chill.timeline, context: 'person' }
-            - { name: chill.timeline, context: 'center' }
 
     chill.person.security.authorization.person:
         class: Chill\PersonBundle\Security\Authorization\PersonVoter

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

@@ -16,7 +16,6 @@ services:
             $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
             $timelineBuilder: '@chill_main.timeline_builder'
             $paginatorFactory: '@chill_main.paginator_factory'
-            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
         tags: ['controller.service_arguments']
 
     Chill\PersonBundle\Controller\AccompanyingPeriodController:

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

@@ -2,7 +2,6 @@ services:
     Chill\PersonBundle\Templating\Entity\PersonRender:
         arguments:
             $configAltNamesHelper: '@Chill\PersonBundle\Config\ConfigPersonAltNamesHelper'
-            $engine: '@Symfony\Component\Templating\EngineInterface'
         tags:
             - 'chill.render_entity'
             

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

@@ -150,8 +150,6 @@ Update accompanying period: Mettre à jour une période d'accompagnement
 'Closing motive': 'Motif de clôture'
 'Person details': 'Détails de la personne'
 'Update details for %name%': 'Modifier détails de %name%'
-An accompanying period ends: Une periode d'accompagnement se clôture
-An accompanying period starts: Une période d'accompagnement est ouverte
 Any accompanying periods are open: Aucune période d'accompagnement ouverte
 An accompanying period is open: Une période d'accompagnement est ouverte
 Accompanying period list: Périodes d'accompagnement
@@ -164,10 +162,11 @@ Pediod closing form is not valid: Le formulaire n'est pas valide
 Accompanying user: Accompagnant
 No accompanying user: Aucun accompagnant
 No data given: Pas d'information
-Participants: Personnes impliquées
 # pickAPersonType
 Pick a person: Choisir une personne
 
+#address
+Since %date%: Depuis le %date%
 No address given: Pas d'adresse renseignée
 The address has been successfully updated: L'adresse a été mise à jour avec succès
 Update address for %name%: Mettre à jour une adresse pour %name%

src/Bundle/ChillReportBundle/Resources/views/Timeline/report_person_context.html.twig

@@ -1,9 +1,9 @@
 <div class="report_entry">
-  <h3>{{ report.date|format_date('long')  }}<span class="report"> / {{ 'Report'|trans }}</span>{% if 'person' != context %} / {{ report.person|chill_entity_render_box }}{% endif %}</h3>
+    <h3>{{ report.date|format_date('long')  }}<span class="report"> / {{ 'Report'|trans }}</span></h3>
     <div class="statement">
         <span class="statement">{{ '%user% has filled a %report_label% report'|trans(
            { 
-             '%user%' : report.user, 
+             '%user%' : user, 
              '%report_label%': report.CFGroup.name|localize_translatable_string, 
              '%date%' : report.date|format_date('long') }
         ) }}</span>
@@ -25,13 +25,13 @@
      
      <ul class="record_actions">
         <li>
-            <a href="{{ path('report_view', { 'person_id': report.person.id, 'report_id': report.id} ) }}" class="sc-button bt-view">
+            <a href="{{ path('report_view', { 'person_id': person.id, 'report_id': report.id} ) }}" class="sc-button bt-view">
                 {{ 'View the report'|trans }}
             </a>
         </li>
         {% if is_granted('CHILL_REPORT_UPDATE', report) %}
         <li>
-            <a href="{{ path('report_edit', { 'person_id': report.person.id, 'report_id': report.id} ) }}" class="sc-button bt-edit">
+            <a href="{{ path('report_edit', { 'person_id': person.id, 'report_id': report.id} ) }}" class="sc-button bt-edit">
                 {{ 'Update the report'|trans }}
             </a>
         </li>

src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php

@@ -30,34 +30,71 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Entity\Scope;
 use Chill\CustomFieldsBundle\Service\CustomFieldsHelper;
 use Chill\ReportBundle\Entity\Report;
-use Symfony\Component\Security\Core\Security;
-use Chill\MainBundle\Timeline\TimelineSingleQuery;
 
 /**
  * Provide report for inclusion in timeline
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @author Champs Libres <info@champs-libres.coop>
  */
 class TimelineReportProvider implements TimelineProviderInterface
 {
     
-    protected EntityManager $em;
+    /**
+     *
+     * @var EntityManager
+     */
+    protected $em;
     
-    protected AuthorizationHelper $helper;
+    /**
+     *
+     * @var AuthorizationHelper
+     */
+    protected $helper;
     
-    protected CustomFieldsHelper $customFieldsHelper;
+    /**
+     *
+     * @var \Chill\MainBundle\Entity\User 
+     */
+    protected $user;
     
+    /**
+     *
+     * @var CustomFieldsHelper
+     */
+    protected $customFieldsHelper;
+    
+    /**
+     * @var
+     */
     protected $showEmptyValues;
     
+    /**
+     * TimelineReportProvider constructor.
+     *
+     * @param EntityManager $em
+     * @param AuthorizationHelper $helper
+     * @param TokenStorageInterface $storage
+     * @param CustomFieldsHelper $customFieldsHelper
+     * @param $showEmptyValues
+     */
     public function __construct(
         EntityManager $em,
         AuthorizationHelper $helper,
-        Security $security,
+        TokenStorageInterface $storage,
         CustomFieldsHelper $customFieldsHelper,
         $showEmptyValues
     )
     {
         $this->em = $em;
         $this->helper = $helper;
-        $this->security = $security;
+        
+        if (!$storage->getToken()->getUser() instanceof \Chill\MainBundle\Entity\User)
+        {
+            throw new \RuntimeException('A user should be authenticated !');
+        }
+        
+        $this->user = $storage->getToken()->getUser();
         $this->customFieldsHelper = $customFieldsHelper;
         $this->showEmptyValues = $showEmptyValues;
     }
@@ -70,163 +107,71 @@ class TimelineReportProvider implements TimelineProviderInterface
     {
         $this->checkContext($context);
         
-        $report = $this->em->getClassMetadata(Report::class);
+        $metadataReport = $this->em->getClassMetadata('ChillReportBundle:Report');
-        [$where, $parameters] = $this->getWhereClause($context, $args);
+        $metadataPerson = $this->em->getClassMetadata('ChillPersonBundle:Person');
-
+        
-        return TimelineSingleQuery::fromArray([
+        return array(
-           'id' => $report->getTableName()
+           'id' => $metadataReport->getTableName()
-                .'.'.$report->getColumnName('id'),
+                .'.'.$metadataReport->getColumnName('id'),
            'type' => 'report',
-           'date' => $report->getTableName()
+           'date' => $metadataReport->getTableName()
-                .'.'.$report->getColumnName('date'),
+                .'.'.$metadataReport->getColumnName('date'),
-           'FROM' => $this->getFromClause($context),
+           'FROM' => $this->getFromClause($metadataReport, $metadataPerson),
-           'WHERE' => $where,
+           'WHERE' => $this->getWhereClause($metadataReport, $metadataPerson,
-           'parameters' => $parameters
+                   $args['person'])
-       ]);
-    }
-    
-    private function getWhereClause(string $context, array $args): array
-    {
-        switch ($context) {
-            case 'person':
-                return $this->getWhereClauseForPerson($context, $args);
-            case 'center':
-                return $this->getWhereClauseForCenter($context, $args);
-            default:
-                throw new \UnexpectedValueException("This context $context is not implemented");
-        }
-    }
-
-    private function getWhereClauseForCenter(string $context, array $args): array
-    {
-        $report = $this->em->getClassMetadata(Report::class);
-        $person = $this->em->getClassMetadata(Person::class);
-        $role = new Role('CHILL_REPORT_SEE');
-        $reachableCenters = $this->helper->getReachableCenters($this->security->getUser(), 
-                $role);
-        $reportPersonId = $report->getAssociationMapping('person')['joinColumns'][0]['name'];
-        $reportScopeId = $report->getAssociationMapping('scope')['joinColumns'][0]['name'];
-        $personCenterId = $person->getAssociationMapping('center')['joinColumns'][0]['name'];
-        // parameters for the query, will be filled later
-        $parameters = [];
-
-        // the clause, that will be joined with an "OR"
-        $centerScopesClause = "({person}.{center_id} = ? ".
-            "AND {report}.{scopes_id} IN ({scopes_ids}))";
-        // container for formatted clauses
-        $formattedClauses = [];
-
-        $askedCenters = $args['centers'];
-        foreach ($reachableCenters as $center) {
-            if (FALSE === \in_array($center, $askedCenters)) {
-                continue;
-            }
-
-            // add the center id to the parameters
-            $parameters[] = $center->getId(); 
-            // loop over scopes
-            $scopeIds = [];
-            foreach ($this->helper->getReachableScopes($this->security->getUser(), 
-                $role, $center) as $scope) {
-                if (\in_array($scope->getId(), $scopeIds)) {
-                    continue; 
-                }
-                $scopeIds[] = $scope->getId();
-            }
-
-            $formattedClauses[] = \strtr($centerScopesClause, [
-                '{scopes_ids}' => \implode(', ', \array_fill(0, \count($scopeIds), '?'))
-            ]);
-            // append $scopeIds to parameters
-            $parameters = \array_merge($parameters, $scopeIds);
-        }
-
-        if (0 === count($formattedClauses)) {
-            return [ 'FALSE = TRUE', [] ];
-        }
-
-        return [
-            \strtr(
-                \implode(' OR ', $formattedClauses),
-                [
-                    '{person}' => $person->getTableName(),
-                    '{center_id}' => $personCenterId,
-                    '{report}' => $report->getTableName(),
-                    '{scopes_id}' => $reportScopeId,
-                ]
-            ),
-            $parameters
-        ];
-    }
-
-    private function getWhereClauseForPerson(string $context, array $args): array
-    {
-        $report = $this->em->getClassMetadata(Report::class);
-        $person = $this->em->getClassMetadata(Person::class);
-        $role = new Role('CHILL_REPORT_SEE');
-        $reportPersonId = $report->getAssociationMapping('person')['joinColumns'][0]['name'];
-        $reportScopeId = $report->getAssociationMapping('scope')['joinColumns'][0]['name'];
-        $personCenterId = $person->getAssociationMapping('center')['joinColumns'][0]['name'];
-        // parameters for the query, will be filled later
-        $parameters = [ $args['person']->getId() ];
-
-        // this is the final clause  that we are going to fill
-        $clause = "{report}.{person_id} = ? AND {report}.{scopes_id} IN ({scopes_ids})";
-        // iterate over reachable scopes
-        $scopes = $this->helper->getReachableScopes($this->security->getUser(), $role, 
-            $args['person']->getCenter());
-
-        foreach ($scopes as $scope) {
-            if (\in_array($scope->getId(), $parameters)) {
-                continue;
-            }
-
-            $parameters[] = $scope->getId();
-        }
-
-        if (1 === count($parameters)) {
-            // nothing change, we simplify the clause
-            $clause = "{report}.{person_id} = ? AND FALSE = TRUE";
-        }
-
-        return [
-            \strtr(
-                $clause,
-                [
-                    '{report}' => $report->getTableName(),
-                    '{person_id}' => $reportPersonId, 
-                    '{scopes_id}' => $reportScopeId,
-                    '{scopes_ids}' => \implode(', ', 
-                        \array_fill(0, \count($parameters)-1, '?'))
-                ]
-            ),
-            $parameters
-        ];
-    }
-    
-    private function getFromClause(string $context): string
-    {
-        $report = $this->em->getClassMetadata(Report::class);
-        $person = $this->em->getClassMetadata(Person::class);
-        $reportPersonId = $report
-            ->getAssociationMapping('person')['joinColumns'][0]['name']
-            ;
-        $personId = $report
-            ->getAssociationMapping('person')['joinColumns'][0]['referencedColumnName']
-            ;
-
-        $clause = "{report} ".
-            "JOIN {person} ON {report}.{person_id} = {person}.{id_person} ";
-
-        return \strtr($clause,
-            [
-                '{report}' => $report->getTableName(),
-                '{person}' => $person->getTableName(),
-                '{person_id}' => $reportPersonId,
-                '{id_person}' => $personId
-            ]
         );
     }
+    
+    private function getWhereClause(ClassMetadata $metadataReport, 
+            ClassMetadata $metadataPerson, Person $person)
+    {
+        $role = new Role('CHILL_REPORT_SEE');
+        $reachableCenters = $this->helper->getReachableCenters($this->user, 
+                $role);
+        $associationMapping = $metadataReport->getAssociationMapping('person');
+        
+        // we start with reports having the person_id linked to person 
+        // (currently only context "person" is supported)
+        $whereClause = sprintf('%s = %d',
+                 $associationMapping['joinColumns'][0]['name'],
+                 $person->getId());
+        
+        // we add acl (reachable center and scopes)
+        $centerAndScopeLines = array();
+        foreach ($reachableCenters as $center) {
+            $reachablesScopesId = array_map(
+                    function(Scope $scope) { return $scope->getId(); },
+                    $this->helper->getReachableScopes($this->user, $role, 
+                        $person->getCenter())
+                );
+                    
+            $centerAndScopeLines[] = sprintf('(%s = %d AND %s IN (%s))',
+                    $metadataPerson->getTableName().'.'.
+                        $metadataPerson->getAssociationMapping('center')['joinColumns'][0]['name'],
+                    $center->getId(),
+                    $metadataReport->getTableName().'.'.
+                        $metadataReport->getAssociationMapping('scope')['joinColumns'][0]['name'],
+                    implode(',', $reachablesScopesId));
+            
+        }
+        $whereClause .= ' AND ('.implode(' OR ', $centerAndScopeLines).')';
+        
+        return $whereClause;
+    }
+    
+    private function getFromClause(ClassMetadata $metadataReport,
+            ClassMetadata $metadataPerson)
+    {
+        $associationMapping = $metadataReport->getAssociationMapping('person');
+        
+        return $metadataReport->getTableName().' JOIN '
+            .$metadataPerson->getTableName().' ON '
+            .$metadataPerson->getTableName().'.'.
+                $associationMapping['joinColumns'][0]['referencedColumnName']
+            .' = '
+            .$associationMapping['joinColumns'][0]['name']
+            ;
+    }
 
     /**
      * 
@@ -254,11 +199,12 @@ class TimelineReportProvider implements TimelineProviderInterface
         $this->checkContext($context);
         
         return array(
-           'template' => 'ChillReportBundle:Timeline:report.html.twig',
+           'template' => 'ChillReportBundle:Timeline:report_person_context.html.twig',
            'template_data' => array(
-               'report' => $entity,
+              'report' => $entity,
-               'context' => $context,
+              'custom_fields_in_summary' => $this->getFieldsToRender($entity, $context),
-               'custom_fields_in_summary' => $this->getFieldsToRender($entity, $context),
+              'person' => $args['person'],
+              'user' => $entity->getUser()
            )
         );
     }
@@ -326,9 +272,9 @@ class TimelineReportProvider implements TimelineProviderInterface
      */
     private function checkContext($context)
     {
-        if ($context !== 'person' && $context !== 'center') {
+        if ($context !== 'person') {
             throw new \LogicException("The context '$context' is not "
-                  . "supported. Currently only 'person' and 'center' is supported");
+                  . "supported. Currently only 'person' is supported");
         }
     }
 

src/Bundle/ChillReportBundle/config/services.yaml

@@ -20,12 +20,11 @@ services:
         arguments:
             - '@doctrine.orm.entity_manager'
             - '@chill.main.security.authorization.helper'
-            - '@Symfony\Component\Security\Core\Security'
+            - '@security.token_storage'
             - '@chill.custom_field.helper'
             - '%chill_custom_fields.show_empty_values%'
         tags:
             - { name: chill.timeline, context: 'person' }
-            - { name: chill.timeline, context: 'center' }
             
     chill.report.security.authorization.report_voter:
         class: Chill\ReportBundle\Security\Authorization\ReportVoter
@@ -44,4 +43,4 @@ services:
             - "@doctrine.orm.entity_manager"
         tags:
             - { name: form.type, alias: chill_reportbundle_report }
-            
+            

src/Bundle/ChillTaskBundle/Resources/views/Timeline/single_task_transition_person_context.html.twig

@@ -7,9 +7,6 @@
         {% else %}
             <span class="statement">{{ '%user% has created the task'|trans({ '%user%': event.author.username }) }}</span> 
         {% endif %}
-        {% if 'person' != context %}
-          / {{ task.person|chill_entity_render_box({'addLink': true}) }}
-        {% endif %}
     </h3>
     
     <div class="statement">
@@ -32,17 +29,5 @@
                 {% endif %}
             </dl>
     </div>
-    <ul class="record_actions">
-      <li>
-        <a href="{{ chill_path_add_return_path('chill_task_single_task_show', { 'id' : task.id }, false, 'Back to the timeline'|trans ) }}" class="sc-button bt-show">
-          {{ "View the task"|trans }}
-        </a>
-      </li>
-      <li>
-        <a href="{{ chill_path_add_return_path('chill_task_single_task_edit', { 'id' : task.id }, false, 'Back to the timeline'|trans) }}" class="sc-button bt-update">
-          {{ "Edit task"|trans }}
-        </a>
-      </li>
-    </ul>
         
 </div>

src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php

@@ -18,7 +18,6 @@
 namespace Chill\TaskBundle\Timeline;
 
 use Chill\MainBundle\Timeline\TimelineProviderInterface;
-use Chill\MainBundle\Timeline\TimelineSingleQuery;
 use Doctrine\ORM\EntityManagerInterface;
 use Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent;
 use Chill\TaskBundle\Entity\SingleTask;
@@ -26,8 +25,9 @@ use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\Workflow;
 
 /**
- * Provide timeline elements related to tasks, in tasks context
  *
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class SingleTaskTaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
 {
@@ -63,7 +63,7 @@ class SingleTaskTaskLifeCycleEventTimelineProvider implements TimelineProviderIn
         $singleTaskMetadata = $this->em
             ->getClassMetadata(SingleTask::class);
 
-        return TimelineSingleQuery::fromArray([
+        return [
             'id' => sprintf('%s.%s.%s', $metadata->getSchemaName(), $metadata->getTableName(), $metadata->getColumnName('id')),
             'type' => self::TYPE,
             'date' => $metadata->getColumnName('datetime'),
@@ -77,9 +77,8 @@ class SingleTaskTaskLifeCycleEventTimelineProvider implements TimelineProviderIn
                 sprintf('%s.%s', $singleTaskMetadata->getSchemaName(), $singleTaskMetadata->getTableName()),
                 $singleTaskMetadata->getColumnName('id'),
                 $args['task']->getId()
-                ),
+                )
-            'parameters' => [],
+        ];
-        ]);
 
     }
 

src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php

@@ -21,30 +21,43 @@ use Chill\MainBundle\Timeline\TimelineProviderInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Chill\TaskBundle\Entity\Task\SingleTaskPlaceEvent;
 use Chill\TaskBundle\Entity\SingleTask;
-use Chill\PersonBundle\Entity\Person;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Workflow\Registry;
 use Symfony\Component\Workflow\Workflow;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Symfony\Component\Security\Core\Role\Role;
-use Chill\MainBundle\Timeline\TimelineSingleQuery;
 
 /**
- * Provide element for timeline for 'person' and 'center' context
+ * 
  *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
 {
-    protected EntityManagerInterface $em;
+    /**
+     *
+     * @var EntityManagerInterface
+     */
+    protected $em;
     
-    protected Registry $registry;
+    /**
+     *
+     * @var Registry
+     */
+    protected $registry;
     
-    protected AuthorizationHelper $authorizationHelper;
+    /**
-
+     *
-    protected Security $security;
+     * @var AuthorizationHelper
+     */
+    protected $authorizationHelper;
     
+    /**
+     *
+     * @var TokenStorageInterface
+     */
+    protected $tokenStorage;
     
     const TYPE = 'chill_task.transition';
     
@@ -52,172 +65,60 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
         EntityManagerInterface $em, 
         Registry $registry,
         AuthorizationHelper $authorizationHelper,
-        Security $security
+        TokenStorageInterface $tokenStorage
     ) {
         $this->em = $em;
         $this->registry = $registry;
         $this->authorizationHelper = $authorizationHelper;
-        $this->security = $security;
+        $this->tokenStorage = $tokenStorage;
     }
 
     public function fetchQuery($context, $args)
     {
+        if ($context !== 'person') {
+            throw new \LogicException(sprintf('%s is not able '
+                    . 'to render context %s', self::class, $context));
+        }
+        
         $metadata = $this->em
             ->getClassMetadata(SingleTaskPlaceEvent::class);
+        $singleTaskMetadata = $this->em
+            ->getClassMetadata(SingleTask::class);
+        $user = $this->tokenStorage->getToken()->getUser();
+        $circles = $this->authorizationHelper->getReachableCircles(
+            $user, new Role(ActivityVoter::SEE_DETAILS), $args['person']->getCenter());
         
-        switch ($context) {
+        
-            case 'person':
+        if (count($circles) > 0) {
-                [ $where, $parameters ] = $this->getWhereClauseForPerson($args['person']);
+            $circlesId = \array_map(function($c) { return $c->getId(); }, $circles);
-                break;
+            $circleRestriction = sprintf('%s.%s.%s IN (%s)', 
-            case 'center':
+                $singleTaskMetadata->getSchemaName(), // chill_task schema
-                [ $where, $parameters ] = $this->getWhereClauseForCenter($args['centers']);
+                $singleTaskMetadata->getTableName(), // single_task table name
-                break;
+                $singleTaskMetadata->getAssociationMapping('circle')['joinColumns'][0]['name'],
-            default:
+                \implode(', ', $circlesId)
-                throw new \UnexpectedValueException("context {$context} is not supported");
+                );
+        } else {
+            $circleRestriction = 'FALSE = TRUE';
         }
-
+        
-        return TimelineSingleQuery::fromArray([
+        
+        return [
             'id' => sprintf('%s.%s.%s', $metadata->getSchemaName(), $metadata->getTableName(), $metadata->getColumnName('id')),
             'type' => self::TYPE,
             'date' => $metadata->getColumnName('datetime'),
-            'FROM' => $this->getFromClause($context),
+            'FROM' => sprintf('%s JOIN %s ON %s = %s', 
-            'WHERE' => $where,
+                sprintf('%s.%s', $metadata->getSchemaName(), $metadata->getTableName()),
-            'parameters' => $parameters
+                sprintf('%s.%s', $singleTaskMetadata->getSchemaName(), $singleTaskMetadata->getTableName()),
-        ]);
+                $metadata->getAssociationMapping('task')['joinColumns'][0]['name'],
-    }
+                sprintf('%s.%s.%s', $singleTaskMetadata->getSchemaName(), $singleTaskMetadata->getTableName(), $singleTaskMetadata->getColumnName('id'))
-
+                ),
-    private function getWhereClauseForCenter(array $centers): array
+            'WHERE' => sprintf('%s.%s = %d and %s',
-    {
+                sprintf('%s.%s', $singleTaskMetadata->getSchemaName(), $singleTaskMetadata->getTableName()),
-        $taskEvent = $this->em->getClassMetadata(SingleTaskPlaceEvent::class);
+                $singleTaskMetadata->getAssociationMapping('person')['joinColumns'][0]['name'],
-        $singleTask = $this->em->getClassMetadata(SingleTask::class);
+                $args['person']->getId(),
-        $person = $this->em->getClassMetadata(Person::class);
+                $circleRestriction
-        $personFkCenter = $person->getAssociationMapping('center')['joinColumns'][0]['name'];
+                )
-        $taskFkCircle = $singleTask->getAssociationMapping('circle')['joinColumns'][0]['name'];
-
-        // the parameters
-        $parameters = [];
-
-        // the clause that we will repeat for each center, joined by 'OR'
-        $clause = "{person}.{center_id} = ? AND {task}.{circle} IN ({circle_ids})";
-
-        // array to gather clauses
-        $clauses = [];
-
-        // loop over centers
-        foreach ($this->authorizationHelper->getReachableCenters(
-            $this->security->getUser(), new Role(ActivityVoter::SEE_DETAILS)) as $center) {
-
-            if (FALSE === \in_array($center, $centers)) {
-                continue;
-            }
-
-            // fill center parameter
-            $parameters[] = $center->getId();
-
-            // we loop over circles
-            $circles = $this->authorizationHelper->getReachableCircles(
-                $this->security->getUser(), new Role(ActivityVoter::SEE_DETAILS), $center);
-            $circleIds = [];
-
-            foreach ($circles as $circle) {
-                $parameters[] = $circleIds[] = $circle->getId();
-            }
-
-            $clauses[] = \strtr(
-                $clause,
-                [
-                    '{person}' => $person->getTableName(),
-                    '{center_id}' => $personFkCenter,
-                    '{task}' => $singleTask->getSchemaName().".".$singleTask->getTableName(),
-                    '{circle}' => $taskFkCircle,
-                    '{circle_ids}' => \implode(', ', \array_fill(0, count($circleIds), '?'))
-                ]
-            );
-        }
-
-        if (0 === \count($clauses)) {
-            return [ 'FALSE = TRUE' , [] ];
-        }
-
-        return [
-            \implode(' OR ', $clauses),
-            $parameters
         ];
-    }
-
-    private function getWhereClauseForPerson(Person $personArg): array
-    {
-        $taskEvent = $this->em->getClassMetadata(SingleTaskPlaceEvent::class);
-        $singleTask = $this->em->getClassMetadata(SingleTask::class);
-        $person = $this->em->getClassMetadata(Person::class);
-        $eventFkTask = $taskEvent->getAssociationMapping('task')['joinColumns'][0]['name'];
-        $taskFkPerson = $singleTask->getAssociationMapping('person')['joinColumns'][0]['name'];
-        $personPk = $singleTask->getAssociationMapping('person')['joinColumns'][0]['referencedColumnName'];
-        $taskFkCircle = $singleTask->getAssociationMapping('circle')['joinColumns'][0]['name'];
-
-
-        // the parameters
-        $parameters = [];
-
-        // the clause that we will fill
-        $clause = "{person}.{person_id} = ? AND {task}.{circle} IN ({circle_ids})";
-
-        // person is the first parameter
-        $parameters[] = $personArg->getId();
-
-        // we loop over circles
-        $circles = $this->authorizationHelper->getReachableCircles(
-            $this->security->getUser(), new Role(ActivityVoter::SEE_DETAILS), $personArg->getCenter());
-
-        if (0 === count($circles)) {
-            // go fast to block access to every tasks
-            return [ "FALSE = TRUE", [] ];
-        }
-
-        foreach ($circles as $circle) {
-            $parameters[] = $circleIds[] = $circle->getId();
-        }
-
-        return [
-            \strtr(
-                $clause,
-                [
-                    '{person}' => $person->getTableName(),
-                    '{person_id}' => $person->getColumnName('id'),
-                    '{task}' => $singleTask->getSchemaName().".".$singleTask->getTableName(),
-                    '{circle}' => $taskFkCircle,
-                    '{circle_ids}' => \implode(', ', \array_fill(0, count($circleIds), '?'))
-                ]
-            ),
-            $parameters
-        ];
-    }
-
-    private function getFromClause(string $context)
-    {
-        $taskEvent = $this->em->getClassMetadata(SingleTaskPlaceEvent::class);
-        $singleTask = $this->em->getClassMetadata(SingleTask::class);
-        $person = $this->em->getClassMetadata(Person::class);
-        $eventFkTask = $taskEvent->getAssociationMapping('task')['joinColumns'][0]['name'];
-        $taskFkPerson = $singleTask->getAssociationMapping('person')['joinColumns'][0]['name'];
-        $personPk = $singleTask->getAssociationMapping('person')['joinColumns'][0]['referencedColumnName'];
-
-        $from = "{single_task_event} ".
-            "JOIN {single_task} ON {single_task}.{task_pk} = {single_task_event}.{event_fk_task} ".
-            "JOIN {person} ON {single_task}.{task_person_fk} = {person}.{person_pk}";
-
-        return \strtr(
-            $from,
-            [
-                '{single_task}' => sprintf('%s.%s', $singleTask->getSchemaName(), $singleTask->getTableName()),
-                '{single_task_event}' => sprintf('%s.%s', $taskEvent->getSchemaName(), $taskEvent->getTableName()),
-                '{task_pk}' => $singleTask->getColumnName('id'),
-                '{event_fk_task}' => $eventFkTask, 
-                '{person}' => $person->getTableName(),
-                '{task_person_fk}' => $taskFkPerson,
-                '{person_pk}' => $personPk 
-            ]
-        );
     } 
     
     public function getEntities(array $ids) 
@@ -246,11 +147,10 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
         $transition = $this->getTransitionByName($entity->getTransition(), $workflow);
         
         return [
-            'template' => 'ChillTaskBundle:Timeline:single_task_transition.html.twig',
+            'template' => 'ChillTaskBundle:Timeline:single_task_transition_person_context.html.twig',
             'template_data' => [ 
-                'context' => $context,
+                'person' => $args['person'],
                 'event' => $entity,
-                'task' => $entity->getTask(),
                 'transition' => $transition
             ]
         ];

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

@@ -4,11 +4,10 @@ services:
             $em: '@Doctrine\ORM\EntityManagerInterface'
             $registry: '@Symfony\Component\Workflow\Registry'
             $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
-            $security: '@Symfony\Component\Security\Core\Security'
+            $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
         public: true
         tags:
             - { name: 'chill.timeline', context: 'person' }
-            - { name: 'chill.timeline', context: 'center' }
             
     Chill\TaskBundle\Timeline\SingleTaskTaskLifeCycleEventTimelineProvider:
         arguments: