Correcrtion des dépréciations Twig

app/config/config.yml

@@ -330,8 +330,6 @@ framework:
     csrf_protection: ~
     validation:      { enable_annotations: true }
     #serializer:      { enable_annotations: true }
-    templating:
-        engines: ['twig']
     default_locale:  "%locale%"
     trusted_hosts:   ~
     session:
@@ -350,6 +348,7 @@ twig:
     globals:
       photo_storage: '@AppBundle\CFP\PhotoStorage'
     form_themes: ['form_theme.html.twig']
+    exception_controller: null
 
 ting:
     connections:

sources/Afup/Utils/Mail.php

@@ -20,7 +20,7 @@ public static function createMailer(): Mailer
 
         return new Mailer(
             new NullLogger(),
-            new Environment(new FilesystemLoader(self::PROJECT_DIR . '/app/Resources/views/')),
+            new Environment(new FilesystemLoader(self::PROJECT_DIR . '/templates/')),
             PhpMailerAdapter::createFromConfiguration($configuration),
             $configuration
         );

sources/AppBundle/Controller/Admin/GetMenuAction.php

@@ -50,7 +50,7 @@ public function __invoke(): Response
             }
         }
 
-        return new Response($this->twig->render(':admin:menu.html.twig', [
+        return new Response($this->twig->render('admin/menu.html.twig', [
             'pages' => $this->backOfficePages,
             'current_group_key' => $currentGroupKey,
             'current_element_key' => $currentElementKey,

sources/AppBundle/Controller/Admin/Planete/FeedAddAction.php

@@ -63,7 +63,7 @@ public function __invoke(Request $request)
             $this->flashBag->add('error', 'Une erreur est survenue lors de l\'ajout du flux');
         }
 
-        return new Response($this->twig->render(':admin/planete:feed_add.html.twig', [
+        return new Response($this->twig->render('admin/planete/feed_add.html.twig', [
             'form' => $form->createView(),
         ]));
     }

sources/AppBundle/Controller/Admin/TechLetter/TechLetterGenerateController.php

@@ -165,7 +165,7 @@ public function generate($techletterId, Request $request)
 
             $mailContent = $this
                 ->render(
-                    ':admin/techletter:mail_template.html.twig',
+                    'admin/techletter/mail_template.html.twig',
                     [
                         'tech_letter' => $techLetter,
                         'preview' => false
@@ -214,7 +214,7 @@ public function generate($techletterId, Request $request)
         }
 
         return $this->render(
-            ':admin/techletter:generate.html.twig',
+            'admin/techletter/generate.html.twig',
             [
                 'title' => "Veille de l'AFUP",
                 'sending' => $sending,
@@ -286,7 +286,7 @@ public function sendTest(Request $request): RedirectResponse
         $techLetter = Techletter\TechLetterFactory::createTechLetterFromJson($sending->getTechletter());
 
         $message = new Message($subject, null, new MailUser($this->techletterTestEmailAddress));
-        $this->mailer->renderTemplate($message,':admin/techletter:mail_template.html.twig', [
+        $this->mailer->renderTemplate($message,'admin/techletter/mail_template.html.twig', [
             'tech_letter' => $techLetter,
             'preview' => false,
         ]);

sources/AppBundle/Controller/Admin/VoteController.php

@@ -50,7 +50,7 @@ public function index($eventSlug, $page = 1, $all = false): Response
     {
         $event = $this->eventActionHelper->getEvent($eventSlug);
         if (!$event->isVoteAvailable()) {
-            return $this->render(':event:cfp/closed.html.twig', ['event' => $event]);
+            return $this->render('event/cfp/closed.html.twig', ['event' => $event]);
         }
 
         /**

sources/AppBundle/Controller/Event/BlogController.php

@@ -41,7 +41,7 @@ public function program(Request $request, $eventSlug): Response
         $now = new \DateTime();
 
         return $this->render(
-            ':blog:program.html.twig',
+            'blog/program.html.twig',
             [
                 'talks' => iterator_to_array($talks),
                 'event' => $event,
@@ -148,7 +148,7 @@ public function planning(Request $request, string $eventSlug): Response
 
 
         return $this->render(
-            ':blog:planning.html.twig',
+            'blog/planning.html.twig',
                 [
                     'planning' => $eventPlanning,
                     'events' => $events,
@@ -183,7 +183,7 @@ public function talkWidget(Request $request): Response
         }
 
         return $this->render(
-            ':blog:talk.html.twig',
+            'blog/talk.html.twig',
             [
                 'talks_infos' => $talksInfos,
                 'speakers' => $speakers,
@@ -204,7 +204,7 @@ public function speakers(Request $request, string $eventSlug): Response
         $jsonld = $this->jsonLd->getDataForEvent($event);
 
         return $this->render(
-            ':blog:speakers.html.twig',
+            'blog/speakers.html.twig',
             [
                 'speakers' => iterator_to_array($speakers),
                 'event' => $event,

sources/AppBundle/Controller/Event/EventController.php

@@ -37,13 +37,13 @@ public function index()
         $events = $eventRepository->getNextEvents();
 
         if ($events === null) {
-            return $this->render(':event:none.html.twig');
+            return $this->render('event/none.html.twig');
         } elseif ($events->count() === 1) {
             $event = $events->first();
             return new RedirectResponse($this->generateUrl('event', ['eventSlug' => $event->getPath()]), Response::HTTP_TEMPORARY_REDIRECT);
         }
 
-        return $this->render(':event:switch.html.twig', ['events' => $events]);
+        return $this->render('event/switch.html.twig', ['events' => $events]);
     }
 
     public function speakerInfosIndex()
@@ -55,7 +55,7 @@ public function speakerInfosIndex()
         $event = $eventRepository->getNextEventForGithubUser($this->getUser());
 
         if ($event === null) {
-            return $this->render(':event:none.html.twig');
+            return $this->render('event/none.html.twig');
         }
 
         return new RedirectResponse($this->generateUrl('speaker-infos', ['eventSlug' => $event->getPath()]), Response::HTTP_TEMPORARY_REDIRECT);
@@ -72,13 +72,13 @@ public function event($eventSlug): Response
 
         if ($event->getDateEndCallForPapers() < $currentDate) {
             if (!$event->isVoteAvailable()) {
-                return $this->render(':event/cfp:closed.html.twig', ['event' => $event]);
+                return $this->render('event/cfp/closed.html.twig', ['event' => $event]);
             }
 
-            return $this->render(':event/cfp:vote_only.html.twig', ['event' => $event, 'talks' => $talks['talks'], 'votes' => $votes['votes']]);
+            return $this->render('event/cfp/vote_only.html.twig', ['event' => $event, 'talks' => $talks['talks'], 'votes' => $votes['votes']]);
         }
 
-        return $this->render(':event:home.html.twig', ['event' => $event, 'talks' => $talks['talks'], 'votes' => $votes['votes']]);
+        return $this->render('event/home.html.twig', ['event' => $event, 'talks' => $talks['talks'], 'votes' => $votes['votes']]);
     }
 
     /**
@@ -129,7 +129,7 @@ public function calendar($eventSlug): Response
             throw $this->createNotFoundException('Event not found');
         }
 
-        return $this->render(':event:calendar.html.twig', ['event' => $event]);
+        return $this->render('event/calendar.html.twig', ['event' => $event]);
     }
 
     /**

sources/AppBundle/Controller/Event/LeadController.php

@@ -69,7 +69,7 @@ public function becomeSponsor($eventSlug, Request $request)
     public function postLead($eventSlug): Response
     {
         $event = $this->eventActionHelper->getEvent($eventSlug);
-        return $this->render(':event/sponsorship_file:thanks.html.twig', ['event' => $event]);
+        return $this->render('event/sponsorship_file/thanks.html.twig', ['event' => $event]);
     }
 
     /**

sources/AppBundle/Controller/Event/SponsorScanController.php

@@ -43,7 +43,7 @@ public function index(Request $request, $eventSlug)
         $scanRepository = $this->repositoryFactory->get(SponsorScanRepository::class);
         $scans = $scanRepository->getBySponsorTicket($sponsorTicket);
 
-        return $this->render(':event/sponsor:scan.html.twig', [
+        return $this->render('event/sponsor/scan.html.twig', [
             'event' => $event,
             'sponsorTicket' => $sponsorTicket,
             'scans' => $scans,
@@ -73,7 +73,7 @@ public function new(Request $request, $eventSlug)
             ]);
         }
 
-        return $this->render(':event/sponsor:scan_new.html.twig', [
+        return $this->render('event/sponsor/scan_new.html.twig', [
             'event' => $event,
             'form' => $form->createView(),
         ]);

sources/AppBundle/Controller/Event/TicketController.php

@@ -119,7 +119,7 @@ public function sponsorTicket(Request $request, $eventSlug)
             return $this->redirectToRoute('sponsor_ticket_home', ['eventSlug' => $eventSlug]);
         }
 
-        return $this->render(':event/ticket:sponsor_home.html.twig', ['event' => $event]);
+        return $this->render('event/ticket/sponsor_home.html.twig', ['event' => $event]);
     }
 
     public function sponsorTicketForm(Request $request, $eventSlug)
@@ -165,7 +165,7 @@ public function sponsorTicketForm(Request $request, $eventSlug)
             // Et qu'il n'y a plus d'invitation
             // ou que la date du sponsoring est pas passée
             if ($ticket->getId() === null && ($sponsorTicket->getPendingInvitations() <= 0 || $event->getDateEndSalesSponsorToken() < new \DateTime())) {
-                return $this->render(':event/ticket:sold_out.html.twig', ['event' => $event]);
+                return $this->render('event/ticket/sold_out.html.twig', ['event' => $event]);
             }
 
             $sponsorTicketHelper->addTicketToSponsor($sponsorTicket, $ticket);
@@ -214,7 +214,7 @@ public function ticket($eventSlug, Request $request)
         $event = $this->eventActionHelper->getEvent($eventSlug);
 
         if ($event->getDateEndSales() < new \DateTime()) {
-            return $this->render(':event/ticket:sold_out.html.twig', ['event' => $event]);
+            return $this->render('event/ticket/sold_out.html.twig', ['event' => $event]);
         }
 
         $purchaseFactory = $this->purchaseTypeFactory;
@@ -313,7 +313,7 @@ public function payment($eventSlug, Request $request): Response
             $this->logger->addWarning(
                 sprintf('Invoice %s already paid, cannot show the paymentAction', $invoiceRef)
             );
-            return $this->render(':event/ticket:payment_already_done.html.twig', ['event' => $event]);
+            return $this->render('event/ticket/payment_already_done.html.twig', ['event' => $event]);
         }
 
         $amount = $invoice->getAmount();
@@ -454,7 +454,7 @@ public function payboxRedirect($eventSlug, Request $request): Response
 
         $payboxResponse = PayboxResponseFactory::createFromRequest($request);
 
-        return $this->render(':event/ticket:paybox_redirect.html.twig', [
+        return $this->render('event/ticket/paybox_redirect.html.twig', [
             'event' => $event,
             'invoice' => $invoice,
             'payboxResponse' => $payboxResponse,

sources/AppBundle/Controller/Website/CompanyPublicProfileListController.php

@@ -37,7 +37,7 @@ public function index(): Response
             return $a <=> $b;
         });
 
-        return $this->view->render(':site:company_public_profile_list.html.twig', [
+        return $this->view->render('site/company_public_profile_list.html.twig', [
             'company_member_list' => $displayableCompanies,
         ]);
     }

sources/AppBundle/Controller/Website/Member/CompanyPublicProfileController.php

@@ -90,7 +90,7 @@ public function index(Request $request)
         }
 
         return $this->render(
-            ':site:member/company_public_profile.html.twig',
+            'site/member/company_public_profile.html.twig',
             [
                 'form' => $form->createView(),
                 'company_member' => $companyMember,

sources/AppBundle/Controller/Website/PagerController.php

@@ -31,7 +31,7 @@ public function display(Request $request): Response
         }
 
         return $this->render(
-            ':site:pager.html.twig',
+            'site/pager.html.twig',
             [
                 'nb_pages' => $nbPages,
                 'displayed_pages' => $displayedPages,

sources/AppBundle/Controller/Website/SecondaryMenuController.php

@@ -23,7 +23,7 @@ public function display(Request $request): Response
         $menu = $branche->feuillesEnfants($request->get('feuille_id'));
 
         return $this->render(
-            ':site:secondary_menu.html.twig',
+            'site/secondary_menu.html.twig',
             [
                 'menu' => $this->prepareMenu($this->requestStack->getMasterRequest(), $menu),
             ]

sources/AppBundle/Controller/Website/StaticController.php

@@ -24,7 +24,7 @@ public function __construct(ViewRenderer $view, string $superAperoCsvUrl)
 
     public function offices(): Response
     {
-        return $this->view->render(':site:offices.html.twig', [
+        return $this->view->render('site/offices.html.twig', [
             'antennes' => (new AntennesCollection())->getAllSortedByLabels(),
         ]);
     }
@@ -65,7 +65,7 @@ protected function getAperos($url): array
 
     public function superApero(): Response
     {
-        return $this->view->render(':site:superapero.html.twig', [
+        return $this->view->render('site/superapero.html.twig', [
             'aperos' => $this->getAperos($this->superAperoCsvUrl),
         ]);
     }

sources/AppBundle/Email/Emails.php

@@ -48,7 +48,7 @@ public function sendInscription(Event $event, MailUser $recipient): void
 
         $message->addAttachment($this->getAttachementIcsInscription($event, $recipient));
 
-        $this->mailer->renderTemplate($message, ':admin/event:mail_inscription.html.twig', [
+        $this->mailer->renderTemplate($message, 'admin/event/mail_inscription.html.twig', [
             'event' => $event,
             'recipient' => $recipient,
             'content' => $mailContent,

app/Resources/views/admin/association/membership/_base.html.twig → templates/admin/association/membership/_base.html.twig

@@ -1,4 +1,4 @@
-{% extends ':site:base.html.twig' %}
+{% extends 'site/base.html.twig' %}
 
 {% block stylesheets %}
     {{ parent() }}

app/Resources/views/admin/association/membership/_company_menu.html.twig → templates/admin/association/membership/_company_menu.html.twig

@@ -1,4 +1,4 @@
-{% include ':site:secondary_menu.html.twig' with {
+{% include 'site/secondary_menu.html.twig' with {
     menu: [
         {
             "nom" : "Accueil",

app/Resources/views/admin/association/membership/_member_menu.html.twig → templates/admin/association/membership/_member_menu.html.twig

@@ -1,4 +1,4 @@
-{% include ':site:secondary_menu.html.twig' with {
+{% include 'site/secondary_menu.html.twig' with {
     menu: [
         {
             "nom" : "Accueil",

app/Resources/views/admin/association/membership/company.html.twig → templates/admin/association/membership/company.html.twig

@@ -1,7 +1,7 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block submenu %}
-    {% include ':admin/association/membership:_company_menu.html.twig' with {
+    {% include 'admin/association/membership/_company_menu.html.twig' with {
         current: "contact"
     } only %}
 {% endblock %}

app/Resources/views/admin/association/membership/generalmeeting.html.twig → templates/admin/association/membership/generalmeeting.html.twig

@@ -1,7 +1,7 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block submenu %}
-    {% include ':admin/association/membership:_member_menu.html.twig' with {
+    {% include 'admin/association/membership/_member_menu.html.twig' with {
         current: "generalmeeting"
     } only %}
 {% endblock %}

app/Resources/views/admin/association/membership/generalmeeting_membersheepfee.html.twig → templates/admin/association/membership/generalmeeting_membersheepfee.html.twig

@@ -1,7 +1,7 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block submenu %}
-    {% include ':admin/association/membership:_member_menu.html.twig' with {
+    {% include 'admin/association/membership/_member_menu.html.twig' with {
         current: "generalmeeting"
     } only %}
 {% endblock %}

app/Resources/views/admin/association/membership/member_contact_details.html.twig → templates/admin/association/membership/member_contact_details.html.twig

@@ -1,7 +1,7 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block submenu %}
-    {% include ':admin/association/membership:_member_menu.html.twig' with {
+    {% include 'admin/association/membership/_member_menu.html.twig' with {
         current: "contact"
     } only %}
 {% endblock %}

app/Resources/views/admin/association/membership/membershipfee.html.twig → templates/admin/association/membership/membershipfee.html.twig

@@ -1,7 +1,7 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block submenu %}
-    {% include ':admin/association/membership:_member_menu.html.twig' with {
+    {% include 'admin/association/membership/_member_menu.html.twig' with {
         current: "membershipfee"
     } only %}
 {% endblock %}

app/Resources/views/admin/association/membership/register.html.twig → templates/admin/association/membership/register.html.twig

@@ -1,4 +1,4 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block page_title %}Formulaire d'inscription à l'AFUP{% endblock %}
 

app/Resources/views/admin/event/mail_inscription.html.twig → templates/admin/event/mail_inscription.html.twig

@@ -1,4 +1,4 @@
-{% extends ':mail:_base_mail.html.twig' %}
+{% extends 'mail/_base_mail.html.twig' %}
 
 {% block content %}
 

app/Resources/views/admin/groups/lists.html.twig → templates/admin/groups/lists.html.twig

@@ -1,7 +1,7 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block submenu %}
-    {% include ':admin/association/membership:_member_menu.html.twig' with {
+    {% include 'admin/association/membership/_member_menu.html.twig' with {
         current: "mygroups"
     } only %}
 

app/Resources/views/admin/lost_password.html.twig → templates/admin/lost_password.html.twig

@@ -1,4 +1,4 @@
-{% extends ':admin/association/membership:_base.html.twig' %}
+{% extends 'admin/association/membership/_base.html.twig' %}
 
 {% block page_title %}{% endblock %}