Merge pull request #19 from lemoinem/fix/symfony-3-compatibility

[Symfony3] Fix compatibility
Burgov · Dec 18, 2015 · b466760 · b466760
2 parents d7b60f1 + 7abd902
commit b466760
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Form/Type/KeyValueType.php b/Form/Type/KeyValueType.php
@@ -68,7 +68,14 @@ public function configureOptions(OptionsResolver $resolver)
         ));
 
         $resolver->setRequired(array('value_type'));
-        $resolver->setAllowedTypes(array('allowed_keys' => array('null', 'array')));
+
+        if (method_exists($resolver, 'setDefined')) {
+            // Symfony 2.6+ API
+            $resolver->setAllowedTypes('allowed_keys', array('null', 'array'));
+        } else {
+            // Symfony <2.6 API
+            $resolver->setAllowedTypes(array('allowed_keys' => array('null', 'array')));
+        }
     }
 
     public function getParent()