From f94fb0efc15cc6007a96547c87edaf9d32c06b7a Mon Sep 17 00:00:00 2001
From: Tchama <mat@collectifs.net>
Date: Tue, 4 Aug 2020 11:33:56 +0200
Subject: [PATCH] enable and fix errors for event bundle + adding
 knp-time-bundle

---
 DependencyInjection/Configuration.php                 | 4 ++--
 Resources/translations/messages.fr.yml                | 1 -
 Resources/views/Event/show.html.twig                  | 5 ++++-
 Resources/views/Participation/edit-multiple.html.twig | 5 ++++-
 Timeline/TimelineEventProvider.php                    | 6 +++---
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 26441ce71..14cbddafe 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -17,8 +17,8 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('chill_event');
+        $treeBuilder = new TreeBuilder('chill_event');
+        $rootNode = $treeBuilder->getRootNode('chill_event');
 
         // Here you should define the parameters that are allowed to
         // configure your bundle. See the documentation linked above for
diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml
index 002ffb250..395f25eae 100644
--- a/Resources/translations/messages.fr.yml
+++ b/Resources/translations/messages.fr.yml
@@ -92,7 +92,6 @@ EventType: Types d'événements
 EventType creation: Nouveau type d'événement
 EventType edit: Modifier le type d'événement
 Status list: Liste des statuts
-Status: Statuts
 Status creation: Nouveau statut
 Status edit: Modifier un statut
 Role list: Liste des rôles
diff --git a/Resources/views/Event/show.html.twig b/Resources/views/Event/show.html.twig
index 4690854cc..881cda742 100644
--- a/Resources/views/Event/show.html.twig
+++ b/Resources/views/Event/show.html.twig
@@ -85,7 +85,10 @@
                     <td>{{ person_macro.render(participation.person) }}</td>
                     <td>{{ participation.role.name|localize_translatable_string }}</td>
                     <td>{{ participation.status.name|localize_translatable_string }}</td>
-                    <td>{{ participation.lastUpdate|time_diff }} <i class="fa fa-info-circle" title="{{ participation.lastUpdate|format_date("long", "medium")|escape('html_attr') }}"></i></td>
+                    <td>{{ participation.lastUpdate|ago }} {# sf4 check: filter 'time_diff' is abandoned,
+                         alternative: knplabs/knp-time-bundle provide filter 'ago' #}
+                        <i class="fa fa-info-circle" title="{{ participation.lastUpdate|format_date("long", "medium")|escape('html_attr') }}"></i>
+                    </td>
                     <td>
                         <ul class="record_actions">
                             {% if is_granted('CHILL_EVENT_PARTICIPATION_UPDATE', participation) %}
diff --git a/Resources/views/Participation/edit-multiple.html.twig b/Resources/views/Participation/edit-multiple.html.twig
index 5031544b5..a9acabe47 100644
--- a/Resources/views/Participation/edit-multiple.html.twig
+++ b/Resources/views/Participation/edit-multiple.html.twig
@@ -38,7 +38,10 @@
                         <td>{{ person_macro.render(participation.vars.value.person) }}</td>
                         <td>{{ form_widget(participation.role) }}</td>
                         <td>{{ form_widget(participation.status) }}</td>
-                        <td>{{ participation.vars.value.lastUpdate|time_diff }} <i class="fa fa-info-circle" title="{{ participation.vars.value.lastUpdate|format_date("long", "medium")|escape('html_attr') }}"></i></td>
+                        <td>{{ participation.vars.value.lastUpdate|ago }} {# sf4 check: filter 'time_diff' is abandoned,
+                             alternative: knplabs/knp-time-bundle provide filter 'ago' #}
+                            <i class="fa fa-info-circle" title="{{ participation.vars.value.lastUpdate|format_date("long", "medium")|escape('html_attr') }}"></i>
+                        </td>
                     </tr>
                 {% endfor %}
             </tbody>
diff --git a/Timeline/TimelineEventProvider.php b/Timeline/TimelineEventProvider.php
index b31365b1f..3e7c67562 100644
--- a/Timeline/TimelineEventProvider.php
+++ b/Timeline/TimelineEventProvider.php
@@ -25,7 +25,7 @@ use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Timeline\TimelineProviderInterface;
 use Doctrine\ORM\EntityManager;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Chill\PersonBundle\Entity\Person;
@@ -59,12 +59,12 @@ class TimelineEventProvider implements TimelineProviderInterface
      *
      * @param EntityManager $em
      * @param AuthorizationHelper $helper
-     * @param TokenStorage $storage
+     * @param TokenStorageInterface $storage
      */
     public function __construct(
         EntityManager $em,
         AuthorizationHelper $helper,
-        TokenStorage $storage
+        TokenStorageInterface $storage
     ) {
         $this->em = $em;
         $this->helper = $helper;