@@ -3,7 +3,7 @@ |
||
3 | 3 | $container = new League\Container\Container; |
4 | 4 | |
5 | 5 | // Register the request object singleton to be used later in the request cyncle |
6 | -$container->singleton('Symfony\Component\HttpFoundation\Request', function () { |
|
6 | +$container->singleton('Symfony\Component\HttpFoundation\Request', function() { |
|
7 | 7 | return Symfony\Component\HttpFoundation\Request::createFromGlobals(); |
8 | 8 | }); |
9 | 9 |
@@ -18,22 +18,22 @@ |
||
18 | 18 | |
19 | 19 | // Inflectors |
20 | 20 | $container->inflector('Ps2alerts\Api\Contract\ConfigAwareInterface') |
21 | - ->invokeMethod('setConfig', ['config']); |
|
21 | + ->invokeMethod('setConfig', ['config']); |
|
22 | 22 | $container->inflector('Ps2alerts\Api\Contract\DatabaseAwareInterface') |
23 | - ->invokeMethod('setDatabaseDriver', ['Database']) |
|
24 | - ->invokeMethod('setDatabaseDataDriver', ['Database\Data']); |
|
23 | + ->invokeMethod('setDatabaseDriver', ['Database']) |
|
24 | + ->invokeMethod('setDatabaseDataDriver', ['Database\Data']); |
|
25 | 25 | $container->inflector('Ps2alerts\Api\Contract\LogAwareInterface') |
26 | - ->invokeMethod('setLogDriver', ['Monolog\Logger']); |
|
26 | + ->invokeMethod('setLogDriver', ['Monolog\Logger']); |
|
27 | 27 | $container->inflector('Ps2alerts\Api\Contract\TemplateAwareInterface') |
28 | - ->invokeMethod('setTemplateDriver', ['Twig_Environment']); |
|
28 | + ->invokeMethod('setTemplateDriver', ['Twig_Environment']); |
|
29 | 29 | $container->inflector('Ps2alerts\Api\Contract\RedisAwareInterface') |
30 | - ->invokeMethod('setRedisDriver', ['redis']); |
|
30 | + ->invokeMethod('setRedisDriver', ['redis']); |
|
31 | 31 | $container->inflector('Ps2alerts\Api\Contract\UuidAwareInterface') |
32 | - ->invokeMethod('setUuidDriver', ['Ramsey\Uuid\Uuid']); |
|
32 | + ->invokeMethod('setUuidDriver', ['Ramsey\Uuid\Uuid']); |
|
33 | 33 | |
34 | 34 | |
35 | 35 | // Container Inflector |
36 | 36 | $container->inflector('League\Container\ContainerAwareInterface') |
37 | - ->invokeMethod('setContainer', [$container]); |
|
37 | + ->invokeMethod('setContainer', [$container]); |
|
38 | 38 | |
39 | 39 | return $container; |
@@ -18,7 +18,7 @@ |
||
18 | 18 | */ |
19 | 19 | public function register() |
20 | 20 | { |
21 | - $this->getContainer()->singleton('config', function () { |
|
21 | + $this->getContainer()->singleton('config', function() { |
|
22 | 22 | return include __DIR__ . '/../../config/config.php'; |
23 | 23 | }); |
24 | 24 | } |
@@ -23,7 +23,7 @@ |
||
23 | 23 | */ |
24 | 24 | public function register() |
25 | 25 | { |
26 | - $this->getContainer()->singleton('redis', function () { |
|
26 | + $this->getContainer()->singleton('redis', function() { |
|
27 | 27 | $redisConfig = $this->getContainer()->get('config')['redis']; |
28 | 28 | |
29 | 29 | $client = new Client([ |
@@ -20,7 +20,7 @@ |
||
20 | 20 | */ |
21 | 21 | public function register() |
22 | 22 | { |
23 | - $this->getContainer()->singleton('Monolog\Logger', function () { |
|
23 | + $this->getContainer()->singleton('Monolog\Logger', function() { |
|
24 | 24 | $log = new Logger('app'); |
25 | 25 | $log->pushHandler( |
26 | 26 | new StreamHandler(__DIR__ . '/../../logs/app.log', Logger::DEBUG) |
@@ -19,7 +19,7 @@ |
||
19 | 19 | */ |
20 | 20 | public function register() |
21 | 21 | { |
22 | - $this->getContainer()->add('Ramsey\Uuid\Uuid', function () { |
|
22 | + $this->getContainer()->add('Ramsey\Uuid\Uuid', function() { |
|
23 | 23 | $uuid = Uuid::Uuid4(); |
24 | 24 | return $uuid; |
25 | 25 | }); |
@@ -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 | } |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | * @param \League\Fractal\TransformerAbstract $transformer 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, $transformer, Response $response) |
110 | 110 | { |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | * @param \League\Fractal\TransformerAbstract $transformer The Transformer to pass through to Fractal |
135 | 135 | * @param \Symfony\Component\HttpFoundation\Response $response The client's response |
136 | 136 | * |
137 | - * @return array |
|
137 | + * @return Response |
|
138 | 138 | */ |
139 | 139 | protected function respondWithCollection($collection, $transformer, Response $response) |
140 | 140 | { |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | * Creates a collection array and sends it back to hence it came. |
146 | 146 | * |
147 | 147 | * @param array $collection |
148 | - * @param /League/Fractal/TransformerAbstract $transformer |
|
148 | + * @param \League\Fractal\TransformerAbstract $transformer |
|
149 | 149 | * |
150 | 150 | * @return array |
151 | 151 | */ |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | * @param string $message Response message to put in the error |
183 | 183 | * @param int $errorCode Error code to set |
184 | 184 | * |
185 | - * @return array |
|
185 | + * @return Response |
|
186 | 186 | */ |
187 | 187 | protected function respondWithError(Response $response, $message, $errorCode) |
188 | 188 | { |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | * @param \Symfony\Component\HttpFoundation\Response $response |
210 | 210 | * @param string $message |
211 | 211 | * |
212 | - * @return void |
|
212 | + * @return Response |
|
213 | 213 | */ |
214 | 214 | public function errorEmpty(Response $response, $message = 'No data / Empty') |
215 | 215 | { |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | * @param \Symfony\Component\HttpFoundation\Response $response |
224 | 224 | * @param string $message |
225 | 225 | * |
226 | - * @return void |
|
226 | + * @return Response |
|
227 | 227 | */ |
228 | 228 | public function errorForbidden(Response $response, $message = 'Forbidden') |
229 | 229 | { |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | * @param \Symfony\Component\HttpFoundation\Response $response |
238 | 238 | * @param string $message |
239 | 239 | * |
240 | - * @return void |
|
240 | + * @return Response |
|
241 | 241 | */ |
242 | 242 | public function errorInternalError(Response $response, $message = 'Internal Error') |
243 | 243 | { |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | * @param \Symfony\Component\HttpFoundation\Response $response |
252 | 252 | * @param string $message |
253 | 253 | * |
254 | - * @return void |
|
254 | + * @return Response |
|
255 | 255 | */ |
256 | 256 | public function errorNotFound(Response $response, $message = 'Resource Not Found') |
257 | 257 | { |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | * @param \Symfony\Component\HttpFoundation\Response $response |
266 | 266 | * @param string $message |
267 | 267 | * |
268 | - * @return void |
|
268 | + * @return Response |
|
269 | 269 | */ |
270 | 270 | public function errorUnauthorized(Response $response, $message = 'Unauthorized') |
271 | 271 | { |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | /** |
291 | 291 | * Reads any requested includes and adds them to the item / collection |
292 | 292 | * |
293 | - * @param Symfony\Component\HttpFoundation\Request $request |
|
293 | + * @param Request $request |
|
294 | 294 | * |
295 | 295 | * @return void |
296 | 296 | */ |
@@ -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 | } |
@@ -78,8 +78,8 @@ |
||
78 | 78 | /** |
79 | 79 | * Allows for Raw SQL firing without the query builder |
80 | 80 | * |
81 | - * @param \Aura\SqlQuery\AbstractQuery $query |
|
82 | 81 | * @param boolean $single |
82 | + * @param string $sql |
|
83 | 83 | * |
84 | 84 | * @return array |
85 | 85 | */ |
@@ -20,9 +20,9 @@ discard block |
||
20 | 20 | /** |
21 | 21 | * Construct |
22 | 22 | * |
23 | - * @param Ps2alerts\Api\Repository\AlertRepository $repository |
|
24 | - * @param Ps2alerts\Api\Transformer\AlertTransformer $transformer |
|
25 | - * @param League\Fractal\Manager $fractal |
|
23 | + * @param AlertRepository $repository |
|
24 | + * @param AlertTransformer $transformer |
|
25 | + * @param Manager $fractal |
|
26 | 26 | */ |
27 | 27 | public function __construct( |
28 | 28 | AlertRepository $repository, |
@@ -37,10 +37,10 @@ discard block |
||
37 | 37 | /** |
38 | 38 | * Returns the victories of each faction and the totals |
39 | 39 | * |
40 | - * @param Symfony\Component\HttpFoundation\Request $request |
|
41 | - * @param Symfony\Component\HttpFoundation\Response $response |
|
40 | + * @param Request $request |
|
41 | + * @param Response $response |
|
42 | 42 | * |
43 | - * @return array |
|
43 | + * @return Response |
|
44 | 44 | */ |
45 | 45 | public function getVictories(Request $request, Response $response) |
46 | 46 | { |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | * @param \Symfony\Component\HttpFoundation\Request $request |
54 | 54 | * @param \Symfony\Component\HttpFoundation\Response $response |
55 | 55 | * |
56 | - * @return array |
|
56 | + * @return Response |
|
57 | 57 | */ |
58 | 58 | public function getDominations(Request $request, Response $response) |
59 | 59 | { |
@@ -76,12 +76,12 @@ discard block |
||
76 | 76 | $servers = $this->getConfigItem('servers'); |
77 | 77 | $zones = $this->getConfigItem('zones'); |
78 | 78 | |
79 | - if (! empty($serversQuery)) { |
|
79 | + if (!empty($serversQuery)) { |
|
80 | 80 | $check = explode(',', $serversQuery); |
81 | 81 | |
82 | 82 | // Run a check on the IDs provided to make sure they're valid and no naughty things are being passed |
83 | - foreach($check as $id) { |
|
84 | - if (! in_array($id, $servers)) { |
|
83 | + foreach ($check as $id) { |
|
84 | + if (!in_array($id, $servers)) { |
|
85 | 85 | return $this->errorWrongArgs($response, 'Invalid Server Arguments passed'); |
86 | 86 | } |
87 | 87 | } |
@@ -91,12 +91,12 @@ discard block |
||
91 | 91 | $servers = implode(',', $servers); |
92 | 92 | } |
93 | 93 | |
94 | - if (! empty($zonesQuery)) { |
|
94 | + if (!empty($zonesQuery)) { |
|
95 | 95 | $check = explode(',', $zonesQuery); |
96 | 96 | |
97 | 97 | // Run a check on the IDs provided to make sure they're valid and no naughty things are being passed |
98 | - foreach($check as $id) { |
|
99 | - if (! in_array($id, $zones)) { |
|
98 | + foreach ($check as $id) { |
|
99 | + if (!in_array($id, $zones)) { |
|
100 | 100 | return $this->errorWrongArgs($response, 'Invalid Zone Arguments passed'); |
101 | 101 | } |
102 | 102 | } |