From 912f7d32118c268e207794db0950f3e9c158256a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 13 Dec 2023 16:06:44 +0100 Subject: [PATCH] remove some deprecations --- .../PersistNotificationOnTerminateEventSubscriber.php | 2 +- .../ChillMainBundle/Resources/views/Menu/user.html.twig | 4 ++-- .../PersistNotificationOnTerminateEventSubscriberTest.php | 2 +- .../Workflow/WorkflowEventSubscriberTest.php | 0 .../Tests/Controller/PersonControllerUpdateTest.php | 2 +- .../Tests/Controller/RelationshipApiControllerTest.php | 6 +++--- ...rationAPWorkPersonAssociatedOnAccompanyingPeriodTest.php | 4 +++- 7 files changed, 11 insertions(+), 9 deletions(-) delete mode 100644 src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Workflow/WorkflowEventSubscriberTest.php diff --git a/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php b/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php index 74c784b4b..3268fee05 100644 --- a/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php +++ b/src/Bundle/ChillMainBundle/Notification/EventListener/PersistNotificationOnTerminateEventSubscriber.php @@ -31,7 +31,7 @@ class PersistNotificationOnTerminateEventSubscriber implements EventSubscriberIn public function onKernelTerminate(TerminateEvent $event): void { - if ($event->isMasterRequest()) { + if ($event->isMainRequest()) { $this->persistNotifications(); } } diff --git a/src/Bundle/ChillMainBundle/Resources/views/Menu/user.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Menu/user.html.twig index 00a50c6e3..52be8b50f 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Menu/user.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Menu/user.html.twig @@ -31,7 +31,7 @@ {{ render(controller('Chill\\MainBundle\\Controller\\UIController::showNotificationUserCounterAction')) }} - {% if is_granted('ROLE_PREVIOUS_ADMIN') %} + {% if is_granted('IS_IMPERSONATOR') %} {% endif %} @@ -39,7 +39,7 @@
{% for menu in menus %} - {% if is_granted('ROLE_PREVIOUS_ADMIN') and menu.name == 'Logout' %} + {% if is_granted('IS_IMPERSONATOR') and menu.name == 'Logout' %} {{ 'Exit impersonation'|trans }} diff --git a/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php b/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php index 4fd07643c..00de7394d 100644 --- a/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Notification/EventListener/PersistNotificationOnTerminateEventSubscriberTest.php @@ -36,7 +36,7 @@ final class PersistNotificationOnTerminateEventSubscriberTest extends TestCase $em->persist(Argument::type(Notification::class))->shouldBeCalledTimes(1); $em->flush()->shouldBeCalledTimes(1); $event = $this->prophesize(TerminateEvent::class); - $event->isMasterRequest()->willReturn(true); + $event->isMainRequest()->willReturn(true); $eventSubscriber = new PersistNotificationOnTerminateEventSubscriber($em->reveal(), $persister); diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Workflow/WorkflowEventSubscriberTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/Workflow/WorkflowEventSubscriberTest.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php index d1ef1f1c9..7686c2028 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php @@ -112,7 +112,7 @@ final class PersonControllerUpdateTest extends WebTestCase /** * Test the edit page are accessible. * - * @dataProvider providePerson * + * @dataProvider providePerson */ public function testEditPageIsSuccessful(int $personId) { diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php index 171dedacb..626e1469b 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/RelationshipApiControllerTest.php @@ -50,7 +50,7 @@ final class RelationshipApiControllerTest extends WebTestCase ->join('p.centerCurrent', 'center_current') ->join('center_current.center', 'c') ->where('c.name LIKE :name') - ->andWhere('EXISTS (SELECT 1 FROM ' . Relationship::class . ' r WHERE r.fromPerson = p OR r.toPerson = p)') + ->andWhere('EXISTS (SELECT 1 FROM '.Relationship::class.' r WHERE r.fromPerson = p OR r.toPerson = p)') ->setParameter('name', 'Center A') ->getQuery() ->setMaxResults(1) @@ -62,7 +62,7 @@ final class RelationshipApiControllerTest extends WebTestCase ->join('p.centerCurrent', 'center_current') ->join('center_current.center', 'c') ->where('c.name LIKE :name') - ->andWhere('NOT EXISTS (SELECT 1 FROM ' . Relationship::class . ' r WHERE r.fromPerson = p OR r.toPerson = p)') + ->andWhere('NOT EXISTS (SELECT 1 FROM '.Relationship::class.' r WHERE r.fromPerson = p OR r.toPerson = p)') ->setParameter('name', 'Center A') ->getQuery() ->setMaxResults(1) @@ -85,7 +85,7 @@ final class RelationshipApiControllerTest extends WebTestCase ->join('p.centerCurrent', 'center_current') ->join('center_current.center', 'c') ->where('c.name LIKE :name') - ->andWhere('NOT EXISTS (SELECT 1 FROM ' . Relationship::class . ' r WHERE r.fromPerson = p OR r.toPerson = p)') + ->andWhere('NOT EXISTS (SELECT 1 FROM '.Relationship::class.' r WHERE r.fromPerson = p OR r.toPerson = p)') ->setParameter('name', 'Center A') ->getQuery() ->setMaxResults(2) diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Export/AvgDurationAPWorkPersonAssociatedOnAccompanyingPeriodTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Export/AvgDurationAPWorkPersonAssociatedOnAccompanyingPeriodTest.php index bd1bbdfd4..c45aafdfa 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Export/Export/AvgDurationAPWorkPersonAssociatedOnAccompanyingPeriodTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Export/Export/AvgDurationAPWorkPersonAssociatedOnAccompanyingPeriodTest.php @@ -38,7 +38,9 @@ class AvgDurationAPWorkPersonAssociatedOnAccompanyingPeriodTest extends Abstract public function getFormData() { - return []; + return [ + [], + ]; } public function getModifiersCombination()