|
@@ -14,6 +14,7 @@ namespace Sonata\AdminBundle\Form\Type;
|
|
|
|
|
|
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 @@ class AclMatrixType extends AbstractType
|
|
|
'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'));
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|