Merge pull request #6 from pascalwacker/patch-1

Enable custom form fields
Alsatian67 · Aug 5, 2016 · c0414b6 · c0414b6
2 parents 24ffabc + 8695302
commit c0414b6
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/Form/Extensions/ExtensibleSubscriber.php b/Form/Extensions/ExtensibleSubscriber.php
@@ -45,9 +45,13 @@ public static function getSubscribedEvents()
 
     private function getListenedType(ResolvedFormTypeInterface $type)
     {
+        $return = array(
+            'original'  => get_class($type->getInnerType())
+        );
         while($type){
             if(in_array(get_class($type->getInnerType()),$this->enabledTypes)){
-                return get_class($type->getInnerType());
+                $return['type'] = get_class($type->getInnerType());
+                return $return;
             }
 
             $type = $type->getParent();
@@ -67,6 +71,8 @@ public function populateAjaxChoices(FormEvent $event)
 
     private function populateAjaxChoice(FormEvent $event,$childName, $type)
     {   
+        $original = $type['original'];
+        $type = $type['type'];
         $form = $event->getForm();
         $child = $form->get($childName);
         $options = $child->getConfig()->getOptions();
@@ -109,10 +115,10 @@ private function populateAjaxChoice(FormEvent $event,$childName, $type)
         } 
 
         // Since line 72 is returning all resolved option, only these options are reused :
-        $newOptions = array('constraints'=>$options['constraints'],'choice_label'=>$options['choice_label'],'route'=>$options['route'],'route_params'=>$options['route_params'],'required'=>$options['required'],'multiple'=>$options['multiple'],'choices'=>$choices);
+        $newOptions = array('constraints'=>$options['constraints'],'choice_label'=>$options['choice_label'],'route'=>$options['route'],'route_params'=>$options['route_params'],'required'=>$options['required'],'multiple'=>$options['multiple'],'choices'=>$choices,'attr'=>$options['attr']);
 
         if(array_key_exists('class',$options)){$newOptions=array_merge($newOptions,array('class'=>$options['class']));}
-        $form->add($childName,$type,$newOptions);
+        $form->add($childName,$original,$newOptions);
     }
 
     private function addChoice(&$array,$data,$class,$type){