@@ -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) |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | $team = $rndF->getTeam(); |
66 | 66 | |
67 | 67 | //var_dump($team->toArray()); |
68 | - echo "\n" . $team->name . " avg:"; |
|
68 | + echo "\n".$team->name." avg:"; |
|
69 | 69 | echo $team->getAvgSkill(); |
70 | 70 | |
71 | 71 | echo "\n Adding player:"; |
@@ -98,8 +98,8 @@ discard block |
||
98 | 98 | for ($i = 1; $i <= 20; $i++) { |
99 | 99 | echo "\n\n-------------"; |
100 | 100 | $team = $rndF->getTeam(); |
101 | - echo "\n team: " . $team->name; |
|
102 | - echo "\n nat: " . $team->nationality; |
|
101 | + echo "\n team: ".$team->name; |
|
102 | + echo "\n nat: ".$team->nationality; |
|
103 | 103 | echo "\n skill avg: "; |
104 | 104 | echo $team->getAvgSkill(); |
105 | 105 | echo "\n age avg: "; |
@@ -118,9 +118,9 @@ discard block |
||
118 | 118 | $rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT"); |
119 | 119 | $italian = $rndF->getTeam(); |
120 | 120 | |
121 | - echo "\n" . $italian->name . "(" . $italian->getAvgSkill() . ") - " . $spanish->name . "(" . $spanish->getAvgSkill() . ") ...... "; |
|
121 | + echo "\n".$italian->name."(".$italian->getAvgSkill().") - ".$spanish->name."(".$spanish->getAvgSkill().") ...... "; |
|
122 | 122 | $result = (new \App\Lib\DsManager\Models\Match($italian, $spanish))->simulate()->toArray(); |
123 | - echo $result['goalHome'] . " - " . $result['goalAway']; |
|
123 | + echo $result['goalHome']." - ".$result['goalAway']; |
|
124 | 124 | echo "\n\n"; |
125 | 125 | } |
126 | 126 | |
@@ -146,9 +146,9 @@ discard block |
||
146 | 146 | $rndF = new \App\Lib\DsManager\Helpers\RandomFiller($randomLocale); |
147 | 147 | $opponent = $rndF->getTeam(); |
148 | 148 | |
149 | - echo "\n" . $opponent->name . "(" . $opponent->getAvgSkill() . ") - " . $myTeam->name . "(" . $myTeam->getAvgSkill() . ") ...... "; |
|
149 | + echo "\n".$opponent->name."(".$opponent->getAvgSkill().") - ".$myTeam->name."(".$myTeam->getAvgSkill().") ...... "; |
|
150 | 150 | $result = (new \App\Lib\DsManager\Models\Match($opponent, $myTeam))->simulate()->toArray(); |
151 | - echo $result['goalHome'] . " - " . $result['goalAway']; |
|
151 | + echo $result['goalHome']." - ".$result['goalAway']; |
|
152 | 152 | $result = $result['info']; |
153 | 153 | if (!$result['isDraw']) { |
154 | 154 | if ($result['winner']->name == $myTeam->name) { |
@@ -178,10 +178,10 @@ discard block |
||
178 | 178 | $modules = array_keys($modules); |
179 | 179 | foreach ($modules as $mod) { |
180 | 180 | $module = new \App\Lib\DsManager\Models\Module($mod); |
181 | - echo "\n------------\n\n" . $module; |
|
182 | - echo "\nD: " . $module->isDefensive(); |
|
183 | - echo "\nB: " . $module->isBalanced(); |
|
184 | - echo "\nO: " . $module->isOffensive(); |
|
181 | + echo "\n------------\n\n".$module; |
|
182 | + echo "\nD: ".$module->isDefensive(); |
|
183 | + echo "\nB: ".$module->isBalanced(); |
|
184 | + echo "\nO: ".$module->isOffensive(); |
|
185 | 185 | echo "\n"; |
186 | 186 | print_r($module->getRoleNeeded()); |
187 | 187 | echo "\napplicable? "; |
@@ -12,7 +12,7 @@ |
||
12 | 12 | */ |
13 | 13 | public function testIlluminateConnection() |
14 | 14 | { |
15 | - Illuminate\Database\Capsule\Manager::schema()->create('test', function ($table) { |
|
15 | + Illuminate\Database\Capsule\Manager::schema()->create('test', function($table) { |
|
16 | 16 | $table->increments('id'); |
17 | 17 | $table->string('email')->unique(); |
18 | 18 | $table->timestamps(); |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | $this->assertNotEmpty($module["roles"]); |
43 | 43 | foreach ($module["roles"] as $index => $playNum) { |
44 | 44 | if ($playNum != 0) |
45 | - echo $playNum . " " . $roles[$rolesKeys[$index]]["description"] . " "; |
|
45 | + echo $playNum." ".$roles[$rolesKeys[$index]]["description"]." "; |
|
46 | 46 | } |
47 | 47 | } |
48 | 48 | } |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | echo "\n"; |
59 | 59 | |
60 | 60 | for ($i = 1; $i <= 100; $i++) { |
61 | - echo $i . " . "; |
|
61 | + echo $i." . "; |
|
62 | 62 | if (\App\Lib\DsManager\Helpers\Randomizer::boolOnPercentage(20)) { |
63 | 63 | echo "yes"; |
64 | 64 | $yes++; |
@@ -41,8 +41,9 @@ |
||
41 | 41 | echo "\nto play $key\n"; |
42 | 42 | $this->assertNotEmpty($module["roles"]); |
43 | 43 | foreach ($module["roles"] as $index => $playNum) { |
44 | - if ($playNum != 0) |
|
45 | - echo $playNum . " " . $roles[$rolesKeys[$index]]["description"] . " "; |
|
44 | + if ($playNum != 0) { |
|
45 | + echo $playNum . " " . $roles[$rolesKeys[$index]]["description"] . " "; |
|
46 | + } |
|
46 | 47 | } |
47 | 48 | } |
48 | 49 | } |
@@ -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 |
@@ -22,10 +22,10 @@ |
||
22 | 22 | */ |
23 | 23 | public static function get($key, $directory = null) |
24 | 24 | { |
25 | - $fileName = $directory . "config/"; |
|
25 | + $fileName = $directory."config/"; |
|
26 | 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"); |
|
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 | 29 | $val = array_key_exists($exp[1], $conf) ? $conf[$exp[1]] : null; |
30 | 30 | return $val; |
31 | 31 | } |
@@ -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' |