@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | |
47 | 47 | |
48 | 48 | /** |
49 | - * @param null $forcedRole |
|
49 | + * @param string $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) |
@@ -35,7 +35,9 @@ discard block |
||
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 |
||
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 | } |
@@ -12,15 +12,15 @@ |
||
12 | 12 | */ |
13 | 13 | abstract class DsManagerModel implements ActiveModel |
14 | 14 | { |
15 | - /** |
|
16 | - * @var |
|
17 | - */ |
|
18 | - public $id; |
|
15 | + /** |
|
16 | + * @var |
|
17 | + */ |
|
18 | + public $id; |
|
19 | 19 | |
20 | - /** |
|
21 | - * @return mixed |
|
22 | - */ |
|
23 | - abstract function toArray(); |
|
20 | + /** |
|
21 | + * @return mixed |
|
22 | + */ |
|
23 | + abstract function toArray(); |
|
24 | 24 | /** |
25 | 25 | * @param array $array |
26 | 26 | * @return mixed |
@@ -25,7 +25,7 @@ |
||
25 | 25 | * @param array $array |
26 | 26 | * @return mixed |
27 | 27 | */ |
28 | - public static function fromArray($array =[]) |
|
28 | + public static function fromArray($array = []) |
|
29 | 29 | { |
30 | 30 | $class = get_called_class(); |
31 | 31 | $class = new $class(); |
@@ -9,65 +9,65 @@ |
||
9 | 9 | */ |
10 | 10 | class MatchResult |
11 | 11 | { |
12 | - private $goalHome; |
|
13 | - private $goalAway; |
|
14 | - private $homeTeam; |
|
15 | - private $awayTeam; |
|
12 | + private $goalHome; |
|
13 | + private $goalAway; |
|
14 | + private $homeTeam; |
|
15 | + private $awayTeam; |
|
16 | 16 | |
17 | - /** |
|
18 | - * MatchResult constructor. |
|
19 | - * @param $goalHome |
|
20 | - * @param $goalAway |
|
21 | - * @param Team $home |
|
22 | - * @param Team $away |
|
23 | - */ |
|
24 | - public function __construct($goalHome, $goalAway, Team $home, Team $away) |
|
25 | - { |
|
26 | - $this->goalHome = $goalHome; |
|
27 | - $this->goalAway = $goalAway; |
|
28 | - $this->homeTeam = $home; |
|
29 | - $this->awayTeam = $away; |
|
30 | - } |
|
17 | + /** |
|
18 | + * MatchResult constructor. |
|
19 | + * @param $goalHome |
|
20 | + * @param $goalAway |
|
21 | + * @param Team $home |
|
22 | + * @param Team $away |
|
23 | + */ |
|
24 | + public function __construct($goalHome, $goalAway, Team $home, Team $away) |
|
25 | + { |
|
26 | + $this->goalHome = $goalHome; |
|
27 | + $this->goalAway = $goalAway; |
|
28 | + $this->homeTeam = $home; |
|
29 | + $this->awayTeam = $away; |
|
30 | + } |
|
31 | 31 | |
32 | - public function getWinnerLoser() |
|
33 | - { |
|
34 | - if ($this->goalAway == $this->goalHome) { |
|
35 | - return [ |
|
36 | - 'isDraw' => true, |
|
37 | - 'winner' => $this->homeTeam, |
|
38 | - 'loser' => $this->awayTeam |
|
39 | - ]; |
|
40 | - } |
|
32 | + public function getWinnerLoser() |
|
33 | + { |
|
34 | + if ($this->goalAway == $this->goalHome) { |
|
35 | + return [ |
|
36 | + 'isDraw' => true, |
|
37 | + 'winner' => $this->homeTeam, |
|
38 | + 'loser' => $this->awayTeam |
|
39 | + ]; |
|
40 | + } |
|
41 | 41 | |
42 | - if ($this->goalHome > $this->goalAway) { |
|
43 | - return [ |
|
44 | - 'isDraw' => false, |
|
45 | - 'winner' => $this->homeTeam, |
|
46 | - 'loser' => $this->awayTeam |
|
47 | - ]; |
|
48 | - } |
|
42 | + if ($this->goalHome > $this->goalAway) { |
|
43 | + return [ |
|
44 | + 'isDraw' => false, |
|
45 | + 'winner' => $this->homeTeam, |
|
46 | + 'loser' => $this->awayTeam |
|
47 | + ]; |
|
48 | + } |
|
49 | 49 | |
50 | - if ($this->goalHome < $this->goalAway) { |
|
51 | - return [ |
|
52 | - 'isDraw' => false, |
|
53 | - 'winner' => $this->awayTeam, |
|
54 | - 'loser' => $this->homeTeam |
|
55 | - ]; |
|
56 | - } |
|
50 | + if ($this->goalHome < $this->goalAway) { |
|
51 | + return [ |
|
52 | + 'isDraw' => false, |
|
53 | + 'winner' => $this->awayTeam, |
|
54 | + 'loser' => $this->homeTeam |
|
55 | + ]; |
|
56 | + } |
|
57 | 57 | |
58 | - return []; |
|
59 | - } |
|
58 | + return []; |
|
59 | + } |
|
60 | 60 | |
61 | - /** |
|
62 | - * @return array |
|
63 | - */ |
|
64 | - public function toArray() |
|
65 | - { |
|
66 | - $result = []; |
|
67 | - $result["goalHome"] = $this->goalHome; |
|
68 | - $result["goalAway"] = $this->goalAway; |
|
69 | - $result['info'] = $this->getWinnerLoser(); |
|
70 | - return $result; |
|
71 | - } |
|
61 | + /** |
|
62 | + * @return array |
|
63 | + */ |
|
64 | + public function toArray() |
|
65 | + { |
|
66 | + $result = []; |
|
67 | + $result["goalHome"] = $this->goalHome; |
|
68 | + $result["goalAway"] = $this->goalAway; |
|
69 | + $result['info'] = $this->getWinnerLoser(); |
|
70 | + return $result; |
|
71 | + } |
|
72 | 72 | |
73 | 73 | } |
74 | 74 | \ No newline at end of file |
@@ -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,31 +9,31 @@ |
||
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 |
@@ -6,9 +6,9 @@ |
||
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 |
@@ -4,7 +4,7 @@ |
||
4 | 4 | use Illuminate\Database\Eloquent\Model as Eloquent; |
5 | 5 | |
6 | 6 | |
7 | -abstract class DsManagerOrm extends Eloquent{ |
|
7 | +abstract class DsManagerOrm extends Eloquent { |
|
8 | 8 | |
9 | 9 | protected $hidden = [ |
10 | 10 | 'created_at', |
@@ -44,7 +44,9 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
@@ -9,11 +9,11 @@ |
||
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) { |
@@ -14,10 +14,10 @@ |
||
14 | 14 | * @return string |
15 | 15 | */ |
16 | 16 | public static function getHtml($node) { |
17 | - $innerHTML= ''; |
|
17 | + $innerHTML = ''; |
|
18 | 18 | $children = $node->childNodes; |
19 | 19 | foreach ($children as $child) { |
20 | - $innerHTML .= $child->ownerDocument->saveXML( $child ); |
|
20 | + $innerHTML .= $child->ownerDocument->saveXML($child); |
|
21 | 21 | } |
22 | 22 | return $innerHTML; |
23 | 23 | } |