Suppression des dépréciations (#1631)

afup · Feb 17, 2025 · a4017e1 · a4017e1
1 parent 6923905
commit a4017e1
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 23 deletions.
diff --git a/app/Resources/views/event/ticket/ticket.html.twig b/app/Resources/views/event/ticket/ticket.html.twig
@@ -5,15 +5,15 @@
 {% form_theme ticketForm _self %}
 
 {% block form_errors %}
-    {% spaceless %}
+    {% apply spaceless %}
         {% if errors|length > 0 %}
             <ul class="tickets--errors">
                 {% for error in errors %}
                     <li>{{ error.message }}</li>
                 {% endfor %}
             </ul>
         {% endif %}
-    {% endspaceless %}
+    {% endapply %}
 {% endblock form_errors %}
 
 {% block metas %}

diff --git a/app/Resources/views/site/secondary_menu.html.twig b/app/Resources/views/site/secondary_menu.html.twig
@@ -1,6 +1,8 @@
 <div class="secondary-menu">
-    {% for item in menu if item.is_active %}
+    {% for item in menu %}
+        {% if item.is_active %}
         <a href="" class="secondary-menu__current-item">{{ item.nom }}</a>
+        {% endif %}
     {% endfor %}
     <div class="mw1400p center">
         <div class="secondary-menu__list">

diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     "doctrine/dbal": "^2.5",
     "ekino/newrelic-bundle": "^1.4",
     "erusev/parsedown": "^1.6",
-    "excelwebzone/recaptcha-bundle": "1.5.13",
+    "excelwebzone/recaptcha-bundle": "^1.5",
     "ezyang/htmlpurifier": "^4.10",
     "friendsofpear/pear_exception": "0.0.*",
     "guzzlehttp/guzzle": "^6.5",

diff --git a/composer.lock b/composer.lock
diff --git a/sources/AppBundle/Association/Form/CompanyPublicProfile.php b/sources/AppBundle/Association/Form/CompanyPublicProfile.php
@@ -142,6 +142,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                         new Choice([
                             'choices' => array_values($antennesInfos),
                             'multiple' => true,
+                            'strict' => true,
                         ]),
                     ]
                 ]

diff --git a/sources/AppBundle/Event/Speaker/SpeakerPage.php b/sources/AppBundle/Event/Speaker/SpeakerPage.php
@@ -85,7 +85,7 @@ public function handleRequest(Request $request, Event $event, Speaker $speaker)
 
         $shouldDisplaySpeakersDinerForm = $event->getSpeakersDinerEnabled() && $event->getDateEndSpeakersDinerInfosCollection() > $now;
 
-        if ($shouldDisplaySpeakersDinerForm && $speakersDinerType->isValid()) {
+        if ($shouldDisplaySpeakersDinerForm && $speakersDinerType->isSubmitted() && $speakersDinerType->isValid()) {
             $speakersDinerData = $speakersDinerType->getData();
             $speaker->setWillAttendSpeakersDiner($speakersDinerData['will_attend'] === 1);
             $speaker->setHasSpecialDiet($speakersDinerData['has_special_diet'] === 1);
@@ -111,7 +111,7 @@ public function handleRequest(Request $request, Event $event, Speaker $speaker)
 
         $shouldDisplayHotelReservationForm = $event->getAccomodationEnabled() && $event->getDateEndHotelInfosCollection() > $now;
 
-        if ($shouldDisplayHotelReservationForm && $hotelReservationType->isValid()) {
+        if ($shouldDisplayHotelReservationForm && $hotelReservationType->isSubmitted() && $hotelReservationType->isValid()) {
             $hotelReservationData = $hotelReservationType->getData();
             $speaker->setHotelNightsArray($hotelReservationData['nights']);
 

diff --git a/sources/AppBundle/Planete/FeedFormData.php b/sources/AppBundle/Planete/FeedFormData.php
@@ -32,7 +32,7 @@ class FeedFormData
     public $userId;
     /**
      * @var int
-     * @Assert\Choice({0, 1})
+     * @Assert\Choice(choices={0, 1}, strict=true)
      */
     public $status = Feed::STATUS_ACTIVE;
 }
diff --git a/sources/AppBundle/Security/TestGithubAuthenticator.php b/sources/AppBundle/Security/TestGithubAuthenticator.php
@@ -24,7 +24,7 @@ public function __construct(GithubUserRepository $githubUserRepository)
         $this->githubUserRepository = $githubUserRepository;
     }
 
-    public function getCredentials(Request $request)
+    public function getCredentials(Request $request): string
     {
         return $request->get('github_test_user');
     }
@@ -118,6 +118,6 @@ public function start(Request $request, AuthenticationException $authException =
 
     public function supports(Request $request): bool
     {
-        return true;
+        return (bool) $request->get('github_test_user');
     }
 }
diff --git a/sources/AppBundle/SpeakerInfos/Form/HotelReservationType.php b/sources/AppBundle/SpeakerInfos/Form/HotelReservationType.php
@@ -67,7 +67,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     'multiple' => true,
                     'choices' => $choices,
                     'constraints' => [
-                        new Choice(['choices' => array_values($choices), 'multiple' => true, 'min' => 1]),
+                        new Choice(['choices' => array_values($choices), 'multiple' => true, 'min' => 1, 'strict' => true]),
                         new Callback(['callback' => function ($values, ExecutionContextInterface $context): void {
                             if (in_array(self::NIGHT_NONE, $values)
                             && 1 !== count($values)) {