@@ -1910,6 +1910,8 @@ discard block  | 
                                                    ||
| 1910 | 1910 | |
| 1911 | 1911 | /**  | 
                                                        
| 1912 | 1912 |       * {@inheritdoc} | 
                                                        
| 1913 | + * @param string $id  | 
                                                        |
| 1914 | + * @param string $domain  | 
                                                        |
| 1913 | 1915 | */  | 
                                                        
| 1914 | 1916 | public function trans($id, array $parameters = array(), $domain = null, $locale = null)  | 
                                                        
| 1915 | 1917 |      { | 
                                                        
@@ -2162,7 +2164,7 @@ discard block  | 
                                                    ||
| 2162 | 2164 | *  | 
                                                        
| 2163 | 2165 | * @param string $context  | 
                                                        
| 2164 | 2166 | *  | 
                                                        
| 2165 | - * @return array  | 
                                                        |
| 2167 | + * @return string[]  | 
                                                        |
| 2166 | 2168 | */  | 
                                                        
| 2167 | 2169 | public function getPermissionsShow($context)  | 
                                                        
| 2168 | 2170 |      { | 
                                                        
@@ -2406,7 +2408,7 @@ discard block  | 
                                                    ||
| 2406 | 2408 | /**  | 
                                                        
| 2407 | 2409 | * Set custom per page options.  | 
                                                        
| 2408 | 2410 | *  | 
                                                        
| 2409 | - * @param array $options  | 
                                                        |
| 2411 | + * @param integer[] $options  | 
                                                        |
| 2410 | 2412 | */  | 
                                                        
| 2411 | 2413 | public function setPerPageOptions(array $options)  | 
                                                        
| 2412 | 2414 |      { | 
                                                        
@@ -12,11 +12,8 @@  | 
                                                    ||
| 12 | 12 | namespace Sonata\AdminBundle\Form\DataTransformer;  | 
                                                        
| 13 | 13 | |
| 14 | 14 | use Doctrine\Common\Util\ClassUtils;  | 
                                                        
| 15 | -use Sonata\AdminBundle\Form\ChoiceList\ModelChoiceList;  | 
                                                        |
| 16 | -use Sonata\AdminBundle\Form\ChoiceList\ModelChoiceLoader;  | 
                                                        |
| 17 | 15 | use Sonata\AdminBundle\Model\ModelManagerInterface;  | 
                                                        
| 18 | 16 | use Sonata\CoreBundle\Model\Adapter\AdapterInterface;  | 
                                                        
| 19 | -use Symfony\Component\Form\ChoiceList\LazyChoiceList;  | 
                                                        |
| 20 | 17 | use Symfony\Component\Form\DataTransformerInterface;  | 
                                                        
| 21 | 18 | use Symfony\Component\Form\Exception\RuntimeException;  | 
                                                        
| 22 | 19 | use Symfony\Component\Form\Exception\TransformationFailedException;  | 
                                                        
@@ -18,7 +18,6 @@  | 
                                                    ||
| 18 | 18 | use Symfony\Component\Form\FormInterface;  | 
                                                        
| 19 | 19 | use Symfony\Component\Form\FormView;  | 
                                                        
| 20 | 20 | use Symfony\Component\OptionsResolver\OptionsResolver;  | 
                                                        
| 21 | -use Symfony\Component\OptionsResolver\OptionsResolverInterface;  | 
                                                        |
| 22 | 21 | |
| 23 | 22 | /**  | 
                                                        
| 24 | 23 | * @author Thomas Rabaix <[email protected]>  | 
                                                        
@@ -11,8 +11,6 @@  | 
                                                    ||
| 11 | 11 | |
| 12 | 12 | namespace Sonata\AdminBundle\Mapper;  | 
                                                        
| 13 | 13 | |
| 14 | -use Sonata\AdminBundle\Admin\AbstractAdmin;  | 
                                                        |
| 15 | -  | 
                                                        |
| 16 | 14 | /**  | 
                                                        
| 17 | 15 | * This class is used to simulate the Form API.  | 
                                                        
| 18 | 16 | *  | 
                                                        
@@ -23,7 +23,6 @@  | 
                                                    ||
| 23 | 23 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;  | 
                                                        
| 24 | 24 | use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;  | 
                                                        
| 25 | 25 | use Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException;  | 
                                                        
| 26 | -use Symfony\Component\Security\Core\SecurityContextInterface;  | 
                                                        |
| 27 | 26 | |
| 28 | 27 | /**  | 
                                                        
| 29 | 28 | * @author Thomas Rabaix <[email protected]>  | 
                                                        
@@ -18,7 +18,6 @@  | 
                                                    ||
| 18 | 18 | use Symfony\Component\Form\FormInterface;  | 
                                                        
| 19 | 19 | use Symfony\Component\Form\FormView;  | 
                                                        
| 20 | 20 | use Symfony\Component\OptionsResolver\OptionsResolver;  | 
                                                        
| 21 | -use Symfony\Component\OptionsResolver\OptionsResolverInterface;  | 
                                                        |
| 22 | 21 | |
| 23 | 22 | /**  | 
                                                        
| 24 | 23 | * @author Thomas Rabaix <[email protected]>  |