Merge 5.x into 6.x

sonata-project · Oct 2, 2023 · 5d5af9a · 5d5af9a
2 parents a415ad7 + 4314383
commit 5d5af9a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/Form/Type/RolesMatrixType.php b/src/Form/Type/RolesMatrixType.php
@@ -35,6 +35,7 @@ public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'expanded' => true,
+            'multiple' => true,
             'choices' => function (Options $options, ?array $parentChoices): array {
                 if (null !== $parentChoices && [] !== $parentChoices) {
                     return [];

diff --git a/tests/Form/Type/RolesMatrixTypeTest.php b/tests/Form/Type/RolesMatrixTypeTest.php
@@ -58,6 +58,8 @@ public function testGetDefaultOptions(): void
         $choices = $options['choices'];
         static::assertCount(2, $choices);
         static::assertNotContains(UserInterface::ROLE_DEFAULT, $choices);
+        static::assertTrue($options['expanded']);
+        static::assertTrue($options['multiple']);
     }
 
     public function testDifferentExcludedRoles(): void