@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | /** |
| 123 | 123 | * render a list element from the FieldDescription. |
| 124 | 124 | * |
| 125 | - * @param mixed $object |
|
| 125 | + * @param \stdClass $object |
|
| 126 | 126 | * @param FieldDescriptionInterface $fieldDescription |
| 127 | 127 | * @param array $params |
| 128 | 128 | * |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | * render a view element. |
| 153 | 153 | * |
| 154 | 154 | * @param FieldDescriptionInterface $fieldDescription |
| 155 | - * @param mixed $object |
|
| 155 | + * @param \stdClass $object |
|
| 156 | 156 | * |
| 157 | 157 | * @return string |
| 158 | 158 | */ |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | /** |
| 292 | 292 | * Get the identifiers as a string that is safe to use in a url. |
| 293 | 293 | * |
| 294 | - * @param object $model |
|
| 294 | + * @param \stdClass $model |
|
| 295 | 295 | * @param AdminInterface $admin |
| 296 | 296 | * |
| 297 | 297 | * @return string string representation of the id that is safe to use in a url |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | /** |
| 317 | 317 | * @param $type |
| 318 | 318 | * |
| 319 | - * @return string|bool |
|
| 319 | + * @return string|false |
|
| 320 | 320 | */ |
| 321 | 321 | public function getXEditableType($type) |
| 322 | 322 | { |
@@ -447,7 +447,7 @@ discard block |
||
| 447 | 447 | * @param FieldDescriptionInterface $fieldDescription |
| 448 | 448 | * @param string $defaultTemplate |
| 449 | 449 | * |
| 450 | - * @return \Twig_TemplateInterface |
|
| 450 | + * @return \Twig_Template |
|
| 451 | 451 | */ |
| 452 | 452 | private function getTemplate( |
| 453 | 453 | FieldDescriptionInterface $fieldDescription, |
@@ -62,6 +62,7 @@ |
||
| 62 | 62 | |
| 63 | 63 | /** |
| 64 | 64 | * {@inheritdoc} |
| 65 | + * @param string $action |
|
| 65 | 66 | */ |
| 66 | 67 | public function configureSideMenu(AdminInterface $admin, MenuItemInterface $menu, $action, AdminInterface $childAdmin = null) |
| 67 | 68 | { |
@@ -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]> |
@@ -15,7 +15,6 @@ |
||
| 15 | 15 | use Symfony\Component\Form\FormInterface; |
| 16 | 16 | use Symfony\Component\Form\FormView; |
| 17 | 17 | use Symfony\Component\OptionsResolver\OptionsResolver; |
| 18 | -use Symfony\Component\OptionsResolver\OptionsResolverInterface; |
|
| 19 | 18 | |
| 20 | 19 | /** |
| 21 | 20 | * @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]> |
@@ -16,6 +16,9 @@ |
||
| 16 | 16 | |
| 17 | 17 | class AclSecurityHandlerTest extends \PHPUnit_Framework_TestCase |
| 18 | 18 | { |
| 19 | + /** |
|
| 20 | + * @return \Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface |
|
| 21 | + */ |
|
| 19 | 22 | public function getTokenStorageMock() |
| 20 | 23 | { |
| 21 | 24 | // Set the SecurityContext for Symfony <2.6 |