Completed
Push — master ( 84309c...24e320 )
by Vincenzo
02:46
created
api/config/modules.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -4,39 +4,39 @@
 block discarded – undo
4 4
 	'modules' => [
5 5
 		"4-4-2" => [
6 6
 			'roles'=>[1,1,2,1,1,2,1,0,2,0],
7
-            'character' => 2
7
+			'character' => 2
8 8
 		],
9 9
 		"4-3-3" => [
10 10
 			'roles'=>[1,1,2,1,0,3,0,1,1,1],
11
-            'character' => 1
11
+			'character' => 1
12 12
 		],
13 13
 		"4-5-1" => [
14 14
 			'roles'=>[1,1,2,1,1,3,1,0,1,0],
15
-            'character' => 4
15
+			'character' => 4
16 16
 		],
17 17
 		"4-2-4" => [
18 18
 			'roles'=>[1,1,2,1,0,2,0,1,2,1],
19
-            'character' => 1
19
+			'character' => 1
20 20
 		],
21 21
 		"3-5-2" => [
22 22
 			'roles'=>[1,0,3,0,1,3,1,0,2,0],
23
-            'character' => 2
23
+			'character' => 2
24 24
 		],
25 25
 		"3-4-3" => [
26 26
 			'roles'=>[1,0,3,0,1,2,1,1,1,1],
27
-            'character' => 1
27
+			'character' => 1
28 28
 		],
29 29
 		"3-3-4" => [
30 30
 			'roles'=>[1,0,3,0,0,3,0,1,2,1],
31
-            'character' => 1
31
+			'character' => 1
32 32
 		],
33 33
 		"5-4-1" => [
34 34
 			'roles'=>[1,1,3,1,1,2,1,0,1,0],
35
-            'character' => 4
35
+			'character' => 4
36 36
 		],
37 37
 		"5-3-2" => [
38 38
 			'roles'=>[1,1,3,1,0,3,0,0,2,0],
39
-            'character' => 4
39
+			'character' => 4
40 40
 		]
41 41
 	],
42 42
 	'roles' => [
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -3,39 +3,39 @@
 block discarded – undo
3 3
 return [
4 4
 	'modules' => [
5 5
 		"4-4-2" => [
6
-			'roles'=>[1,1,2,1,1,2,1,0,2,0],
6
+			'roles'=>[1, 1, 2, 1, 1, 2, 1, 0, 2, 0],
7 7
             'character' => 2
8 8
 		],
9 9
 		"4-3-3" => [
10
-			'roles'=>[1,1,2,1,0,3,0,1,1,1],
10
+			'roles'=>[1, 1, 2, 1, 0, 3, 0, 1, 1, 1],
11 11
             'character' => 1
12 12
 		],
13 13
 		"4-5-1" => [
14
-			'roles'=>[1,1,2,1,1,3,1,0,1,0],
14
+			'roles'=>[1, 1, 2, 1, 1, 3, 1, 0, 1, 0],
15 15
             'character' => 4
16 16
 		],
17 17
 		"4-2-4" => [
18
-			'roles'=>[1,1,2,1,0,2,0,1,2,1],
18
+			'roles'=>[1, 1, 2, 1, 0, 2, 0, 1, 2, 1],
19 19
             'character' => 1
20 20
 		],
21 21
 		"3-5-2" => [
22
-			'roles'=>[1,0,3,0,1,3,1,0,2,0],
22
+			'roles'=>[1, 0, 3, 0, 1, 3, 1, 0, 2, 0],
23 23
             'character' => 2
24 24
 		],
25 25
 		"3-4-3" => [
26
-			'roles'=>[1,0,3,0,1,2,1,1,1,1],
26
+			'roles'=>[1, 0, 3, 0, 1, 2, 1, 1, 1, 1],
27 27
             'character' => 1
28 28
 		],
29 29
 		"3-3-4" => [
30
-			'roles'=>[1,0,3,0,0,3,0,1,2,1],
30
+			'roles'=>[1, 0, 3, 0, 0, 3, 0, 1, 2, 1],
31 31
             'character' => 1
32 32
 		],
33 33
 		"5-4-1" => [
34
-			'roles'=>[1,1,3,1,1,2,1,0,1,0],
34
+			'roles'=>[1, 1, 3, 1, 1, 2, 1, 0, 1, 0],
35 35
             'character' => 4
36 36
 		],
37 37
 		"5-3-2" => [
38
-			'roles'=>[1,1,3,1,0,3,0,0,2,0],
38
+			'roles'=>[1, 1, 3, 1, 0, 3, 0, 0, 2, 0],
39 39
             'character' => 4
40 40
 		]
41 41
 	],
Please login to merge, or discard this patch.
api/Lib/DsManager/Helpers/RandomFiller.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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)
Please login to merge, or discard this patch.
api/tests/ModelsTest.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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? ";
Please login to merge, or discard this patch.
api/tests/ExampleTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
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();
Please login to merge, or discard this patch.
api/tests/ModuleConfigurationTest.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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++;
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,8 +41,9 @@
 block discarded – undo
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
 	}
Please login to merge, or discard this patch.
api/config/config1.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
api/config/config.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -7,14 +7,14 @@
 block discarded – undo
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();
Please login to merge, or discard this patch.
api/Lib/Helpers/Config.php 2 patches
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -15,21 +15,21 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,10 +22,10 @@
 block discarded – undo
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
         }
Please login to merge, or discard this patch.
api/Lib/Helpers/Responder.php 1 patch
Indentation   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -9,44 +9,44 @@
 block discarded – undo
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
Please login to merge, or discard this patch.