Completed
Push — master ( 9fe9e2...c60305 )
by Vincenzo
04:53 queued 02:24
created
api/config/modules.php 1 patch
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.
api/Lib/Helpers/Config.php 1 patch
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.
api/Lib/Helpers/TextFormatter.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -10,11 +10,11 @@
 block discarded – undo
10 10
 class TextFormatter
11 11
 {
12 12
 
13
-    /**
14
-     * @param $currencyString
15
-     * @return float
16
-     */
17
-    public static function currencyStringToFloat($currencyString){
13
+	/**
14
+	 * @param $currencyString
15
+	 * @return float
16
+	 */
17
+	public static function currencyStringToFloat($currencyString){
18 18
 		//currency is always in this format € 550
19 19
 
20 20
 		return floatval(
Please login to merge, or discard this patch.
api/Lib/Helpers/Dom.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -9,11 +9,11 @@
 block discarded – undo
9 9
  */
10 10
 class Dom
11 11
 {
12
-    /**
13
-     * @param $node
14
-     * @return string
15
-     */
16
-    public static function getHtml($node) {
12
+	/**
13
+	 * @param $node
14
+	 * @return string
15
+	 */
16
+	public static function getHtml($node) {
17 17
 		$innerHTML= '';
18 18
 		$children = $node->childNodes;
19 19
 		foreach ($children as $child) {
Please login to merge, or discard this patch.
api/Lib/Helpers/RegExp.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -9,24 +9,24 @@
 block discarded – undo
9 9
  */
10 10
 class RegExp
11 11
 {
12
-    /**
13
-     * @param $regexp
14
-     * @param $target
15
-     * @return null
16
-     */
17
-    public static function getFirstMatch($regexp, $target)
12
+	/**
13
+	 * @param $regexp
14
+	 * @param $target
15
+	 * @return null
16
+	 */
17
+	public static function getFirstMatch($regexp, $target)
18 18
 	{
19 19
 		preg_match_all($regexp, $target, $matches);
20 20
 		$match = array_key_exists(0,$matches[1]) ? $matches[1][0] : null;
21 21
 		return $match;
22 22
 	}
23 23
 
24
-    /**
25
-     * @param $regexp
26
-     * @param $target
27
-     * @return null
28
-     */
29
-    public static function getAllMatch($regexp, $target)
24
+	/**
25
+	 * @param $regexp
26
+	 * @param $target
27
+	 * @return null
28
+	 */
29
+	public static function getAllMatch($regexp, $target)
30 30
 	{
31 31
 		$matches = null;
32 32
 		preg_match_all($regexp, $target, $matches);
Please login to merge, or discard this patch.
api/Lib/DsManager/Models/Player.php 1 patch
Braces   +45 added lines, -15 removed lines patch added patch discarded remove patch
@@ -44,7 +44,9 @@  discard block
 block discarded – undo
44 44
 		$val -= rand(1, 3);
45 45
 		$val += $this->onRoleModifier();
46 46
 		$val += $this->spareChange();
47
-		if ($val < 0) $val = $val * -1;
47
+		if ($val < 0) {
48
+			$val = $val * -1;
49
+		}
48 50
 		$val = round($val, 2);
49 51
 		return $val;
50 52
 	}
@@ -57,7 +59,9 @@  discard block
 block discarded – undo
57 59
 		if ($this->wageReq == null) {
58 60
 			$wage = round($this->getVal() / 10.0, 2);
59 61
 			$wage += $this->spareChange();
60
-			if ($wage < 0) $wage = $wage * -1;
62
+			if ($wage < 0) {
63
+				$wage = $wage * -1;
64
+			}
61 65
 			$this->wageReq = round($wage, 2);
62 66
 		}
63 67
 		return $this->wageReq;
@@ -80,13 +84,27 @@  discard block
 block discarded – undo
80 84
 	 */
81 85
 	private function priceOnSkill()
82 86
 	{
83
-		if ($this->skillAvg > 98) return 130.0;
84
-		if ($this->skillAvg > 90) return 80.0;
85
-		if ($this->skillAvg > 80) return 50.0;
86
-		if ($this->skillAvg > 76) return 20.0;
87
-		if ($this->skillAvg > 70) return 10.0;
88
-		if ($this->skillAvg > 60) return 5.0;
89
-		if ($this->skillAvg > 50) return 2.0;
87
+		if ($this->skillAvg > 98) {
88
+			return 130.0;
89
+		}
90
+		if ($this->skillAvg > 90) {
91
+			return 80.0;
92
+		}
93
+		if ($this->skillAvg > 80) {
94
+			return 50.0;
95
+		}
96
+		if ($this->skillAvg > 76) {
97
+			return 20.0;
98
+		}
99
+		if ($this->skillAvg > 70) {
100
+			return 10.0;
101
+		}
102
+		if ($this->skillAvg > 60) {
103
+			return 5.0;
104
+		}
105
+		if ($this->skillAvg > 50) {
106
+			return 2.0;
107
+		}
90 108
 		return 0.5;
91 109
 
92 110
 	}
@@ -96,12 +114,24 @@  discard block
 block discarded – undo
96 114
 	 */
97 115
 	private function onAgeModifier()
98 116
 	{
99
-		if ($this->age > 32) return -0.5;
100
-		if ($this->age > 30) return -0.2;
101
-		if ($this->age > 28) return -0.1;
102
-		if ($this->age > 26) return 0.1;
103
-		if ($this->age > 22) return 0.2;
104
-		if ($this->age > 20) return 0.3;
117
+		if ($this->age > 32) {
118
+			return -0.5;
119
+		}
120
+		if ($this->age > 30) {
121
+			return -0.2;
122
+		}
123
+		if ($this->age > 28) {
124
+			return -0.1;
125
+		}
126
+		if ($this->age > 26) {
127
+			return 0.1;
128
+		}
129
+		if ($this->age > 22) {
130
+			return 0.2;
131
+		}
132
+		if ($this->age > 20) {
133
+			return 0.3;
134
+		}
105 135
 		return 0.5;
106 136
 	}
107 137
 
Please login to merge, or discard this patch.
api/Lib/DsManager/Models/Orm/Coach.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -9,31 +9,31 @@
 block discarded – undo
9 9
  */
10 10
 class Coach extends DsManagerOrm
11 11
 {
12
-    /**
13
-     * @var string
14
-     */
15
-    protected $table = 'coaches';
12
+	/**
13
+	 * @var string
14
+	 */
15
+	protected $table = 'coaches';
16 16
 
17
-    /**
18
-     * @var array
19
-     */
20
-    protected $fillable = [
21
-        'name',
22
-        'surname',
23
-        'age',
24
-        'nationality',
25
-        'skillAvg',
26
-        'wageReq',
27
-        'favouriteModule',
28
-        'team_id'
29
-    ];
17
+	/**
18
+	 * @var array
19
+	 */
20
+	protected $fillable = [
21
+		'name',
22
+		'surname',
23
+		'age',
24
+		'nationality',
25
+		'skillAvg',
26
+		'wageReq',
27
+		'favouriteModule',
28
+		'team_id'
29
+	];
30 30
 
31
-    /**
32
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
33
-     */
34
-    public function team()
35
-    {
36
-        return $this->belongsTo(Team::class);
37
-    }
31
+	/**
32
+	 * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
33
+	 */
34
+	public function team()
35
+	{
36
+		return $this->belongsTo(Team::class);
37
+	}
38 38
 
39 39
 } 
40 40
\ No newline at end of file
Please login to merge, or discard this patch.
api/Lib/DsManager/Models/Orm/DsManagerOrm.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,9 +6,9 @@
 block discarded – undo
6 6
 
7 7
 abstract class DsManagerOrm extends Eloquent{
8 8
 
9
-    protected $hidden = [
10
-        'created_at',
11
-        'updated_at'
12
-    ];
9
+	protected $hidden = [
10
+		'created_at',
11
+		'updated_at'
12
+	];
13 13
 
14 14
 } 
15 15
\ No newline at end of file
Please login to merge, or discard this patch.
api/Lib/DsManager/Models/Coach.php 1 patch
Braces   +24 added lines, -8 removed lines patch added patch discarded remove patch
@@ -35,7 +35,9 @@  discard block
 block discarded – undo
35 35
 		if ($this->wageReq == null) {
36 36
 			$wage = $this->wageOnSkill();
37 37
 			$wage += $this->spareChange();
38
-			if ($wage < 0) $wage = $wage * (-1);
38
+			if ($wage < 0) {
39
+				$wage = $wage * (-1);
40
+			}
39 41
 			$this->wageReq = round($wage, 2);
40 42
 		}
41 43
 		return $this->wageReq;
@@ -46,13 +48,27 @@  discard block
 block discarded – undo
46 48
 	 */
47 49
 	private function wageOnSkill()
48 50
 	{
49
-		if ($this->skillAvg > 98) return 5.0;
50
-		if ($this->skillAvg > 90) return 3.5;
51
-		if ($this->skillAvg > 80) return 2.0;
52
-		if ($this->skillAvg > 76) return 1.5;
53
-		if ($this->skillAvg > 70) return 1.0;
54
-		if ($this->skillAvg > 60) return .76;
55
-		if ($this->skillAvg > 50) return .20;
51
+		if ($this->skillAvg > 98) {
52
+			return 5.0;
53
+		}
54
+		if ($this->skillAvg > 90) {
55
+			return 3.5;
56
+		}
57
+		if ($this->skillAvg > 80) {
58
+			return 2.0;
59
+		}
60
+		if ($this->skillAvg > 76) {
61
+			return 1.5;
62
+		}
63
+		if ($this->skillAvg > 70) {
64
+			return 1.0;
65
+		}
66
+		if ($this->skillAvg > 60) {
67
+			return .76;
68
+		}
69
+		if ($this->skillAvg > 50) {
70
+			return .20;
71
+		}
56 72
 		return 0.5;
57 73
 
58 74
 	}
Please login to merge, or discard this patch.