adapt for symfony 2.7

Charlie · Charlie · commit 2353b5d62ab4 · 2015-11-12T14:19:39.000+01:00
diff --git a/Form/Type/ChoiceTreeType.php b/Form/Type/ChoiceTreeType.php
@@ -32,7 +32,8 @@ class ChoiceTreeType extends ChoiceType
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $choiceList = $options['choice_list']->getAdaptedList();
+        // for symfony 2.7
+        $choiceList = method_exists($options['choice_list'], "getAdaptedList") ? $options['choice_list']->getAdaptedList(): $options['choice_list'];
         if (!$choiceList && !is_array($options['choices']) && !$options['choices'] instanceof \Traversable) {
             throw new LogicException('Either the option "choices" or "choice_list" must be set.');
         }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ class ChoiceTreeType extends ChoiceType`
`32`	`32`	`*/`
`33`	`33`	`public function buildForm(FormBuilderInterface $builder, array $options)`
`34`	`34`	`{`
`35`		`- $choiceList = $options['choice_list']->getAdaptedList();`
	`35`	`+ // for symfony 2.7`
	`36`	`+ $choiceList = method_exists($options['choice_list'], "getAdaptedList") ? $options['choice_list']->getAdaptedList(): $options['choice_list'];`
`36`	`37`	`if (!$choiceList && !is_array($options['choices']) && !$options['choices'] instanceof \Traversable) {`
`37`	`38`	`throw new LogicException('Either the option "choices" or "choice_list" must be set.');`
`38`	`39`	`}`