@@ -91,6 +91,12 @@ |
||
91 | 91 | $object->match('/en/some-uri'); |
92 | 92 | } |
93 | 93 | |
94 | + /** |
|
95 | + * @param Request $request |
|
96 | + * @param NodeTranslation $nodeTranslation |
|
97 | + * |
|
98 | + * @return \Symfony\Component\DependencyInjection\ContainerInterface |
|
99 | + */ |
|
94 | 100 | private function getContainer($request, $nodeTranslation = null) |
95 | 101 | { |
96 | 102 | $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); |
@@ -751,7 +751,7 @@ discard block |
||
751 | 751 | * |
752 | 752 | * @param Request $request |
753 | 753 | * |
754 | - * @return string |
|
754 | + * @return JsonResponse |
|
755 | 755 | * @throws AccessDeniedException |
756 | 756 | */ |
757 | 757 | public function reorderAction(Request $request) |
@@ -1211,7 +1211,7 @@ discard block |
||
1211 | 1211 | |
1212 | 1212 | /** |
1213 | 1213 | * @param $originalNode |
1214 | - * @param $nodeNewPage |
|
1214 | + * @param Node $nodeNewPage |
|
1215 | 1215 | */ |
1216 | 1216 | private function updateAcl($originalNode, $nodeNewPage) |
1217 | 1217 | { |
@@ -10,10 +10,8 @@ |
||
10 | 10 | use Kunstmaan\NodeBundle\Form\NodeMenuTabTranslationAdminType; |
11 | 11 | use Kunstmaan\NodeBundle\Form\NodeMenuTabAdminType; |
12 | 12 | use InvalidArgumentException; |
13 | - |
|
14 | 13 | use Doctrine\ORM\EntityManager; |
15 | 14 | use Doctrine\Common\Collections\ArrayCollection; |
16 | - |
|
17 | 15 | use Symfony\Component\HttpFoundation\JsonResponse; |
18 | 16 | use Symfony\Component\HttpFoundation\RedirectResponse; |
19 | 17 | use Symfony\Component\HttpFoundation\Request; |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * |
42 | 42 | * @param string $title |
43 | 43 | * |
44 | - * @return AbstractPage |
|
44 | + * @return AbstractControllerAction |
|
45 | 45 | */ |
46 | 46 | public function setTitle($title) |
47 | 47 | { |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | /** |
72 | 72 | * @param HasNodeInterface $parent |
73 | 73 | * |
74 | - * @return AbstractPage |
|
74 | + * @return AbstractControllerAction |
|
75 | 75 | */ |
76 | 76 | public function setParent(HasNodeInterface $parent) |
77 | 77 | { |
@@ -3,10 +3,8 @@ |
||
3 | 3 | namespace Kunstmaan\NodeBundle\Entity; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\Mapping as ORM; |
6 | - |
|
7 | 6 | use Kunstmaan\AdminBundle\Entity\AbstractEntity; |
8 | 7 | use Kunstmaan\NodeBundle\Form\ControllerActionAdminType; |
9 | - |
|
10 | 8 | use Symfony\Component\Form\AbstractType; |
11 | 9 | use Symfony\Component\Validator\Constraints as Assert; |
12 | 10 |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | /** |
110 | 110 | * Get user |
111 | 111 | * |
112 | - * @return string |
|
112 | + * @return BaseUser |
|
113 | 113 | */ |
114 | 114 | public function getUser() |
115 | 115 | { |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | /** |
133 | 133 | * Get date |
134 | 134 | * |
135 | - * @return DateTime |
|
135 | + * @return \DateTime |
|
136 | 136 | */ |
137 | 137 | public function getDate() |
138 | 138 | { |
@@ -13,7 +13,7 @@ |
||
13 | 13 | /** |
14 | 14 | * Make sure response has a timestamp |
15 | 15 | * |
16 | - * @param FilterResponseEvent|GetResponseEvent $event |
|
16 | + * @param FilterResponseEvent $event |
|
17 | 17 | */ |
18 | 18 | public function onKernelResponse(FilterResponseEvent $event) |
19 | 19 | { |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | /** |
105 | 105 | * @param string $identifier |
106 | 106 | * |
107 | - * @return TabInterface |
|
107 | + * @return PermissionsFormWidget |
|
108 | 108 | */ |
109 | 109 | public function setIdentifier($identifier) |
110 | 110 | { |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | /** |
125 | 125 | * @param HasNodeInterface $page |
126 | 126 | * |
127 | - * @return PermissionTab |
|
127 | + * @return PermissionsFormWidget |
|
128 | 128 | */ |
129 | 129 | public function setPage($page) |
130 | 130 | { |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | /** |
145 | 145 | * @param PermissionAdmin $permissionAdmin |
146 | 146 | * |
147 | - * @return PermissionTab |
|
147 | + * @return PermissionsFormWidget |
|
148 | 148 | */ |
149 | 149 | public function setPermissionAdmin($permissionAdmin) |
150 | 150 | { |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | /** |
165 | 165 | * @param PermissionMapInterface $permissionMap |
166 | 166 | * |
167 | - * @return PermissionTab |
|
167 | + * @return PermissionsFormWidget |
|
168 | 168 | */ |
169 | 169 | public function setPermissionMap($permissionMap) |
170 | 170 | { |
@@ -4,11 +4,9 @@ |
||
4 | 4 | |
5 | 5 | use Kunstmaan\NodeBundle\Entity\Node; |
6 | 6 | use Kunstmaan\NodeBundle\Entity\HasNodeInterface; |
7 | - |
|
8 | 7 | use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionAdmin; |
9 | 8 | use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionMapInterface; |
10 | 9 | use Kunstmaan\AdminBundle\Helper\FormWidgets\FormWidget; |
11 | - |
|
12 | 10 | use Doctrine\ORM\EntityManager; |
13 | 11 | use Symfony\Component\Form\FormView; |
14 | 12 | use Symfony\Component\Form\FormBuilderInterface; |
@@ -177,7 +177,7 @@ |
||
177 | 177 | * Get an array with the id's off all nodes in the tree that should be |
178 | 178 | * expanded. |
179 | 179 | * |
180 | - * @param $request |
|
180 | + * @param Request $request |
|
181 | 181 | * |
182 | 182 | * @return array |
183 | 183 | */ |
@@ -156,7 +156,7 @@ |
||
156 | 156 | } |
157 | 157 | |
158 | 158 | /** |
159 | - * @param NodeMenuItem|null|false $parent |
|
159 | + * @param NodeMenuItem $parent |
|
160 | 160 | */ |
161 | 161 | public function setParent($parent = false) |
162 | 162 | { |
@@ -50,7 +50,7 @@ |
||
50 | 50 | } |
51 | 51 | |
52 | 52 | /** |
53 | - * @param object $object |
|
53 | + * @param null|\Kunstmaan\NodeBundle\Entity\Node $object |
|
54 | 54 | * |
55 | 55 | * Create ACL permissions for an object. |
56 | 56 | */ |
@@ -3,14 +3,11 @@ |
||
3 | 3 | namespace Kunstmaan\NodeBundle\Helper\Services; |
4 | 4 | |
5 | 5 | use Symfony\Component\DependencyInjection\ContainerInterface; |
6 | - |
|
7 | -use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission, |
|
8 | - Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\MaskBuilder; |
|
9 | - |
|
10 | -use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity, |
|
11 | - Symfony\Component\Security\Acl\Exception\AclNotFoundException, |
|
12 | - Symfony\Component\Security\Acl\Model\MutableAclProviderInterface, |
|
13 | - Symfony\Component\Security\Acl\Model\ObjectIdentityRetrievalStrategyInterface; |
|
6 | +use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\MaskBuilder; |
|
7 | +use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity; |
|
8 | +use Symfony\Component\Security\Acl\Exception\AclNotFoundException; |
|
9 | +use Symfony\Component\Security\Acl\Model\MutableAclProviderInterface; |
|
10 | +use Symfony\Component\Security\Acl\Model\ObjectIdentityRetrievalStrategyInterface; |
|
14 | 11 | |
15 | 12 | /** |
16 | 13 | * Service to add the correct permissions to new HasNodeInterface objects. |