vikkio88 /
dsManager-php
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | */ |
| 64 | 64 | function __toString() |
| 65 | 65 | {
|
| 66 | - return "" . $this->moduleCode; |
|
| 66 | + return "".$this->moduleCode; |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | |
@@ -31,7 +31,9 @@ discard block |
||
| 31 | 31 | {
|
| 32 | 32 | $this->moduleCode = $module; |
| 33 | 33 | $this->configuration = Config::get("modules.modules", "api/")[$module];
|
| 34 | - if ($this->configuration == null) throw new \InvalidArgumentException("Not a valid Module supplied");
|
|
| 34 | + if ($this->configuration == null) { |
|
| 35 | + throw new \InvalidArgumentException("Not a valid Module supplied"); |
|
| 36 | + } |
|
| 35 | 37 | } |
| 36 | 38 | |
| 37 | 39 | /** |
@@ -98,8 +100,9 @@ discard block |
||
| 98 | 100 | $roles = \App\Lib\Helpers\Config::get('modules.roles', "api/");
|
| 99 | 101 | $rolesKeys = array_keys($roles); |
| 100 | 102 | foreach ($this->configuration["roles"] as $index => $playNum) {
|
| 101 | - if ($playNum != 0 || $complete) |
|
| 102 | - $rolesNeeded[$rolesKeys[$index]] = $playNum; |
|
| 103 | + if ($playNum != 0 || $complete) { |
|
| 104 | + $rolesNeeded[$rolesKeys[$index]] = $playNum; |
|
| 105 | + } |
|
| 103 | 106 | } |
| 104 | 107 | |
| 105 | 108 | return $rolesNeeded; |
@@ -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 |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | $c = new \Slim\Container($configuration); |
| 18 | 18 | $api = new \Slim\App($c); |
| 19 | 19 | |
| 20 | -$api->get('/ping', function ($request, $response, $args) {
|
|
| 20 | +$api->get('/ping', function($request, $response, $args) {
|
|
| 21 | 21 | $jsonResp = json_encode( |
| 22 | 22 | [ |
| 23 | 23 | "status" => "service up", |
@@ -28,34 +28,34 @@ discard block |
||
| 28 | 28 | return \App\Lib\Helpers\Responder::getJsonResponse($jsonResp, $response); |
| 29 | 29 | }); |
| 30 | 30 | |
| 31 | -$api->get('/players', function ($request, $response, $args) {
|
|
| 31 | +$api->get('/players', function($request, $response, $args) {
|
|
| 32 | 32 | $json = json_encode(Player::all()); |
| 33 | 33 | return \App\Lib\Helpers\Responder::getJsonResponse($json, $response); |
| 34 | 34 | }); |
| 35 | 35 | |
| 36 | 36 | |
| 37 | -$api->get('/players/{id}', function ($request, $response, $args) {
|
|
| 37 | +$api->get('/players/{id}', function($request, $response, $args) {
|
|
| 38 | 38 | return \App\Lib\Helpers\Responder::getJsonResponse( |
| 39 | 39 | Player::findOrFail($args['id']), |
| 40 | 40 | $response |
| 41 | 41 | ); |
| 42 | 42 | }); |
| 43 | 43 | |
| 44 | -$api->get('/coaches', function ($request, $response, $args) {
|
|
| 44 | +$api->get('/coaches', function($request, $response, $args) {
|
|
| 45 | 45 | return \App\Lib\Helpers\Responder::getJsonResponse( |
| 46 | 46 | Coach::all(), |
| 47 | 47 | $response |
| 48 | 48 | ); |
| 49 | 49 | }); |
| 50 | 50 | |
| 51 | -$api->get('/teams', function ($request, $response, $args) {
|
|
| 51 | +$api->get('/teams', function($request, $response, $args) {
|
|
| 52 | 52 | return \App\Lib\Helpers\Responder::getJsonResponse( |
| 53 | 53 | Team::all(), |
| 54 | 54 | $response |
| 55 | 55 | ); |
| 56 | 56 | }); |
| 57 | 57 | |
| 58 | -$api->get('/teams/{id}', function ($request, $response, $args) {
|
|
| 58 | +$api->get('/teams/{id}', function($request, $response, $args) {
|
|
| 59 | 59 | return \App\Lib\Helpers\Responder::getJsonResponse( |
| 60 | 60 | Team::with( |
| 61 | 61 | 'roster', |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | ); |
| 70 | 70 | }); |
| 71 | 71 | |
| 72 | -$api->get('/teams/{id}/players', function ($request, $response, $args) {
|
|
| 72 | +$api->get('/teams/{id}/players', function($request, $response, $args) {
|
|
| 73 | 73 | return \App\Lib\Helpers\Responder::getJsonResponse( |
| 74 | 74 | Team::with( |
| 75 | 75 | 'roster' |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | ); |
| 83 | 83 | }); |
| 84 | 84 | |
| 85 | -$api->get('/teams/{id}/players/{playerId}', function ($request, $response, $args) {
|
|
| 85 | +$api->get('/teams/{id}/players/{playerId}', function($request, $response, $args) {
|
|
| 86 | 86 | return \App\Lib\Helpers\Responder::getJsonResponse( |
| 87 | 87 | Player::where( |
| 88 | 88 | [ |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | ); |
| 95 | 95 | }); |
| 96 | 96 | |
| 97 | -$api->get('/teams/{id}/coach', function ($request, $response, $args) {
|
|
| 97 | +$api->get('/teams/{id}/coach', function($request, $response, $args) {
|
|
| 98 | 98 | return \App\Lib\Helpers\Responder::getJsonResponse( |
| 99 | 99 | Team::with( |
| 100 | 100 | 'coach' |
@@ -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' => '', |
|
| 15 | - 'charset' => 'utf8', |
|
| 16 | - 'collation' => 'utf8_general_ci', |
|
| 17 | - 'prefix' => '' |
|
| 10 | + 'driver' => 'mysql', |
|
| 11 | + 'host' => 'localhost', |
|
| 12 | + 'database' => 'dsmanager', |
|
| 13 | + 'username' => 'root', |
|
| 14 | + 'password' => '', |
|
| 15 | + 'charset' => 'utf8', |
|
| 16 | + 'collation' => 'utf8_general_ci', |
|
| 17 | + 'prefix' => '' |
|
| 18 | 18 | )); |
| 19 | 19 | $capsule->setAsGlobal(); |
| 20 | 20 | $capsule->bootEloquent(); |
