Updated to support Symfony 2.8|3.0

lifo101 · Jul 13, 2016 · da548b6 · da548b6
1 parent 10c8eeb
commit da548b6
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 41 deletions.
diff --git a/Form/Type/TypeaheadType.php b/Form/Type/TypeaheadType.php
@@ -2,24 +2,20 @@
 
 namespace Lifo\TypeaheadBundle\Form\Type;
 
+use Doctrine\ORM\EntityManager;
+use Lifo\TypeaheadBundle\Form\DataTransformer\EntitiesToPropertyTransformer;
+use Lifo\TypeaheadBundle\Form\DataTransformer\EntityToPropertyTransformer;
 use Symfony\Bundle\FrameworkBundle\Routing\Router;
-use Symfony\Bridge\Doctrine\Form\EventListener\MergeDoctrineCollectionListener;
-use Symfony\Bridge\Doctrine\Form\DataTransformer\CollectionToArrayTransformer;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Exception\RuntimeException;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\Form\FormEvent;
-use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Form\Exception\UnexpectedTypeException;
-use Symfony\Component\Form\Exception\RuntimeException;
 use Symfony\Component\OptionsResolver\Options;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use Doctrine\ORM\EntityManager;
-use Doctrine\Common\Collections\Collection;
-use Lifo\TypeaheadBundle\Form\DataTransformer\EntityToPropertyTransformer;
-use Lifo\TypeaheadBundle\Form\DataTransformer\EntitiesToPropertyTransformer;
 
 class TypeaheadType extends AbstractType
 {
@@ -61,9 +57,9 @@ public function finishView(FormView $view, FormInterface $form, array $options)
 
         // assign some variables to the view template
         $vars = array('render', 'route', 'route_params', 'property',
-                      'minLength', 'items', 'delay', 'spinner',
-                      'multiple', 'allow_add', 'allow_remove', 'empty_value',
-                      'resetOnSelect', 'callback');
+            'minLength', 'items', 'delay', 'spinner',
+            'multiple', 'allow_add', 'allow_remove', 'empty_value',
+            'resetOnSelect', 'callback');
         foreach ($vars as $var) {
             $view->vars[$var] = $options[$var];
         }
@@ -82,35 +78,52 @@ public function finishView(FormView $view, FormInterface $form, array $options)
         }
     }
 
-//    public function configureOptions(OptionsResolver $resolver) // sf2.6+
+    /**
+     * Pre Symfony 2.7 compatibility
+     *
+     * @param OptionsResolverInterface $resolver
+     */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
+        $this->configureOptions($resolver);
+    }
 
-        //$resolver->setOptional(array(''));
-        $resolver->setRequired(array('class','render','route'));
+    /**
+     * @param OptionsResolver $resolver
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setRequired(array('class', 'render', 'route'));
         $resolver->setDefaults(array(
-            'em'                => null,
-            'query_builder'     => null,
-            'property'          => null,
-            'empty_value'       => '',
-            'route_params'      => null,
-
-            'multiple'          => false,
-            'allow_add'         => false,
-            'allow_remove'      => false,
-
-            'delay'             => 250,
-            'minLength'         => 2,
-            'items'             => 10,
-            'spinner'           => 'glyphicon glyphicon-refresh spin',
-            'resetOnSelect'     => function(Options $options) { return $options['multiple']; },
-            'callback'          => null,
-
-            'compound'          => false, //function(Options $options){ return $options['multiple']; },
+            'em'            => null,
+            'query_builder' => null,
+            'property'      => null,
+            'empty_value'   => '',
+            'route_params'  => null,
+
+            'multiple'      => false,
+            'allow_add'     => false,
+            'allow_remove'  => false,
+
+            'delay'         => 250,
+            'minLength'     => 2,
+            'items'         => 10,
+            'spinner'       => 'glyphicon glyphicon-refresh spin',
+            'resetOnSelect' => function (Options $options) {
+                return $options['multiple'];
+            },
+            'callback'      => null,
+
+            'compound'      => false, //function(Options $options){ return $options['multiple']; },
         ));
     }
 
     public function getName()
+    {
+        return $this->getBlockPrefix();
+    }
+
+    public function getBlockPrefix()
     {
         return 'entity_typeahead';
     }

diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -5,13 +5,13 @@ parameters:
 services:
     # provide twig functions
     lifo_typeahead.twig_extension:
-        class: %lifo_typeahead.twig_extension.class%
+        class: "%lifo_typeahead.twig_extension.class%"
         tags: [{ name: twig.extension }]
 
     # main typeahead autocomplete form field
     lifo_typeahead.typeahead_type:
-        class: %lifo_typeahead.typeahead_type.class%
-        arguments: [@service_container, @doctrine.orm.entity_manager, @router]
+        class: "%lifo_typeahead.typeahead_type.class%"
+        arguments: ["@service_container", "@doctrine.orm.entity_manager", "@router"]
         tags: [{ name: form.type, alias: entity_typeahead }]
 
     # experimental extension ...

diff --git a/Twig/Extension/TypeaheadTwigExtension.php b/Twig/Extension/TypeaheadTwigExtension.php
@@ -17,7 +17,7 @@ public function getName()
     public function getFunctions()
     {
         return array(
-            'lifo_typeahead_init' => new \Twig_Function_Method($this, 'initTypeaheadFunction', array('needs_environment' => true, 'is_safe' => array('html'))),
+            new \Twig_SimpleFunction('lifo_typeahead_init', array($this, 'initTypeaheadFunction'), array('needs_environment' => true, 'is_safe' => array('html'))),
         );
     }
 

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "lifo/typeahead-bundle",
     "type": "symfony-bundle",
-    "description": "A Symfony2 bundle that provides a Typeahead form type compatible with Bootstrap v2.x and v3.x",
+    "description": "A Symfony bundle that provides an autocomplete Typeahead form type compatible with Bootstrap v2|v3",
     "keywords": ["symfony","typeahead","autocomplete","bootstrap"],
     "license": "MIT",
     "authors": [
@@ -11,11 +11,11 @@
         }
     ],
     "require": {
-        "symfony/symfony": "^2.2"
+        "symfony/symfony": "^2.6 || ^3.0"
     },
     "suggest":  {
         "twbs/bootstrap": "Bootstrap framework",
-        "braincrafted/bootstrap-bundle": "Bundle to automatically enable Bootstrap styles for Symfony"
+        "mopa/bootstrap-bundle": "Bundle to automatically enable Bootstrap styles for Symfony"
     },
     "autoload": {
         "psr-0": { "Lifo\\TypeaheadBundle": "" }