@@ -1,8 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | use GuzzleHttp\Client; |
| 4 | -use GuzzleHttp\Psr7\Request; |
|
| 5 | -use GuzzleHttp\Psr7\Response; |
|
| 6 | 4 | |
| 7 | 5 | class AlertControllerTest extends \PHPUnit_Framework_TestCase |
| 8 | 6 | { |
@@ -272,7 +272,7 @@ |
||
| 272 | 272 | { |
| 273 | 273 | $queryString = $request->query->get('embed'); |
| 274 | 274 | |
| 275 | - if (! empty($queryString)) { |
|
| 275 | + if (!empty($queryString)) { |
|
| 276 | 276 | $this->fractal->parseIncludes($request->query->get('embed')); |
| 277 | 277 | } |
| 278 | 278 | } |
@@ -101,10 +101,10 @@ discard block |
||
| 101 | 101 | * Builds an item response in Fractal then hands off to the responder |
| 102 | 102 | * |
| 103 | 103 | * @param array $item The item to transform |
| 104 | - * @param mixed $callback The Transformer to pass through to Fractal |
|
| 104 | + * @param \League\Fractal\TransformerAbstract $callback The Transformer to pass through to Fractal |
|
| 105 | 105 | * @param \Symfony\Component\HttpFoundation\Response $response The client's response |
| 106 | 106 | * |
| 107 | - * @return array |
|
| 107 | + * @return Response |
|
| 108 | 108 | */ |
| 109 | 109 | protected function respondWithItem($item, $callback, Response $response) |
| 110 | 110 | { |
@@ -118,10 +118,10 @@ discard block |
||
| 118 | 118 | * Builds a collection of items from Fractal then hands off to the responder |
| 119 | 119 | * |
| 120 | 120 | * @param array $collection The collection to transform |
| 121 | - * @param mixed $callback The Transformer to pass through to Fractal |
|
| 121 | + * @param \League\Fractal\TransformerAbstract $callback The Transformer to pass through to Fractal |
|
| 122 | 122 | * @param \Symfony\Component\HttpFoundation\Response The client's response |
| 123 | 123 | * |
| 124 | - * @return array |
|
| 124 | + * @return Response |
|
| 125 | 125 | */ |
| 126 | 126 | protected function respondWithCollection($collection, $callback, Response $response) |
| 127 | 127 | { |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | * @param string $message Response message to put in the error |
| 157 | 157 | * @param int $errorCode Error code to set |
| 158 | 158 | * |
| 159 | - * @return array |
|
| 159 | + * @return Response |
|
| 160 | 160 | */ |
| 161 | 161 | protected function respondWithError(Response $response, $message, $errorCode) |
| 162 | 162 | { |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | * @param \Symfony\Component\HttpFoundation\Response $response |
| 184 | 184 | * @param string $message |
| 185 | 185 | * |
| 186 | - * @return void |
|
| 186 | + * @return Response |
|
| 187 | 187 | */ |
| 188 | 188 | public function errorEmpty(Response $response, $message = 'No data / Empty') |
| 189 | 189 | { |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | * @param \Symfony\Component\HttpFoundation\Response $response |
| 198 | 198 | * @param string $message |
| 199 | 199 | * |
| 200 | - * @return void |
|
| 200 | + * @return Response |
|
| 201 | 201 | */ |
| 202 | 202 | public function errorForbidden(Response $response, $message = 'Forbidden') |
| 203 | 203 | { |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | * @param \Symfony\Component\HttpFoundation\Response $response |
| 212 | 212 | * @param string $message |
| 213 | 213 | * |
| 214 | - * @return void |
|
| 214 | + * @return Response |
|
| 215 | 215 | */ |
| 216 | 216 | public function errorInternalError(Response $response, $message = 'Internal Error') |
| 217 | 217 | { |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | * @param \Symfony\Component\HttpFoundation\Response $response |
| 226 | 226 | * @param string $message |
| 227 | 227 | * |
| 228 | - * @return void |
|
| 228 | + * @return Response |
|
| 229 | 229 | */ |
| 230 | 230 | public function errorNotFound(Response $response, $message = 'Resource Not Found') |
| 231 | 231 | { |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | * @param \Symfony\Component\HttpFoundation\Response $response |
| 240 | 240 | * @param string $message |
| 241 | 241 | * |
| 242 | - * @return void |
|
| 242 | + * @return Response |
|
| 243 | 243 | */ |
| 244 | 244 | public function errorUnauthorized(Response $response, $message = 'Unauthorized') |
| 245 | 245 | { |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | /** |
| 265 | 265 | * Reads any requested includes and adds them to the item / collection |
| 266 | 266 | * |
| 267 | - * @param Symfony\Component\HttpFoundation\Request $request |
|
| 267 | + * @param Request $request |
|
| 268 | 268 | * |
| 269 | 269 | * @return void |
| 270 | 270 | */ |
@@ -17,21 +17,21 @@ |
||
| 17 | 17 | |
| 18 | 18 | // Inflectors |
| 19 | 19 | $container->inflector('Ps2alerts\Api\Contract\ConfigAwareInterface') |
| 20 | - ->invokeMethod('setConfig', ['config']); |
|
| 20 | + ->invokeMethod('setConfig', ['config']); |
|
| 21 | 21 | $container->inflector('Ps2alerts\Api\Contract\DatabaseAwareInterface') |
| 22 | - ->invokeMethod('setDatabaseDriver', ['Aura\Sql']); |
|
| 22 | + ->invokeMethod('setDatabaseDriver', ['Aura\Sql']); |
|
| 23 | 23 | $container->inflector('Ps2alerts\Api\Contract\LogAwareInterface') |
| 24 | - ->invokeMethod('setLogDriver', ['Monolog\Logger']); |
|
| 24 | + ->invokeMethod('setLogDriver', ['Monolog\Logger']); |
|
| 25 | 25 | $container->inflector('Ps2alerts\Api\Contract\TemplateAwareInterface') |
| 26 | - ->invokeMethod('setTemplateDriver', ['Twig_Environment']); |
|
| 26 | + ->invokeMethod('setTemplateDriver', ['Twig_Environment']); |
|
| 27 | 27 | $container->inflector('Ps2alerts\Api\Contract\RedisAwareInterface') |
| 28 | - ->invokeMethod('setRedisDriver', ['redis']); |
|
| 28 | + ->invokeMethod('setRedisDriver', ['redis']); |
|
| 29 | 29 | $container->inflector('Ps2alerts\Api\Contract\UuidAwareInterface') |
| 30 | - ->invokeMethod('setUuidDriver', ['Ramsey\Uuid\Uuid']); |
|
| 30 | + ->invokeMethod('setUuidDriver', ['Ramsey\Uuid\Uuid']); |
|
| 31 | 31 | |
| 32 | 32 | |
| 33 | 33 | // Container Inflector |
| 34 | 34 | $container->inflector('League\Container\ContainerAwareInterface') |
| 35 | - ->invokeMethod('setContainer', [$container]); |
|
| 35 | + ->invokeMethod('setContainer', [$container]); |
|
| 36 | 36 | |
| 37 | 37 | return $container; |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | $key = $this->returnKeyType($keyType); |
| 90 | 90 | |
| 91 | 91 | $query->cols(['*']) |
| 92 | - ->where("`{$key}` = '{$id}'"); |
|
| 92 | + ->where("`{$key}` = '{$id}'"); |
|
| 93 | 93 | |
| 94 | 94 | return $this->fireStatementAndReturn($query, true); |
| 95 | 95 | } |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | $key = $this->returnKeyType($keyType); |
| 108 | 108 | |
| 109 | 109 | $query->cols(['*']) |
| 110 | - ->where("`{$key}` = '{$id}'"); |
|
| 110 | + ->where("`{$key}` = '{$id}'"); |
|
| 111 | 111 | |
| 112 | 112 | return $this->fireStatementAndReturn($query); |
| 113 | 113 | } |
@@ -15,9 +15,9 @@ discard block |
||
| 15 | 15 | /** |
| 16 | 16 | * Construct |
| 17 | 17 | * |
| 18 | - * @param Ps2alerts\Api\Repository\AlertRepository $repository |
|
| 19 | - * @param Ps2alerts\Api\Transformer\AlertTransformer $transformer |
|
| 20 | - * @param League\Fractal\Manager $fractal |
|
| 18 | + * @param AlertRepository $repository |
|
| 19 | + * @param AlertTransformer $transformer |
|
| 20 | + * @param Manager $fractal |
|
| 21 | 21 | */ |
| 22 | 22 | public function __construct( |
| 23 | 23 | AlertRepository $repository, |
@@ -34,11 +34,11 @@ discard block |
||
| 34 | 34 | * |
| 35 | 35 | * @see AbstractEndpointController::respondWithItem |
| 36 | 36 | * |
| 37 | - * @param Symfony\Component\HttpFoundation\Request $request |
|
| 38 | - * @param Symfony\Component\HttpFoundation\Response $response |
|
| 37 | + * @param Request $request |
|
| 38 | + * @param Response $response |
|
| 39 | 39 | * @param array $args |
| 40 | 40 | * |
| 41 | - * @return array |
|
| 41 | + * @return Response |
|
| 42 | 42 | */ |
| 43 | 43 | public function getSingle(Request $request, Response $response, array $args) |
| 44 | 44 | { |
@@ -65,10 +65,10 @@ discard block |
||
| 65 | 65 | /** |
| 66 | 66 | * Returns the victories of each faction and the totals |
| 67 | 67 | * |
| 68 | - * @param Symfony\Component\HttpFoundation\Request $request |
|
| 69 | - * @param Symfony\Component\HttpFoundation\Response $response |
|
| 68 | + * @param Request $request |
|
| 69 | + * @param Response $response |
|
| 70 | 70 | * |
| 71 | - * @return array |
|
| 71 | + * @return Response |
|
| 72 | 72 | */ |
| 73 | 73 | public function getVictories(Request $request, Response $response) |
| 74 | 74 | { |
@@ -90,10 +90,10 @@ discard block |
||
| 90 | 90 | /** |
| 91 | 91 | * Returns the dominations of each faction and the totals |
| 92 | 92 | * |
| 93 | - * @param Symfony\Component\HttpFoundation\Request $request |
|
| 94 | - * @param Symfony\Component\HttpFoundation\Response $response |
|
| 93 | + * @param Request $request |
|
| 94 | + * @param Response $response |
|
| 95 | 95 | * |
| 96 | - * @return array |
|
| 96 | + * @return Response |
|
| 97 | 97 | */ |
| 98 | 98 | public function getDominations(Request $request, Response $response) |
| 99 | 99 | { |
@@ -158,7 +158,7 @@ |
||
| 158 | 158 | * |
| 159 | 159 | * @param array $data |
| 160 | 160 | * |
| 161 | - * @return \League\Fractal\Resource\Collection |
|
| 161 | + * @return \League\Fractal\Resource\Item |
|
| 162 | 162 | */ |
| 163 | 163 | public function includeCombats($data) |
| 164 | 164 | { |