Set choices_as_values to true in SecurityRolesType (sonata-project#978)

ryanellis · Dec 9, 2017 · b39281f · b39281f
1 parent 1e4243e
commit b39281f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/Form/Type/SecurityRolesType.php b/src/Form/Type/SecurityRolesType.php
@@ -133,6 +133,11 @@ public function configureOptions(OptionsResolver $resolver): void
 
             'data_class' => null,
         ]);
+
+        // Symfony 2.8 BC
+        if ($resolver->isDefined('choices_as_values')) {
+            $resolver->setDefault('choices_as_values', true);
+        }
     }
 
     /**

diff --git a/tests/Form/Type/SecurityRolesTypeTest.php b/tests/Form/Type/SecurityRolesTypeTest.php
@@ -94,6 +94,25 @@ public function testSubmitWithHiddenRoleData(): void
         $this->assertContains('ROLE_SUPER_ADMIN', $form->getData());
     }
 
+    public function testChoicesAsValues(): void
+    {
+        $resolver = new OptionsResolver();
+        $type = new SecurityRolesType($this->roleBuilder);
+
+        // If 'choices_as_values' option is not defined (Symfony >= 3.0), default value should not be set.
+        $type->configureOptions($resolver);
+
+        $this->assertFalse($resolver->hasDefault('choices_as_values'));
+
+        // If 'choices_as_values' option is defined (Symfony 2.8), default value should be set to true.
+        $resolver->setDefined(['choices_as_values']);
+        $type->configureOptions($resolver);
+        $options = $resolver->resolve();
+
+        $this->assertTrue($resolver->hasDefault('choices_as_values'));
+        $this->assertTrue($options['choices_as_values']);
+    }
+
     protected function getExtensions()
     {
         $this->roleBuilder = $roleBuilder = $this->createMock(EditableRolesBuilder::class);