Fix deprecated setAllowedTypes method

nexylan · Apr 20, 2015 · ddc357c · ddc357c
1 parent 7da9c0d
commit ddc357c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/Block/AdminListBlockService.php b/Block/AdminListBlockService.php
@@ -16,6 +16,7 @@
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Sonata\AdminBundle\Admin\Pool;
 use Sonata\BlockBundle\Block\BaseBlockService;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
@@ -81,8 +82,12 @@ public function setDefaultSettings(OptionsResolverInterface $resolver)
             'groups' => false
         ));
 
-        $resolver->setAllowedTypes(array(
-            'groups' => array('bool', 'array')
-        ));
+        if (version_compare(Kernel::VERSION, '2.6', '<')) {
+            $resolver->setAllowedTypes(array(
+                'groups' => array('bool', 'array')
+            ));
+        } else {
+            $resolver->setAllowedTypes('groups', array('bool', 'array'));
+        }
     }
 }
diff --git a/Form/Type/AclMatrixType.php b/Form/Type/AclMatrixType.php
@@ -14,6 +14,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -62,10 +63,15 @@ public function configureOptions(OptionsResolver $resolver)
             'acl_value',
         ));
 
-        $resolver->setAllowedTypes(array(
-            'permissions' => 'array',
-            'acl_value' => array('string', '\Symfony\Component\Security\Core\User\UserInterface'),
-        ));
+        if (version_compare(Kernel::VERSION, '2.6', '<')) {
+            $resolver->setAllowedTypes(array(
+                'permissions' => 'array',
+                'acl_value' => array('string', '\Symfony\Component\Security\Core\User\UserInterface'),
+            ));
+        } else {
+            $resolver->setAllowedTypes('permissions', 'array');
+            $resolver->setAllowedTypes('acl_value', array('string', '\Symfony\Component\Security\Core\User\UserInterface'));
+        }
     }
 
     /**