@@ -95,6 +95,8 @@ discard block |
||
95 | 95 | /** |
96 | 96 | * @Then the response header :header should contain :value |
97 | 97 | * @Then the response header :header contains :value |
98 | + * @param string $header |
|
99 | + * @param string $value |
|
98 | 100 | */ |
99 | 101 | public function theResponseHeaderContains($header, $value) |
100 | 102 | { |
@@ -186,6 +188,8 @@ discard block |
||
186 | 188 | /** |
187 | 189 | * @Given I have a valid token for :user with password :pass |
188 | 190 | * @Given I have a valid token for username :user and password :pass |
191 | + * @param string $user |
|
192 | + * @param string $pass |
|
189 | 193 | */ |
190 | 194 | public function iHaveAValidTokenForUsernameAndPassword($user, $pass) |
191 | 195 | { |
@@ -217,6 +221,8 @@ discard block |
||
217 | 221 | } |
218 | 222 | |
219 | 223 | /** @Given I have a valid user token for username :user and password :pass |
224 | + * @param string $user |
|
225 | + * @param string $pass |
|
220 | 226 | */ |
221 | 227 | public function iHaveAValidUserTokenForUsernameAndPassword($user, $pass) |
222 | 228 | { |
@@ -381,6 +387,7 @@ discard block |
||
381 | 387 | |
382 | 388 | /** |
383 | 389 | * @inheritdoc |
390 | + * @param string $data |
|
384 | 391 | */ |
385 | 392 | protected function request($method, $uri, $data = null, array $headers = [], array $server = []) |
386 | 393 | { |
@@ -202,7 +202,7 @@ |
||
202 | 202 | /** |
203 | 203 | * @param string $service |
204 | 204 | * |
205 | - * @return object |
|
205 | + * @return \FOS\UserBundle\Model\UserInterface |
|
206 | 206 | */ |
207 | 207 | protected function get($service) |
208 | 208 | { |
@@ -196,7 +196,7 @@ |
||
196 | 196 | /** |
197 | 197 | * Validates an API request |
198 | 198 | * |
199 | - * @param object $request |
|
199 | + * @param Request $request |
|
200 | 200 | * |
201 | 201 | * @throws ValidationException |
202 | 202 | */ |
@@ -11,8 +11,8 @@ |
||
11 | 11 | use Symfony\Component\HttpFoundation\Response; |
12 | 12 | use Symfony\Component\Security\Core\User\UserInterface; |
13 | 13 | use Symfony\Component\Validator\Validator\ValidatorInterface; |
14 | -use TreeHouse\BaseApiBundle\Security\SecurityContext; |
|
15 | 14 | use TreeHouse\BaseApiBundle\Exception\ValidationException; |
15 | +use TreeHouse\BaseApiBundle\Security\SecurityContext; |
|
16 | 16 | |
17 | 17 | abstract class BaseApiController extends Controller |
18 | 18 | { |
@@ -2,9 +2,9 @@ |
||
2 | 2 | |
3 | 3 | namespace TreeHouse\BaseApiBundle\Tests\Security; |
4 | 4 | |
5 | -use TreeHouse\BaseApiBundle\Security\SecurityContext; |
|
6 | 5 | use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; |
7 | 6 | use Symfony\Component\Security\Core\User\UserInterface; |
7 | +use TreeHouse\BaseApiBundle\Security\SecurityContext; |
|
8 | 8 | |
9 | 9 | class SecurityContextTest extends \PHPUnit_Framework_TestCase |
10 | 10 | { |