Merge pull request #5 from J-Ben87/master

Yann Eugoné · Yann Eugoné · commit 63e17afcc84a · 2016-01-12T17:20:48.000+01:00
Flip the EnumType choices to match option "choices_as_values"
diff --git a/Form/Type/EnumType.php b/Form/Type/EnumType.php
@@ -43,7 +43,7 @@ function ($name) {
             ->setDefault(
                 'choices',
                 function (Options $options) {
-                    return $this->enumRegistry->get($options['enum'])->getChoices();
+                    return array_flip($this->enumRegistry->get($options['enum'])->getChoices());
                 }
             )
         ;
diff --git a/Tests/Form/Type/EnumTypeTest.php b/Tests/Form/Type/EnumTypeTest.php
@@ -41,7 +41,7 @@ public function testEnumOptionValid()
     {
         $form = $this->createForm('gender');
 
-        $this->assertEquals(['male' => 'Male', 'female' => 'Female'], $form->getConfig()->getOption('choices'));
+        $this->assertEquals(['Male' => 'male', 'Female' => 'female'], $form->getConfig()->getOption('choices'));
     }
 
     protected function getExtensions()

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ function ($name) {`
`43`	`43`	`->setDefault(`
`44`	`44`	`'choices',`
`45`	`45`	`function (Options $options) {`
`46`		`- return $this->enumRegistry->get($options['enum'])->getChoices();`
	`46`	`+ return array_flip($this->enumRegistry->get($options['enum'])->getChoices());`
`47`	`47`	`}`
`48`	`48`	`)`
`49`	`49`	`;`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function testEnumOptionValid()`
`41`	`41`	`{`
`42`	`42`	`$form = $this->createForm('gender');`
`43`	`43`
`44`		`- $this->assertEquals(['male' => 'Male', 'female' => 'Female'], $form->getConfig()->getOption('choices'));`
	`44`	`+ $this->assertEquals(['Male' => 'male', 'Female' => 'female'], $form->getConfig()->getOption('choices'));`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`protected function getExtensions()`