@@ -38,7 +38,6 @@ |
||
38 | 38 | |
39 | 39 | /** |
40 | 40 | * @param EntityManagerInterface|null $em |
41 | - * @param PdfTransformer|null $mediaManager |
|
42 | 41 | */ |
43 | 42 | public function __construct(/* EntityManagerInterface */ $em = null, /* PdfTransformer */ $pdfTransformer = null, $rootDir = null, $enablePdfPreview = null) |
44 | 43 | { |
@@ -75,7 +75,7 @@ |
||
75 | 75 | * |
76 | 76 | * @param string $role ROLE_FOO etc |
77 | 77 | * |
78 | - * @return RoleInterface |
|
78 | + * @return Role |
|
79 | 79 | */ |
80 | 80 | public function setRole($role) |
81 | 81 | { |
@@ -22,6 +22,7 @@ |
||
22 | 22 | * {@inheritdoc} |
23 | 23 | * |
24 | 24 | * @deprecated |
25 | + * @param string $name |
|
25 | 26 | */ |
26 | 27 | protected function getParameter($name) |
27 | 28 | { |
@@ -754,7 +754,7 @@ |
||
754 | 754 | * |
755 | 755 | * @param Request $request |
756 | 756 | * |
757 | - * @return string |
|
757 | + * @return JsonResponse |
|
758 | 758 | * @throws AccessDeniedException |
759 | 759 | */ |
760 | 760 | public function reorderAction(Request $request) |
@@ -8,13 +8,10 @@ discard block |
||
8 | 8 | use InvalidArgumentException; |
9 | 9 | use Kunstmaan\AdminBundle\Entity\BaseUser; |
10 | 10 | use Kunstmaan\AdminBundle\Entity\EntityInterface; |
11 | -use Kunstmaan\AdminBundle\Entity\User; |
|
12 | 11 | use Kunstmaan\AdminBundle\FlashMessages\FlashTypes; |
13 | 12 | use Kunstmaan\AdminBundle\Helper\FormWidgets\FormWidget; |
14 | - |
|
15 | 13 | use Kunstmaan\AdminBundle\Helper\FormWidgets\Tabs\Tab; |
16 | 14 | use Kunstmaan\AdminBundle\Helper\FormWidgets\Tabs\TabPane; |
17 | - |
|
18 | 15 | use Kunstmaan\AdminBundle\Helper\Security\Acl\AclHelper; |
19 | 16 | use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionMap; |
20 | 17 | use Kunstmaan\AdminBundle\Service\AclManager; |
@@ -42,7 +39,6 @@ discard block |
||
42 | 39 | use Symfony\Component\HttpFoundation\JsonResponse; |
43 | 40 | use Symfony\Component\HttpFoundation\RedirectResponse; |
44 | 41 | use Symfony\Component\HttpFoundation\Request; |
45 | -use Symfony\Component\Security\Acl\Model\EntryInterface; |
|
46 | 42 | use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; |
47 | 43 | use Symfony\Component\Security\Core\Exception\AccessDeniedException; |
48 | 44 |
@@ -2,18 +2,12 @@ |
||
2 | 2 | |
3 | 3 | namespace Kunstmaan\AdminBundle\Command; |
4 | 4 | |
5 | -use Doctrine\ORM\EntityManager; |
|
6 | 5 | use Doctrine\ORM\EntityManagerInterface; |
7 | 6 | use Kunstmaan\AdminBundle\Service\AclManager; |
8 | 7 | use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; |
9 | 8 | use Symfony\Component\Console\Input\InputInterface; |
10 | 9 | use Symfony\Component\Console\Output\OutputInterface; |
11 | 10 | use Symfony\Component\Console\Question\ChoiceQuestion; |
12 | -use Symfony\Component\Security\Acl\Domain\Acl; |
|
13 | -use Symfony\Component\Security\Acl\Domain\Entry; |
|
14 | -use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity; |
|
15 | -use Symfony\Component\Security\Acl\Model\MutableAclProviderInterface; |
|
16 | -use Symfony\Component\Security\Acl\Model\ObjectIdentityRetrievalStrategyInterface; |
|
17 | 11 | use Symfony\Component\Security\Acl\Permission\PermissionMapInterface; |
18 | 12 | |
19 | 13 | /** |
@@ -139,6 +139,10 @@ |
||
139 | 139 | |
140 | 140 | /** |
141 | 141 | * @deprecated This method is deprecated since KunstmaanTranslatorBundle version 5.1 and will be removed in KunstmaanTranslatorBundle version 6.0 |
142 | + * @param string $id |
|
143 | + * @param string $domain |
|
144 | + * @param string|null $locale |
|
145 | + * @param string $trans |
|
142 | 146 | */ |
143 | 147 | public function profileTranslation($id, $parameters, $domain, $locale, $trans) |
144 | 148 | { |
@@ -35,6 +35,7 @@ |
||
35 | 35 | |
36 | 36 | /** |
37 | 37 | * @param ContainerInterface|string $multilanguage |
38 | + * @param \PHPUnit_Framework_MockObject_MockObject $requestStack |
|
38 | 39 | */ |
39 | 40 | public function __construct(/*ContainerInterface|RequestStack*/ $requestStack, $multilanguage = null, $defaultLocale = null, $requiredLocales = null, AdminRouteHelper $adminRouteHelper = null, EntityManagerInterface $em = null, array $hosts = null) |
40 | 41 | { |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use FOS\UserBundle\Form\Type\ResettingFormType; |
6 | 6 | use InvalidArgumentException; |
7 | - |
|
8 | 7 | use Kunstmaan\AdminBundle\Helper\DomainConfiguration; |
9 | 8 | use Symfony\Component\Config\FileLocator; |
10 | 9 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Kunstmaan\AdminBundle\Helper\DomainConfiguration; |
6 | 6 | use PHPUnit_Framework_TestCase; |
7 | -use Symfony\Component\DependencyInjection\Container; |
|
8 | 7 | use Symfony\Component\HttpFoundation\Request; |
9 | 8 | |
10 | 9 | /** |