@@ -60,7 +60,7 @@ |
||
60 | 60 | * |
61 | 61 | * @param ServerRequest $request Cake request object. |
62 | 62 | * @param Response $response Cake response object. |
63 | - * @return mixed |
|
63 | + * @return boolean |
|
64 | 64 | */ |
65 | 65 | public function authenticate(ServerRequest $request, Response $response) |
66 | 66 | { |
@@ -109,7 +109,7 @@ |
||
109 | 109 | /** |
110 | 110 | * @param CrudAction $action An Action instance. |
111 | 111 | * @param Query $query A Query instance. |
112 | - * @return mixed |
|
112 | + * @return Query |
|
113 | 113 | */ |
114 | 114 | protected function _attachAssociations(CrudAction $action, Query $query) |
115 | 115 | { |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | * Set a default role if no role is provided |
141 | 141 | * |
142 | 142 | * @param array $user user data |
143 | - * @param Request $request request |
|
143 | + * @param ServerRequest $request request |
|
144 | 144 | * @return bool |
145 | 145 | */ |
146 | 146 | public function authorize($user, ServerRequest $request) |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | * |
163 | 163 | * @param array $user current user array |
164 | 164 | * @param string $role effective role for the current user |
165 | - * @param Request $request request |
|
165 | + * @param ServerRequest $request request |
|
166 | 166 | * @return bool true if there is a match in permissions |
167 | 167 | */ |
168 | 168 | protected function _checkRules(array $user, $role, ServerRequest $request) |
@@ -184,8 +184,8 @@ discard block |
||
184 | 184 | * @param array $permission configuration |
185 | 185 | * @param array $user current user |
186 | 186 | * @param string $role effective user role |
187 | - * @param Request $request request |
|
188 | - * @return bool if rule matched, null if rule not matched |
|
187 | + * @param ServerRequest $request request |
|
188 | + * @return boolean|null if rule matched, null if rule not matched |
|
189 | 189 | */ |
190 | 190 | protected function _matchRule($permission, $user, $role, $request) |
191 | 191 | { |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | * If no parameters are passed, it will return the currently used locator. |
32 | 32 | * |
33 | 33 | * @param \CakeDC\Api\Service\Locator\LocatorInterface|null $serviceLocator LocatorInterface instance. |
34 | - * @return \CakeDC\Api\Service\Locator\LocatorInterface |
|
34 | + * @return \Cake\ORM\Locator\LocatorInterface |
|
35 | 35 | * @deprecated 3.6.0 Use getTableLocator()/setTableLocator() instead. |
36 | 36 | */ |
37 | 37 | public function serviceLocator(LocatorInterface $serviceLocator = null) |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | /** |
51 | 51 | * Sets the table locator. |
52 | 52 | * |
53 | - * @param \Cake\ORM\Locator\LocatorInterface $tableLocator LocatorInterface instance. |
|
53 | + * @param LocatorInterface $tableLocator LocatorInterface instance. |
|
54 | 54 | * @return $this |
55 | 55 | */ |
56 | 56 | public function setTableLocator(LocatorInterface $tableLocator) |
@@ -11,8 +11,6 @@ |
||
11 | 11 | |
12 | 12 | namespace CakeDC\Api\Service\Locator; |
13 | 13 | |
14 | -use CakeDC\Api\Service\ServiceRegistry; |
|
15 | - |
|
16 | 14 | /** |
17 | 15 | * Contains method for setting and accessing LocatorInterface instance |
18 | 16 | */ |
@@ -56,7 +56,7 @@ |
||
56 | 56 | * Stores a list of options to be used when instantiating an object |
57 | 57 | * with a matching alias. |
58 | 58 | * |
59 | - * @param string|array $alias Name of the alias or array to completely overwrite current config. |
|
59 | + * @param string $alias Name of the alias or array to completely overwrite current config. |
|
60 | 60 | * @param array|null $options list of options for the alias |
61 | 61 | * @return $this |
62 | 62 | * @throws \RuntimeException When you attempt to configure an existing table instance. |
@@ -162,7 +162,7 @@ |
||
162 | 162 | } |
163 | 163 | |
164 | 164 | /** |
165 | - * @param $count |
|
165 | + * @param integer $count |
|
166 | 166 | */ |
167 | 167 | protected function _addData($count) |
168 | 168 | { |
@@ -16,8 +16,6 @@ |
||
16 | 16 | use CakeDC\Api\TestSuite\TestCase; |
17 | 17 | use CakeDC\Api\Test\ConfigTrait; |
18 | 18 | use CakeDC\Api\Test\FixturesTrait; |
19 | -use Cake\Http\Response; |
|
20 | -use Cake\Http\ServerRequest; |
|
21 | 19 | |
22 | 20 | class ServiceRegistryTest extends TestCase |
23 | 21 | { |
@@ -13,7 +13,6 @@ |
||
13 | 13 | |
14 | 14 | use CakeDC\Api\Exception\ValidationException; |
15 | 15 | use CakeDC\Api\Service\Action\Action; |
16 | -use CakeDC\Users\Controller\Component\UsersAuthComponent; |
|
17 | 16 | use CakeDC\Users\Controller\Traits\CustomUsersTableTrait; |
18 | 17 | use CakeDC\Users\Exception\UserNotActiveException; |
19 | 18 | use CakeDC\Users\Exception\UserNotFoundException; |
@@ -67,7 +67,7 @@ |
||
67 | 67 | /** |
68 | 68 | * Execute action. |
69 | 69 | * |
70 | - * @return mixed |
|
70 | + * @return string |
|
71 | 71 | * @throws Exception |
72 | 72 | */ |
73 | 73 | public function execute() |
@@ -13,7 +13,6 @@ |
||
13 | 13 | |
14 | 14 | use CakeDC\Api\Exception\ValidationException; |
15 | 15 | use CakeDC\Api\Service\Action\Action; |
16 | -use CakeDC\Users\Controller\Component\UsersAuthComponent; |
|
17 | 16 | use CakeDC\Users\Controller\Traits\CustomUsersTableTrait; |
18 | 17 | use CakeDC\Users\Exception\UserAlreadyActiveException; |
19 | 18 | use CakeDC\Users\Exception\UserNotFoundException; |
@@ -67,7 +67,7 @@ |
||
67 | 67 | /** |
68 | 68 | * Execute action. |
69 | 69 | * |
70 | - * @return mixed |
|
70 | + * @return string |
|
71 | 71 | * @throws Exception |
72 | 72 | */ |
73 | 73 | public function execute() |