Merge pull request #3 from yann-eugone/symfony-3-compatibility

Symfony 3 compatibility

Author: Yann Eugoné

.travis.yml

@@ -12,13 +12,9 @@ matrix:
     - php: 5.6
       env: SYMFONY_VERSION=2.7.*
     - php: 5.6
-      env: SYMFONY_VERSION=2.8.*@dev
+      env: SYMFONY_VERSION=2.8.*
     - php: 5.6
-      env: SYMFONY_VERSION="3.0.x-dev as 2.8"
-  allow_failures:
-    - php: hhvm
-    - env: SYMFONY_VERSION=2.8.*@dev
-    - env: SYMFONY_VERSION="3.0.x-dev as 2.8"
+      env: SYMFONY_VERSION="3.0.*"
 
 sudo: false
 

Form/Type/EnumType.php

@@ -4,6 +4,7 @@
 
 use EnumBundle\Registry\EnumRegistryInterface;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -32,6 +33,7 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
             ->setRequired('enum')
+            ->setDefault('choices_as_values', true)
             ->setAllowedValues(
                 'enum',
                 function ($name) {
@@ -52,14 +54,26 @@ function (Options $options) {
      */
     public function getParent()
     {
-        return 'choice';
+        if (!method_exists(AbstractType::class, 'getBlockPrefix')) {
+            return 'choice'; //Symfony 2.x support
+        }
+
+        return ChoiceType::class;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'enum';
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return $this->getBlockPrefix();
+    }
 }

README.md

@@ -153,22 +153,24 @@ namespace AppBundle\Form\Type;
 
 use AppBundle\Enum\GenderEnum;
 use AppBundle\Enum\StateEnum;
-//...
+use Symfony\Component\Form\AbstractType;
+// For Symfony >= 2.8
+use EnumBundle\Form\Type\EnumType;
 
-class MemberType extends //...
+class MemberType extends AbstractType
 {
-    //...
-
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            //...
+            // For Symfony >= 2.8
+            ->add('state', EnumType::class, ['enum' => StateEnum::NAME])
+            ->add('gender', EnumType::class, ['enum' => GenderEnum::NAME])
+
+            // For Symfony 2.7
             ->add('state', 'enum', ['enum' => StateEnum::NAME])
             ->add('gender', 'enum', ['enum' => GenderEnum::NAME])
         ;
     }
-
-    //...
 }
 ```
 

Tests/Form/Type/EnumTypeTest.php

@@ -2,8 +2,10 @@
 
 namespace EnumBundle\Tests\Form\Type;
 
+use EnumBundle\Form\Type\EnumType;
 use EnumBundle\Tests\Form\TestExtension;
 use EnumBundle\Tests\GenderEnum;
+use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Test\TypeTestCase;
 
 /**
@@ -26,18 +28,18 @@ protected function setUp()
     public function testEnumOptionIsRequired()
     {
         $this->setExpectedException('Symfony\Component\OptionsResolver\Exception\MissingOptionsException');
-        $this->factory->create('enum');
+        $this->createForm();
     }
 
     public function testEnumOptionIsInvalid()
     {
         $this->setExpectedException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
-        $this->factory->create('enum', null, ['enum' => 'state']);
+        $this->createForm('state');
     }
 
     public function testEnumOptionValid()
     {
-        $form = $this->factory->create('enum', null, ['enum' => 'gender']);
+        $form = $this->createForm('gender');
 
         $this->assertEquals(['male' => 'Male', 'female' => 'Female'], $form->getConfig()->getOption('choices'));
     }
@@ -48,4 +50,20 @@ protected function getExtensions()
             new TestExtension($this->enumRegistry->reveal())
         ];
     }
+
+    private function createForm($enum = null)
+    {
+        $options = [];
+        if ($enum) {
+            $options['enum'] = $enum;
+        }
+
+        if (method_exists(AbstractType::class, 'getBlockPrefix')) {
+            $name = EnumType::class; //Symfony 3.x support
+        } else {
+            $name = 'enum'; //Symfony 2.x support
+        }
+
+        return $this->factory->create($name, null, $options);
+    }
 }

composer.json

@@ -9,13 +9,13 @@
         }
     ],
     "require": {
-        "php": ">=5.5",
-        "symfony/framework-bundle": "~2.7",
+        "php": ">=5.5.9",
+        "symfony/framework-bundle": "~2.7|~3.0",
         "twig/twig": "~1.20|~2.0"
     },
     "require-dev": {
-        "symfony/form": "~2.7",
-        "symfony/validator": "~2.7",
+        "symfony/form": "~2.7|~3.0",
+        "symfony/validator": "~2.7|~3.0",
         "phpunit/phpunit": "~4.6"
     },
     "autoload": {