Merge branch 'main' into fix/improve-modal-location

MTES-MCT · Jan 7, 2025 · 1e8ee2a · 1e8ee2a
2 parents 6a5d8bb + 1ef6e05
commit 1e8ee2a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/.github/workflows/metabase_export.yml b/.github/workflows/metabase_export.yml
@@ -12,6 +12,11 @@ jobs:
     steps:
       - uses: actions/checkout@v1
 
+      - name: Setup PHP with PECL extension
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.2'
+
       - name: Install Scalingo CLI
         run: curl -O https://cli-dl.scalingo.com/install && bash install
 

diff --git a/src/Infrastructure/Form/Regulation/VehicleSetFormType.php b/src/Infrastructure/Form/Regulation/VehicleSetFormType.php
@@ -44,12 +44,12 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 ChoiceType::class,
                 options : [
                     'choices' => [
-                        3.5 => 3.5,
-                        7.5 => 7.5,
-                        19 => 19,
-                        26 => 26,
-                        32 => 32,
-                        44 => 44,
+                        '3.5' => 3.5,
+                        '7.5' => 7.5,
+                        '19' => 19,
+                        '26' => 26,
+                        '32' => 32,
+                        '44' => 44,
                     ],
                     'label' => 'regulation.vehicle_set.heavyweightMaxWeight',
                     'placeholder' => 'regulation.vehicle_set.heavyweightMaxWeight.placeholder',

diff --git a/...s/Integration/Infrastructure/Controller/Regulation/Fragments/AddMeasureControllerTest.php b/...s/Integration/Infrastructure/Controller/Regulation/Fragments/AddMeasureControllerTest.php
@@ -727,6 +727,28 @@ public function testInvalidBlankCritairTypes(): void
         $this->assertStringContainsString('Cette valeur ne doit pas être vide.', $crawler->filter('#measure_form_vehicleSet_critairTypes_error')->text());
     }
 
+    public function testHeavyweightMaxWeightChoices(): void
+    {
+        $client = $this->login();
+        $crawler = $client->request('GET', '/_fragment/regulations/' . RegulationOrderRecordFixture::UUID_PERMANENT . '/measure/add');
+        $this->assertResponseStatusCodeSame(200);
+        $this->assertSecurityHeaders();
+
+        $choices = $crawler
+            ->filter('select[name="measure_form[vehicleSet][heavyweightMaxWeight]"] > option')
+            ->each(fn ($node) => [$node->attr('value'), $node->text()]);
+
+        $this->assertEquals([
+            ['', 'Sélectionner le poids'],
+            ['3.5', 3.5],
+            ['7.5', 7.5],
+            ['19', 19],
+            ['26', 26],
+            ['32', 32],
+            ['44', 44],
+        ], $choices);
+    }
+
     public function testInvalidCritairTypes(): void
     {
         $client = $this->login();