Merge pull request #21 from Elao/symfony3

Migrate this bundle to support Symfony3
Elao · Dec 10, 2015 · 2871918 · 2871918
2 parents 60245b3 + 09948ee
commit 2871918
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 57 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,31 @@
 language: php
 
 php:
-    - 5.3
-    - 5.4
-    - hhvm
+  - 5.5
+  - 5.6
+  - 7.0
 
-before_script: composer install --dev
+matrix:
+  fast_finish: true
+  include:
+    - php: 5.6
+      env: SYMFONY_VERSION=2.8.*@dev
+    - php: 5.6
+      env: SYMFONY_VERSION="3.0.*@dev"
+    - php: 7.0
+      env: SYMFONY_VERSION="3.0.*@dev"
+
+sudo: false
+
+cache:
+  directories:
+    - $HOME/.composer/cache
+
+before_install:
+  - composer selfupdate
+  - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
+
+install: composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
+
+script:
+  - vendor/bin/phpunit --coverage-text
diff --git a/Form/Extension/ButtonTypeExtension.php b/Form/Extension/ButtonTypeExtension.php
@@ -10,6 +10,8 @@
 
 namespace Elao\Bundle\FormTranslationBundle\Form\Extension;
 
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ButtonType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
@@ -23,7 +25,7 @@ class ButtonTypeExtension extends TreeAwareExtension
      */
     public function getExtendedType()
     {
-        return 'button';
+        return ButtonType::class;
     }
 
     /**
@@ -35,12 +37,4 @@ public function configureOptions(OptionsResolver $resolver)
             $resolver->setDefault('label', true);
         }
     }
-
-    /**
-     * for Sf < 2.7
-     */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
-    {
-        $this->configureOptions($resolver);
-    }
 }
diff --git a/Form/Extension/ChoiceTypeExtension.php b/Form/Extension/ChoiceTypeExtension.php
@@ -10,6 +10,9 @@
 
 namespace Elao\Bundle\FormTranslationBundle\Form\Extension;
 
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+
 /**
  * Choice Type Extension
  */
@@ -20,6 +23,6 @@ class ChoiceTypeExtension extends TreeAwareExtension
      */
     public function getExtendedType()
     {
-        return 'choice';
+        return ChoiceType::class;
     }
 }
diff --git a/Form/Extension/CollectionTypeExtension.php b/Form/Extension/CollectionTypeExtension.php
@@ -10,6 +10,8 @@
 
 namespace Elao\Bundle\FormTranslationBundle\Form\Extension;
 
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -25,7 +27,7 @@ class CollectionTypeExtension extends TreeAwareExtension
      */
     public function getExtendedType()
     {
-        return 'collection';
+        return CollectionType::class;
     }
 
     /**
@@ -39,21 +41,12 @@ public function configureOptions(OptionsResolver $resolver)
         }
     }
 
-    /**
-     * for Sf < 2.7
-     */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
-    {
-        $this->configureOptions($resolver);
-    }
-
     /**
      * {@inheritdoc}
      */
     public function finishView(FormView $view, FormInterface $form, array $options)
     {
         if ($this->treeBuilder && $this->keyBuilder && $options['allow_add'] && $options['prototype']) {
-
             if ($view->vars['prototype']->vars['label'] == $options['prototype_name'].'label__') {
                 if (!isset($options['options']['label'])) {
                     $options['options']['label'] = $options['label'];

diff --git a/Form/Extension/FormTypeExtension.php b/Form/Extension/FormTypeExtension.php
@@ -10,6 +10,8 @@
 
 namespace Elao\Bundle\FormTranslationBundle\Form\Extension;
 
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
@@ -23,7 +25,7 @@ class FormTypeExtension extends TreeAwareExtension
      */
     public function getExtendedType()
     {
-        return 'form';
+        return FormType::class;
     }
 
     /**
@@ -35,12 +37,4 @@ public function configureOptions(OptionsResolver $resolver)
             $resolver->setDefault('label', true);
         }
     }
-
-    /**
-     * for Sf < 2.7
-     */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
-    {
-        $this->configureOptions($resolver);
-    }
 }
diff --git a/Form/Extension/TreeAwareExtension.php b/Form/Extension/TreeAwareExtension.php
@@ -10,6 +10,7 @@
 
 namespace Elao\Bundle\FormTranslationBundle\Form\Extension;
 
+use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\AbstractTypeExtension;

diff --git a/Model/FormTree.php b/Model/FormTree.php
@@ -151,7 +151,7 @@ public function offsetGet($offset)
      */
     public function offsetSet($offset, $value)
     {
-        /* Not implemented: User addParent and addChild methods */
+        /* Not implemented: Use addParent and addChild methods */
     }
 
     /**

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 ElaoFormTranslationBundle
 =========================
 
-![](https://img.shields.io/badge/Symfony-2.6-blue.svg)
+![](https://img.shields.io/badge/Symfony-3.0-blue.svg)
 [![Build Status](http://api.travis-ci.org/Elao/ElaoFormTranslationBundle.png)](http://travis-ci.org/Elao/ElaoFormTranslationBundle)
 
 Description:

diff --git a/Resources/config/forms.xml b/Resources/config/forms.xml
@@ -15,19 +15,19 @@
         <service id="elao.form_translation.extension.tree_aware_extension" abstract="true" />
 
         <service id="elao.form_translation.extension.form_type_extension" class="%elao.form_translation.extension.form_type_extension.class%" parent="elao.form_translation.extension.tree_aware_extension">
-            <tag name="form.type_extension" alias="form" />
+            <tag name="form.type_extension" extended-type="Symfony\Component\Form\Extension\Core\Type\FormType"/>
         </service>
 
         <service id="elao.form_translation.extension.collection_type_extension" class="%elao.form_translation.extension.collection_type_extension.class%" parent="elao.form_translation.extension.tree_aware_extension">
-            <tag name="form.type_extension" alias="collection" />
+            <tag name="form.type_extension" extended-type="Symfony\Component\Form\Extension\Core\Type\CollectionType"/>
         </service>
 
         <service id="elao.form_translation.extension.button_type_extension" class="%elao.form_translation.extension.button_type_extension.class%" parent="elao.form_translation.extension.tree_aware_extension">
-            <tag name="form.type_extension" alias="button" />
+            <tag name="form.type_extension" extended-type="Symfony\Component\Form\Extension\Core\Type\ButtonType"/>
         </service>
 
         <service id="elao.form_translation.extension.choice_type_extension" class="%elao.form_translation.extension.choice_type_extension.class%" parent="elao.form_translation.extension.tree_aware_extension">
-            <tag name="form.type_extension" alias="choice" />
+            <tag name="form.type_extension" extended-type="Symfony\Component\Form\Extension\Core\Type\ChoiceType"/>
         </service>
     </services>
 </container>
diff --git a/Tests/Builders/FormKeyBuilderTest.php b/Tests/Builders/FormKeyBuilderTest.php
@@ -2,9 +2,13 @@
 
 namespace Elao\Bundle\FormTranslationBundle\Tests\Builders;
 
-use Elao\Bundle\FormTranslationBundle\Test\FormTranslationTestCase;
-use Elao\Bundle\FormTranslationBundle\Builders\FormTreeBuilder;
 use Elao\Bundle\FormTranslationBundle\Builders\FormKeyBuilder;
+use Elao\Bundle\FormTranslationBundle\Builders\FormTreeBuilder;
+use Elao\Bundle\FormTranslationBundle\Test\FormTranslationTestCase;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 class FormKeyBuilderTest extends FormTranslationTestCase
 {
@@ -16,13 +20,13 @@ public function testSimpleTreeBuilder()
         $treeBuilder = new FormTreeBuilder();
         $keyBuilder  = new FormKeyBuilder();
 
-        $form = $this->factory->createNamed('foo', 'form');
+        $form = $this->factory->createNamed('foo', FormType::class);
 
-        $form->add('bar', 'text');
+        $form->add('bar', TextType::class);
 
         $view  = $form->createView();
         $tree  = $treeBuilder->getTree($view['bar']);
-        $label = $keyBuilder->buildKeyFromTree($tree , 'label');
+        $label = $keyBuilder->buildKeyFromTree($tree, 'label');
 
         $this->assertEquals('form.foo.children.bar.label', $label);
     }
@@ -35,13 +39,13 @@ public function testCollectionTreeBuilder()
         $treeBuilder = new FormTreeBuilder();
         $keyBuilder  = new FormKeyBuilder();
 
-        $form = $this->factory->createNamed('foo', 'form');
+        $form = $this->factory->createNamed('foo', FormType::class);
 
         $form->add(
             'bar',
-            'collection',
+            CollectionType::class,
             array(
-                'type'         => 'text',
+                'entry_type'   => TextType::class,
                 'allow_add'    => true,
                 'allow_delete' => true,
             )
@@ -56,4 +60,4 @@ public function testCollectionTreeBuilder()
         $this->assertEquals('form.foo.children.bar.label', $barLabel);
         $this->assertEquals('form.foo.children.bar.prototype.label', $prototypeLabel);
     }
-}
+}
diff --git a/Tests/Builders/FormTreeBuilderTest.php b/Tests/Builders/FormTreeBuilderTest.php
@@ -2,8 +2,12 @@
 
 namespace Elao\Bundle\FormTranslationBundle\Tests\Builders;
 
-use Elao\Bundle\FormTranslationBundle\Test\FormTranslationTestCase;
 use Elao\Bundle\FormTranslationBundle\Builders\FormTreeBuilder;
+use Elao\Bundle\FormTranslationBundle\Test\FormTranslationTestCase;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 class FormTreeBuilderTest extends FormTranslationTestCase
 {
@@ -13,9 +17,9 @@ class FormTreeBuilderTest extends FormTranslationTestCase
     public function testSimpleTreeBuilder()
     {
         $treeBuilder = new FormTreeBuilder();
-        $form        = $this->factory->createNamed('foo', 'form');
+        $form        = $this->factory->createNamed('foo', FormType::class);
 
-        $form->add('bar', 'text');
+        $form->add('bar', TextType::class);
 
         $formView = $form->createView();
         $fooTree  = $treeBuilder->getTree($formView);
@@ -38,13 +42,13 @@ public function testSimpleTreeBuilder()
     public function testCollectionTreeBuilder()
     {
         $treeBuilder = new FormTreeBuilder();
-        $form        = $this->factory->createNamed('foo', 'form');
+        $form        = $this->factory->createNamed('foo', FormType::class);
 
         $form->add(
             'bar',
-            'collection',
+            CollectionType::class,
             array(
-                'type'         => 'text',
+                'entry_type'   => TextType::class,
                 'allow_add'    => true,
                 'allow_delete' => true,
             )
@@ -62,4 +66,4 @@ public function testCollectionTreeBuilder()
         $this->assertEquals(false, $tree[2]->isCollection());
         $this->assertEquals(true, $tree[2]->isPrototype());
     }
-}
+}
diff --git a/composer.json b/composer.json
@@ -16,8 +16,8 @@
         }
     ],
     "require": {
-        "symfony/framework-bundle": "~2.6",
-        "symfony/form": "~2.6"
+        "symfony/framework-bundle": "~2.8|~3.0",
+        "symfony/form": "~2.8|~3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*"
@@ -27,6 +27,8 @@
             "Elao\\Bundle\\FormTranslationBundle\\": "."
         }
     },
+    "prefer-stable": true,
+    "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
             "dev-master": "1.3.x-dev"