From a4017e1dd4bb3024b6426ba50c9b6cb79a875984 Mon Sep 17 00:00:00 2001 From: Albin Kester <83301974+stakovicz@users.noreply.github.com> Date: Mon, 17 Feb 2025 08:08:38 +0100 Subject: [PATCH] =?UTF-8?q?Suppression=20des=20d=C3=A9pr=C3=A9ciations=20(?= =?UTF-8?q?#1631)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/event/ticket/ticket.html.twig | 4 +-- .../views/site/secondary_menu.html.twig | 4 ++- composer.json | 2 +- composer.lock | 28 ++++++++++--------- .../Association/Form/CompanyPublicProfile.php | 1 + .../AppBundle/Event/Speaker/SpeakerPage.php | 4 +-- sources/AppBundle/Planete/FeedFormData.php | 2 +- .../Security/TestGithubAuthenticator.php | 4 +-- .../Form/HotelReservationType.php | 2 +- 9 files changed, 28 insertions(+), 23 deletions(-) diff --git a/app/Resources/views/event/ticket/ticket.html.twig b/app/Resources/views/event/ticket/ticket.html.twig index 2b3e2a98f..e22076ead 100644 --- a/app/Resources/views/event/ticket/ticket.html.twig +++ b/app/Resources/views/event/ticket/ticket.html.twig @@ -5,7 +5,7 @@ {% form_theme ticketForm _self %} {% block form_errors %} - {% spaceless %} + {% apply spaceless %} {% if errors|length > 0 %} {% 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 index 23e3e45e2..25932fcea 100644 --- a/app/Resources/views/site/secondary_menu.html.twig +++ b/app/Resources/views/site/secondary_menu.html.twig @@ -1,6 +1,8 @@
- {% for item in menu if item.is_active %} + {% for item in menu %} + {% if item.is_active %} {{ item.nom }} + {% endif %} {% endfor %}
diff --git a/composer.json b/composer.json index fea7c4354..d92f4e399 100644 --- 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 index ce68a66b0..7c7ba66d4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6f80c056e0d1c12771ebc7a6a3582164", + "content-hash": "48fe53083063b2b6e6bc0ab4d0a6501d", "packages": [ { "name": "algolia/algoliasearch-client-php", @@ -1961,28 +1961,30 @@ }, { "name": "excelwebzone/recaptcha-bundle", - "version": "v1.5.13", + "version": "v1.5.42", "source": { "type": "git", "url": "https://github.com/excelwebzone/EWZRecaptchaBundle.git", - "reference": "0ab877583961efac961d651fd3bcc3bfcf3d543c" + "reference": "c1728fab6dc1a880e1b76298c5092f2ca25dac8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/excelwebzone/EWZRecaptchaBundle/zipball/0ab877583961efac961d651fd3bcc3bfcf3d543c", - "reference": "0ab877583961efac961d651fd3bcc3bfcf3d543c", + "url": "https://api.github.com/repos/excelwebzone/EWZRecaptchaBundle/zipball/c1728fab6dc1a880e1b76298c5092f2ca25dac8f", + "reference": "c1728fab6dc1a880e1b76298c5092f2ca25dac8f", "shasum": "" }, "require": { "google/recaptcha": "^1.1", - "php": ">=5.6 || ^7.0", - "symfony/form": "^2.8 || ^3.0 || ^4.0", - "symfony/framework-bundle": "^2.8 || ^3.0 || ^4.0", - "symfony/security-bundle": "^2.8 || ^3.0 || ^4.0", - "symfony/validator": "^2.8 || ^3.0 || ^4.0" + "php": "^7.1 || ^8.0", + "symfony/form": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0", + "symfony/framework-bundle": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0", + "symfony/security-bundle": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0", + "symfony/validator": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0", + "symfony/yaml": "^2.8 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0", + "twig/twig": "^1.40 || ^2.9 || ^3.0" }, "require-dev": { - "phpunit/phpunit": "^5 || ^6 || ^7" + "phpunit/phpunit": "^7 || ^8 || ^9.5" }, "type": "symfony-bundle", "extra": { @@ -2013,9 +2015,9 @@ ], "support": { "issues": "https://github.com/excelwebzone/EWZRecaptchaBundle/issues", - "source": "https://github.com/excelwebzone/EWZRecaptchaBundle/tree/master" + "source": "https://github.com/excelwebzone/EWZRecaptchaBundle/tree/v1.5.42" }, - "time": "2019-01-21T16:57:28+00:00" + "time": "2025-02-03T20:57:06+00:00" }, { "name": "ezyang/htmlpurifier", diff --git a/sources/AppBundle/Association/Form/CompanyPublicProfile.php b/sources/AppBundle/Association/Form/CompanyPublicProfile.php index f28bd48b1..38c1e71c9 100644 --- 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 index 8c43cc753..32fd3bc95 100644 --- 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 index cf7e3de83..ee4ad6cdc 100644 --- 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 index da6b5e249..539153ab2 100644 --- 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 index 1433eefe7..e05524982 100644 --- 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)) {