@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | |
| 48 | 48 | /** |
| 49 | - * @param null $forcedRole |
|
| 49 | + * @param string|null $forcedRole |
|
| 50 | 50 | * @param null $locale |
| 51 | 51 | * @return Player |
| 52 | 52 | */ |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | /** |
| 151 | - * @param $locale |
|
| 151 | + * @param string $locale |
|
| 152 | 152 | * @return mixed |
| 153 | 153 | */ |
| 154 | 154 | private function nationalityFromLocale($locale) |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | - //Stuff |
|
| 5 | - 'stuff' => 1, |
|
| 4 | + //Stuff |
|
| 5 | + 'stuff' => 1, |
|
| 6 | 6 | ]; |
| 7 | 7 | \ No newline at end of file |
@@ -7,14 +7,14 @@ |
||
| 7 | 7 | */ |
| 8 | 8 | $capsule = new Capsule; |
| 9 | 9 | $capsule->addConnection(array( |
| 10 | - 'driver' => 'mysql', |
|
| 11 | - 'host' => 'localhost', |
|
| 12 | - 'database' => 'dsmanager', |
|
| 13 | - 'username' => 'root', |
|
| 14 | - 'password' => 'root', |
|
| 15 | - 'charset' => 'utf8', |
|
| 16 | - 'collation' => 'utf8_general_ci', |
|
| 17 | - 'prefix' => '' |
|
| 10 | + 'driver' => 'mysql', |
|
| 11 | + 'host' => 'localhost', |
|
| 12 | + 'database' => 'dsmanager', |
|
| 13 | + 'username' => 'root', |
|
| 14 | + 'password' => 'root', |
|
| 15 | + 'charset' => 'utf8', |
|
| 16 | + 'collation' => 'utf8_general_ci', |
|
| 17 | + 'prefix' => '' |
|
| 18 | 18 | )); |
| 19 | 19 | $capsule->setAsGlobal(); |
| 20 | 20 | $capsule->bootEloquent(); |
@@ -15,21 +15,21 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | class Config |
| 17 | 17 | { |
| 18 | - /** |
|
| 19 | - * @param $key |
|
| 20 | - * @param null $directory |
|
| 21 | - * @return null |
|
| 22 | - */ |
|
| 23 | - public static function get($key, $directory = null) |
|
| 24 | - { |
|
| 25 | - $fileName = $directory . "config/"; |
|
| 26 | - $exp = explode(".", $key); |
|
| 27 | - if (is_array($exp) && $exp[0] != null && $exp[1] != null && file_exists($fileName . $exp[0] . ".php")) { |
|
| 28 | - $conf = include($fileName . $exp[0] . ".php"); |
|
| 29 | - $val = array_key_exists($exp[1], $conf) ? $conf[$exp[1]] : null; |
|
| 30 | - return $val; |
|
| 31 | - } |
|
| 32 | - return null; |
|
| 33 | - } |
|
| 18 | + /** |
|
| 19 | + * @param $key |
|
| 20 | + * @param null $directory |
|
| 21 | + * @return null |
|
| 22 | + */ |
|
| 23 | + public static function get($key, $directory = null) |
|
| 24 | + { |
|
| 25 | + $fileName = $directory . "config/"; |
|
| 26 | + $exp = explode(".", $key); |
|
| 27 | + if (is_array($exp) && $exp[0] != null && $exp[1] != null && file_exists($fileName . $exp[0] . ".php")) { |
|
| 28 | + $conf = include($fileName . $exp[0] . ".php"); |
|
| 29 | + $val = array_key_exists($exp[1], $conf) ? $conf[$exp[1]] : null; |
|
| 30 | + return $val; |
|
| 31 | + } |
|
| 32 | + return null; |
|
| 33 | + } |
|
| 34 | 34 | |
| 35 | 35 | } |
| 36 | 36 | \ No newline at end of file |
@@ -9,44 +9,44 @@ |
||
| 9 | 9 | */ |
| 10 | 10 | class Responder |
| 11 | 11 | { |
| 12 | - /** |
|
| 13 | - * @param $content |
|
| 14 | - * @param $response |
|
| 15 | - * @param array $headers |
|
| 16 | - * @return mixed |
|
| 17 | - */ |
|
| 18 | - public static function getJsonResponse($content, $response, $headers = []) |
|
| 19 | - { |
|
| 20 | - $headers['Content-Type'] = 'application/json'; |
|
| 21 | - return self::getResponse($headers, $content, $response); |
|
| 22 | - } |
|
| 12 | + /** |
|
| 13 | + * @param $content |
|
| 14 | + * @param $response |
|
| 15 | + * @param array $headers |
|
| 16 | + * @return mixed |
|
| 17 | + */ |
|
| 18 | + public static function getJsonResponse($content, $response, $headers = []) |
|
| 19 | + { |
|
| 20 | + $headers['Content-Type'] = 'application/json'; |
|
| 21 | + return self::getResponse($headers, $content, $response); |
|
| 22 | + } |
|
| 23 | 23 | |
| 24 | - /** |
|
| 25 | - * @param array $headers |
|
| 26 | - * @param $content |
|
| 27 | - * @param $response |
|
| 28 | - * @return mixed |
|
| 29 | - */ |
|
| 30 | - public static function getResponse($headers = [], $content, $response) |
|
| 31 | - { |
|
| 32 | - $body = $response->getBody(); |
|
| 33 | - $body->write($content); |
|
| 34 | - $i = 0; |
|
| 35 | - foreach ($headers as $header => $value) { |
|
| 36 | - if ($i === 0) { |
|
| 37 | - $response = $response->withHeader( |
|
| 38 | - $header, |
|
| 39 | - $value |
|
| 40 | - ); |
|
| 41 | - } else { |
|
| 42 | - $response = $response->withAddedHeader( |
|
| 43 | - $header, |
|
| 44 | - $value |
|
| 45 | - ); |
|
| 46 | - } |
|
| 47 | - $i++; |
|
| 48 | - } |
|
| 49 | - return $response->withBody($body); |
|
| 50 | - } |
|
| 24 | + /** |
|
| 25 | + * @param array $headers |
|
| 26 | + * @param $content |
|
| 27 | + * @param $response |
|
| 28 | + * @return mixed |
|
| 29 | + */ |
|
| 30 | + public static function getResponse($headers = [], $content, $response) |
|
| 31 | + { |
|
| 32 | + $body = $response->getBody(); |
|
| 33 | + $body->write($content); |
|
| 34 | + $i = 0; |
|
| 35 | + foreach ($headers as $header => $value) { |
|
| 36 | + if ($i === 0) { |
|
| 37 | + $response = $response->withHeader( |
|
| 38 | + $header, |
|
| 39 | + $value |
|
| 40 | + ); |
|
| 41 | + } else { |
|
| 42 | + $response = $response->withAddedHeader( |
|
| 43 | + $header, |
|
| 44 | + $value |
|
| 45 | + ); |
|
| 46 | + } |
|
| 47 | + $i++; |
|
| 48 | + } |
|
| 49 | + return $response->withBody($body); |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | 52 | } |
| 53 | 53 | \ No newline at end of file |
@@ -10,101 +10,101 @@ |
||
| 10 | 10 | use \App\Lib\DsManager\Models\Orm\Coach; |
| 11 | 11 | |
| 12 | 12 | $configuration = [ |
| 13 | - 'settings' => [ |
|
| 14 | - 'displayErrorDetails' => true, |
|
| 15 | - ], |
|
| 13 | + 'settings' => [ |
|
| 14 | + 'displayErrorDetails' => true, |
|
| 15 | + ], |
|
| 16 | 16 | ]; |
| 17 | 17 | $c = new \Slim\Container($configuration); |
| 18 | 18 | $api = new \Slim\App($c); |
| 19 | 19 | |
| 20 | 20 | $api->get('/ping', function ($request, $response, $args) { |
| 21 | - $jsonResp = json_encode( |
|
| 22 | - [ |
|
| 23 | - "status" => "service up", |
|
| 24 | - "message" => "in a bottle", |
|
| 25 | - "config" => \App\Lib\Helpers\Config::get("config1.stuff") |
|
| 26 | - ] |
|
| 27 | - ); |
|
| 28 | - return \App\Lib\Helpers\Responder::getJsonResponse($jsonResp, $response); |
|
| 21 | + $jsonResp = json_encode( |
|
| 22 | + [ |
|
| 23 | + "status" => "service up", |
|
| 24 | + "message" => "in a bottle", |
|
| 25 | + "config" => \App\Lib\Helpers\Config::get("config1.stuff") |
|
| 26 | + ] |
|
| 27 | + ); |
|
| 28 | + return \App\Lib\Helpers\Responder::getJsonResponse($jsonResp, $response); |
|
| 29 | 29 | }); |
| 30 | 30 | |
| 31 | 31 | $api->get('/players', function ($request, $response, $args) { |
| 32 | - $json = json_encode(Player::all()); |
|
| 33 | - return \App\Lib\Helpers\Responder::getJsonResponse($json, $response); |
|
| 32 | + $json = json_encode(Player::all()); |
|
| 33 | + return \App\Lib\Helpers\Responder::getJsonResponse($json, $response); |
|
| 34 | 34 | }); |
| 35 | 35 | |
| 36 | 36 | |
| 37 | 37 | $api->get('/players/{id}', function ($request, $response, $args) { |
| 38 | - return \App\Lib\Helpers\Responder::getJsonResponse( |
|
| 39 | - Player::findOrFail($args['id']), |
|
| 40 | - $response |
|
| 41 | - ); |
|
| 38 | + return \App\Lib\Helpers\Responder::getJsonResponse( |
|
| 39 | + Player::findOrFail($args['id']), |
|
| 40 | + $response |
|
| 41 | + ); |
|
| 42 | 42 | }); |
| 43 | 43 | |
| 44 | 44 | $api->get('/coaches', function ($request, $response, $args) { |
| 45 | - return \App\Lib\Helpers\Responder::getJsonResponse( |
|
| 46 | - Coach::all(), |
|
| 47 | - $response |
|
| 48 | - ); |
|
| 45 | + return \App\Lib\Helpers\Responder::getJsonResponse( |
|
| 46 | + Coach::all(), |
|
| 47 | + $response |
|
| 48 | + ); |
|
| 49 | 49 | }); |
| 50 | 50 | |
| 51 | 51 | $api->get('/teams', function ($request, $response, $args) { |
| 52 | - return \App\Lib\Helpers\Responder::getJsonResponse( |
|
| 53 | - Team::all(), |
|
| 54 | - $response |
|
| 55 | - ); |
|
| 52 | + return \App\Lib\Helpers\Responder::getJsonResponse( |
|
| 53 | + Team::all(), |
|
| 54 | + $response |
|
| 55 | + ); |
|
| 56 | 56 | }); |
| 57 | 57 | |
| 58 | 58 | $api->get('/teams/{id}', function ($request, $response, $args) { |
| 59 | - return \App\Lib\Helpers\Responder::getJsonResponse( |
|
| 60 | - Team::with( |
|
| 61 | - 'roster', |
|
| 62 | - 'coach' |
|
| 63 | - )->where( |
|
| 64 | - [ |
|
| 65 | - 'id' => $args['id'] |
|
| 66 | - ] |
|
| 67 | - )->get(), |
|
| 68 | - $response |
|
| 69 | - ); |
|
| 59 | + return \App\Lib\Helpers\Responder::getJsonResponse( |
|
| 60 | + Team::with( |
|
| 61 | + 'roster', |
|
| 62 | + 'coach' |
|
| 63 | + )->where( |
|
| 64 | + [ |
|
| 65 | + 'id' => $args['id'] |
|
| 66 | + ] |
|
| 67 | + )->get(), |
|
| 68 | + $response |
|
| 69 | + ); |
|
| 70 | 70 | }); |
| 71 | 71 | |
| 72 | 72 | $api->get('/teams/{id}/players', function ($request, $response, $args) { |
| 73 | - return \App\Lib\Helpers\Responder::getJsonResponse( |
|
| 74 | - Team::with( |
|
| 75 | - 'roster' |
|
| 76 | - )->where( |
|
| 77 | - [ |
|
| 78 | - 'id' => $args['id'] |
|
| 79 | - ] |
|
| 80 | - )->get(), |
|
| 81 | - $response |
|
| 82 | - ); |
|
| 73 | + return \App\Lib\Helpers\Responder::getJsonResponse( |
|
| 74 | + Team::with( |
|
| 75 | + 'roster' |
|
| 76 | + )->where( |
|
| 77 | + [ |
|
| 78 | + 'id' => $args['id'] |
|
| 79 | + ] |
|
| 80 | + )->get(), |
|
| 81 | + $response |
|
| 82 | + ); |
|
| 83 | 83 | }); |
| 84 | 84 | |
| 85 | 85 | $api->get('/teams/{id}/players/{playerId}', function ($request, $response, $args) { |
| 86 | - return \App\Lib\Helpers\Responder::getJsonResponse( |
|
| 87 | - Player::where( |
|
| 88 | - [ |
|
| 89 | - 'id' => $args['playerId'], |
|
| 90 | - 'team_id' => $args['id'] |
|
| 91 | - ] |
|
| 92 | - )->get(), |
|
| 93 | - $response |
|
| 94 | - ); |
|
| 86 | + return \App\Lib\Helpers\Responder::getJsonResponse( |
|
| 87 | + Player::where( |
|
| 88 | + [ |
|
| 89 | + 'id' => $args['playerId'], |
|
| 90 | + 'team_id' => $args['id'] |
|
| 91 | + ] |
|
| 92 | + )->get(), |
|
| 93 | + $response |
|
| 94 | + ); |
|
| 95 | 95 | }); |
| 96 | 96 | |
| 97 | 97 | $api->get('/teams/{id}/coach', function ($request, $response, $args) { |
| 98 | - return \App\Lib\Helpers\Responder::getJsonResponse( |
|
| 99 | - Team::with( |
|
| 100 | - 'coach' |
|
| 101 | - )->where( |
|
| 102 | - [ |
|
| 103 | - 'id' => $args['id'] |
|
| 104 | - ] |
|
| 105 | - )->get(), |
|
| 106 | - $response |
|
| 107 | - ); |
|
| 98 | + return \App\Lib\Helpers\Responder::getJsonResponse( |
|
| 99 | + Team::with( |
|
| 100 | + 'coach' |
|
| 101 | + )->where( |
|
| 102 | + [ |
|
| 103 | + 'id' => $args['id'] |
|
| 104 | + ] |
|
| 105 | + )->get(), |
|
| 106 | + $response |
|
| 107 | + ); |
|
| 108 | 108 | }); |
| 109 | 109 | |
| 110 | 110 | $api->run(); |
| 111 | 111 | \ No newline at end of file |