Inspection of "implemented slim 3" - vikkio88/dsManager-php - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 24e320...176aa1 )

by Vincenzo

created 2016-08-25 17:56 UTC

Status

Doc Comments +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -46,7 +46,7 @@  discard block
 block discarded – undo
 
 
 	/**
-	 * @param null $forcedRole
+	 * @param string|null $forcedRole
 	 * @param null $locale
 	 * @return Player
 	 */
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
 	}
 
 	/**
-	 * @param $locale
+	 * @param string $locale
 	 * @return mixed
 	 */
 	private function nationalityFromLocale($locale)

Please login to merge, or discard this patch.

api/database/migrations/CreateTeamTable.php 1 patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -4,19 +4,19 @@
 block discarded – undo
 
 class CreateTeamTable
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        Capsule::schema()->dropIfExists('teams');
-        Capsule::schema()->create('teams', function ($table) {
-            $table->increments('id');
-            $table->string('name');
-            $table->string('nationality',2);
-            $table->timestamps();
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		Capsule::schema()->dropIfExists('teams');
+		Capsule::schema()->create('teams', function ($table) {
+			$table->increments('id');
+			$table->string('name');
+			$table->string('nationality',2);
+			$table->timestamps();
+		});
+	}
 }

Please login to merge, or discard this patch.

api/database/migrations/CreateCoachesTable.php 1 patch

Indentation +30 added lines, -30 removed lines patch added patch discarded remove patch

@@ -4,35 +4,35 @@
 block discarded – undo
 
 class CreateCoachesTable
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        Capsule::schema()->dropIfExists('coaches');
-        Capsule::schema()->create('coaches', function ($table) {
-            $table->increments('id');
-            $table->string('name');
-            $table->string('surname');
-            $table->tinyInteger('age');
-            $table->string('nationality',2);
-            $table->float('skillAvg');
-            $table->float('wageReq');
-            $table->string('favouriteModule',10);
-            $table->integer('team_id')->nullable();
-            $table->timestamps();
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		Capsule::schema()->dropIfExists('coaches');
+		Capsule::schema()->create('coaches', function ($table) {
+			$table->increments('id');
+			$table->string('name');
+			$table->string('surname');
+			$table->tinyInteger('age');
+			$table->string('nationality',2);
+			$table->float('skillAvg');
+			$table->float('wageReq');
+			$table->string('favouriteModule',10);
+			$table->integer('team_id')->nullable();
+			$table->timestamps();
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::drop('coaches');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('coaches');
+	}
 }

Please login to merge, or discard this patch.

api/database/migrations/CreatePlayersTable.php 1 patch

Indentation +22 added lines, -22 removed lines patch added patch discarded remove patch

@@ -4,26 +4,26 @@
 block discarded – undo
 
 class CreatePlayersTable
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        Capsule::schema()->dropIfExists('players');
-        Capsule::schema()->create('players', function ($table) {
-            $table->increments('id');
-            $table->string('name');
-            $table->string('surname');
-            $table->tinyInteger('age');
-            $table->string('nationality',2);
-            $table->float('skillAvg');
-            $table->float('wageReq');
-            $table->float('val');
-            $table->string('role',2);
-            $table->integer('team_id')->nullable();
-            $table->timestamps();
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		Capsule::schema()->dropIfExists('players');
+		Capsule::schema()->create('players', function ($table) {
+			$table->increments('id');
+			$table->string('name');
+			$table->string('surname');
+			$table->tinyInteger('age');
+			$table->string('nationality',2);
+			$table->float('skillAvg');
+			$table->float('wageReq');
+			$table->float('val');
+			$table->string('role',2);
+			$table->integer('team_id')->nullable();
+			$table->timestamps();
+		});
+	}
 }

Please login to merge, or discard this patch.

api/Lib/DsManager/Models/Match.php 1 patch

Indentation +144 added lines, -144 removed lines patch added patch discarded remove patch

@@ -10,149 +10,149 @@
 block discarded – undo
  */
 class Match
 {
-    /**
-     * @var Team
-     */
-    private $homeTeam;
-    /**
-     * @var Team
-     */
-    private $awayTeam;
-
-    /**
-     * Match constructor.
-     * @param Team $home
-     * @param Team $away
-     */
-    public function __construct(Team $home, Team $away)
-    {
-        $this->homeTeam = $home;
-        $this->awayTeam = $away;
-    }
-
-    /**
-     * @return MatchResult
-     */
-    public function simulate()
-    {
-        $homePoints = $this->homeTeam->getAvgSkill();
-        $awayPoints = $this->awayTeam->getAvgSkill();
-
-        $homePoints += $this->malusModule(
-            $this->homeTeam->coach->favouriteModule,
-            $this->homeTeam->playersPerRoleArray()
-        );
-        $awayPoints += $this->malusModule(
-            $this->awayTeam->coach->favouriteModule,
-            $this->awayTeam->playersPerRoleArray()
-        );
-
-        $goalHome = 0;
-        $goalAway = 0;
-
-        if (Randomizer::boolOnPercentage(80)) {
-
-            if (($homePoints - $awayPoints) < 0) {
-                $goalAway = ($awayPoints - $homePoints) % 6;
-                $goalHome += $this->chance();
-                $goalAway += $this->chance();
-                $goalHome += $this->bonusHome();
-            } else {
-                $goalHome = ($homePoints - $awayPoints) % 6;
-                $goalAway += $this->chance();
-                $goalHome += $this->bonusHome();
-            }
-
-        } else {
-            $goalHome += $this->chance();
-            $goalAway += $this->chance();
-            $goalHome += $this->bonusHome();
-        }
-
-        $goalHome += $this->bonusAge($this->homeTeam);
-        $goalAway += $this->bonusAge($this->awayTeam);
-
-
-        //Bonus on Good GoalKeeper
-        $goalies = $this->homeTeam->getBestPlayerForRole("GK");
-        $goalAway -= $this->bonusGoalkeeper($goalies);
-        $goalies = $this->awayTeam->getBestPlayerForRole("GK");
-        $goalHome -= $this->bonusGoalkeeper($goalies);
-        //
-
-        $homeModule = new Module($this->homeTeam->coach->favouriteModule);
-        $awayModule = new Module($this->awayTeam->coach->favouriteModule);
-
-        if ($homeModule->isOffensive()) {
-            $goalHome += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;
-            $goalAway += Randomizer::boolOnPercentage(20) ? 1 : 0;
-        }
-        if ($awayModule->isOffensive()) {
-            $goalAway += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;
-            $goalHome += Randomizer::boolOnPercentage(20) ? 1 : 0;
-        }
-
-        if ($awayModule->isDefensive()) {
-            $goalHome -= Randomizer::boolOnPercentage(50) ? 1 : 0;
-        }
-        if ($homeModule->isDefensive()) {
-            $goalAway -= Randomizer::boolOnPercentage(50) ? 1 : 0;
-        }
-
-        $goalHome = $goalHome < 0 ? 0 : $goalHome;
-        $goalAway = $goalAway < 0 ? 0 : $goalAway;
-        return new MatchResult($goalHome, $goalAway, $this->homeTeam, $this->awayTeam);
-    }
-
-    private function bonusAge(Team $team)
-    {
-        if ($team->getAvgAge() > 29 || $team->getAvgAge() < 24) {
-            return $this->chance();
-        }
-        return 0;
-    }
-
-    /**
-     * @param $goalkeeper
-     * @return int
-     */
-    private function bonusGoalKeeper($goalkeeper)
-    {
-
-        $skillGoalkeeper = empty($goalkeeper) ? 1 : $goalkeeper->skillAvg;
-        return (Randomizer::boolOnPercentage($skillGoalkeeper) ? 1 : 0);
-
-    }
-
-    /**
-     * @return int
-     */
-    private function chance()
-    {
-        return rand(0, 3);
-    }
-
-    /**
-     * @return int
-     */
-    private function bonusHome()
-    {
-        return Randomizer::boolOnPercentage(66) ? 1 : 0;
-    }
-
-    /**
-     * @param $moduleString
-     * @param $playersRoleArray
-     * @return int
-     */
-    private function malusModule($moduleString, $playersRoleArray)
-    {
-        $module = new Module($moduleString);
-        if ($module->isApplicableToArray($playersRoleArray)) {
-            return rand(1, 10);
-        } else {
-            return (-1) * rand(1, 10);
-        }
-    }
+	/**
+	 * @var Team
+	 */
+	private $homeTeam;
+	/**
+	 * @var Team
+	 */
+	private $awayTeam;
+
+	/**
+	 * Match constructor.
+	 * @param Team $home
+	 * @param Team $away
+	 */
+	public function __construct(Team $home, Team $away)
+	{
+		$this->homeTeam = $home;
+		$this->awayTeam = $away;
+	}
+
+	/**
+	 * @return MatchResult
+	 */
+	public function simulate()
+	{
+		$homePoints = $this->homeTeam->getAvgSkill();
+		$awayPoints = $this->awayTeam->getAvgSkill();
+
+		$homePoints += $this->malusModule(
+			$this->homeTeam->coach->favouriteModule,
+			$this->homeTeam->playersPerRoleArray()
+		);
+		$awayPoints += $this->malusModule(
+			$this->awayTeam->coach->favouriteModule,
+			$this->awayTeam->playersPerRoleArray()
+		);
+
+		$goalHome = 0;
+		$goalAway = 0;
+
+		if (Randomizer::boolOnPercentage(80)) {
+
+			if (($homePoints - $awayPoints) < 0) {
+				$goalAway = ($awayPoints - $homePoints) % 6;
+				$goalHome += $this->chance();
+				$goalAway += $this->chance();
+				$goalHome += $this->bonusHome();
+			} else {
+				$goalHome = ($homePoints - $awayPoints) % 6;
+				$goalAway += $this->chance();
+				$goalHome += $this->bonusHome();
+			}
+
+		} else {
+			$goalHome += $this->chance();
+			$goalAway += $this->chance();
+			$goalHome += $this->bonusHome();
+		}
+
+		$goalHome += $this->bonusAge($this->homeTeam);
+		$goalAway += $this->bonusAge($this->awayTeam);
+
+
+		//Bonus on Good GoalKeeper
+		$goalies = $this->homeTeam->getBestPlayerForRole("GK");
+		$goalAway -= $this->bonusGoalkeeper($goalies);
+		$goalies = $this->awayTeam->getBestPlayerForRole("GK");
+		$goalHome -= $this->bonusGoalkeeper($goalies);
+		//
+
+		$homeModule = new Module($this->homeTeam->coach->favouriteModule);
+		$awayModule = new Module($this->awayTeam->coach->favouriteModule);
+
+		if ($homeModule->isOffensive()) {
+			$goalHome += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;
+			$goalAway += Randomizer::boolOnPercentage(20) ? 1 : 0;
+		}
+		if ($awayModule->isOffensive()) {
+			$goalAway += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;
+			$goalHome += Randomizer::boolOnPercentage(20) ? 1 : 0;
+		}
+
+		if ($awayModule->isDefensive()) {
+			$goalHome -= Randomizer::boolOnPercentage(50) ? 1 : 0;
+		}
+		if ($homeModule->isDefensive()) {
+			$goalAway -= Randomizer::boolOnPercentage(50) ? 1 : 0;
+		}
+
+		$goalHome = $goalHome < 0 ? 0 : $goalHome;
+		$goalAway = $goalAway < 0 ? 0 : $goalAway;
+		return new MatchResult($goalHome, $goalAway, $this->homeTeam, $this->awayTeam);
+	}
+
+	private function bonusAge(Team $team)
+	{
+		if ($team->getAvgAge() > 29 || $team->getAvgAge() < 24) {
+			return $this->chance();
+		}
+		return 0;
+	}
+
+	/**
+	 * @param $goalkeeper
+	 * @return int
+	 */
+	private function bonusGoalKeeper($goalkeeper)
+	{
+
+		$skillGoalkeeper = empty($goalkeeper) ? 1 : $goalkeeper->skillAvg;
+		return (Randomizer::boolOnPercentage($skillGoalkeeper) ? 1 : 0);
+
+	}
+
+	/**
+	 * @return int
+	 */
+	private function chance()
+	{
+		return rand(0, 3);
+	}
+
+	/**
+	 * @return int
+	 */
+	private function bonusHome()
+	{
+		return Randomizer::boolOnPercentage(66) ? 1 : 0;
+	}
+
+	/**
+	 * @param $moduleString
+	 * @param $playersRoleArray
+	 * @return int
+	 */
+	private function malusModule($moduleString, $playersRoleArray)
+	{
+		$module = new Module($moduleString);
+		if ($module->isApplicableToArray($playersRoleArray)) {
+			return rand(1, 10);
+		} else {
+			return (-1) * rand(1, 10);
+		}
+	}
 
 }
\ No newline at end of file

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
  */
 class Coach extends DsManagerOrm
 {
-    /**
-     * @var string
-     */
-    protected $table = 'coaches';
+	/**
+	 * @var string
+	 */
+	protected $table = 'coaches';
 
-    /**
-     * @var array
-     */
-    protected $fillable = [
-        'name',
-        'surname',
-        'age',
-        'nationality',
-        'skillAvg',
-        'wageReq',
-        'favouriteModule',
-        'team_id'
-    ];
+	/**
+	 * @var array
+	 */
+	protected $fillable = [
+		'name',
+		'surname',
+		'age',
+		'nationality',
+		'skillAvg',
+		'wageReq',
+		'favouriteModule',
+		'team_id'
+	];
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function team()
-    {
-        return $this->belongsTo(Team::class);
-    }
+	/**
+	 * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+	 */
+	public function team()
+	{
+		return $this->belongsTo(Team::class);
+	}
 
 } 
\ 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
 
 abstract class DsManagerOrm extends Eloquent{
 
-    protected $hidden = [
-        'created_at',
-        'updated_at'
-    ];
+	protected $hidden = [
+		'created_at',
+		'updated_at'
+	];
 
 } 
\ No newline at end of file

Please login to merge, or discard this patch.

api/Lib/DsManager/Models/MatchResult.php 1 patch

Indentation +54 added lines, -54 removed lines patch added patch discarded remove patch

@@ -9,65 +9,65 @@
 block discarded – undo
  */
 class MatchResult
 {
-    private $goalHome;
-    private $goalAway;
-    private $homeTeam;
-    private $awayTeam;
+	private $goalHome;
+	private $goalAway;
+	private $homeTeam;
+	private $awayTeam;
 
-    /**
-     * MatchResult constructor.
-     * @param $goalHome
-     * @param $goalAway
-     * @param Team $home
-     * @param Team $away
-     */
-    public function __construct($goalHome, $goalAway, Team $home, Team $away)
-    {
-        $this->goalHome = $goalHome;
-        $this->goalAway = $goalAway;
-        $this->homeTeam = $home;
-        $this->awayTeam = $away;
-    }
+	/**
+	 * MatchResult constructor.
+	 * @param $goalHome
+	 * @param $goalAway
+	 * @param Team $home
+	 * @param Team $away
+	 */
+	public function __construct($goalHome, $goalAway, Team $home, Team $away)
+	{
+		$this->goalHome = $goalHome;
+		$this->goalAway = $goalAway;
+		$this->homeTeam = $home;
+		$this->awayTeam = $away;
+	}
 
-    public function getWinnerLoser()
-    {
-        if ($this->goalAway == $this->goalHome) {
-            return [
-                'isDraw' => true,
-                'winner' => $this->homeTeam,
-                'loser' => $this->awayTeam
-            ];
-        }
+	public function getWinnerLoser()
+	{
+		if ($this->goalAway == $this->goalHome) {
+			return [
+				'isDraw' => true,
+				'winner' => $this->homeTeam,
+				'loser' => $this->awayTeam
+			];
+		}
 
-        if ($this->goalHome > $this->goalAway) {
-            return [
-                'isDraw' => false,
-                'winner' => $this->homeTeam,
-                'loser' => $this->awayTeam
-            ];
-        }
+		if ($this->goalHome > $this->goalAway) {
+			return [
+				'isDraw' => false,
+				'winner' => $this->homeTeam,
+				'loser' => $this->awayTeam
+			];
+		}
 
-        if ($this->goalHome < $this->goalAway) {
-            return [
-                'isDraw' => false,
-                'winner' => $this->awayTeam,
-                'loser' => $this->homeTeam
-            ];
-        }
+		if ($this->goalHome < $this->goalAway) {
+			return [
+				'isDraw' => false,
+				'winner' => $this->awayTeam,
+				'loser' => $this->homeTeam
+			];
+		}
 
-        return [];
-    }
+		return [];
+	}
 
-    /**
-     * @return array
-     */
-    public function toArray()
-    {
-        $result = [];
-        $result["goalHome"] = $this->goalHome;
-        $result["goalAway"] = $this->goalAway;
-        $result['info'] = $this->getWinnerLoser();
-        return $result;
-    }
+	/**
+	 * @return array
+	 */
+	public function toArray()
+	{
+		$result = [];
+		$result["goalHome"] = $this->goalHome;
+		$result["goalAway"] = $this->goalAway;
+		$result['info'] = $this->getWinnerLoser();
+		return $result;
+	}
 
 }
\ No newline at end of file

Please login to merge, or discard this patch.

api/Lib/DsManager/Models/Common/DsManagerModel.php 1 patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -12,15 +12,15 @@
 block discarded – undo
  */
 abstract class DsManagerModel implements ActiveModel
 {
-    /**
-     * @var
-     */
-    public $id;
+	/**
+	 * @var
+	 */
+	public $id;
 
-    /**
-     * @return mixed
-     */
-    abstract function toArray();
+	/**
+	 * @return mixed
+	 */
+	abstract function toArray();
 	/**
 	 * @param array $array
 	 * @return mixed

Please login to merge, or discard this 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)

		@@ -4,19 +4,19 @@
		block discarded – undo
4	4
5	5	class CreateTeamTable
6	6	{
7		- /**
8		- * Run the migrations.
9		- *
10		- * @return void
11		- */
12		- public function run()
13		- {
14		- Capsule::schema()->dropIfExists('teams');
15		- Capsule::schema()->create('teams', function ($table) {
16		- $table->increments('id');
17		- $table->string('name');
18		- $table->string('nationality',2);
19		- $table->timestamps();
20		- });
21		- }
	7	+ /**
	8	+ * Run the migrations.
	9	+ *
	10	+ * @return void
	11	+ */
	12	+ public function run()
	13	+ {
	14	+ Capsule::schema()->dropIfExists('teams');
	15	+ Capsule::schema()->create('teams', function ($table) {
	16	+ $table->increments('id');
	17	+ $table->string('name');
	18	+ $table->string('nationality',2);
	19	+ $table->timestamps();
	20	+ });
	21	+ }
22	22	}

		@@ -4,35 +4,35 @@
		block discarded – undo
4	4
5	5	class CreateCoachesTable
6	6	{
7		- /**
8		- * Run the migrations.
9		- *
10		- * @return void
11		- */
12		- public function run()
13		- {
14		- Capsule::schema()->dropIfExists('coaches');
15		- Capsule::schema()->create('coaches', function ($table) {
16		- $table->increments('id');
17		- $table->string('name');
18		- $table->string('surname');
19		- $table->tinyInteger('age');
20		- $table->string('nationality',2);
21		- $table->float('skillAvg');
22		- $table->float('wageReq');
23		- $table->string('favouriteModule',10);
24		- $table->integer('team_id')->nullable();
25		- $table->timestamps();
26		- });
27		- }
	7	+ /**
	8	+ * Run the migrations.
	9	+ *
	10	+ * @return void
	11	+ */
	12	+ public function run()
	13	+ {
	14	+ Capsule::schema()->dropIfExists('coaches');
	15	+ Capsule::schema()->create('coaches', function ($table) {
	16	+ $table->increments('id');
	17	+ $table->string('name');
	18	+ $table->string('surname');
	19	+ $table->tinyInteger('age');
	20	+ $table->string('nationality',2);
	21	+ $table->float('skillAvg');
	22	+ $table->float('wageReq');
	23	+ $table->string('favouriteModule',10);
	24	+ $table->integer('team_id')->nullable();
	25	+ $table->timestamps();
	26	+ });
	27	+ }
28	28
29		- /**
30		- * Reverse the migrations.
31		- *
32		- * @return void
33		- */
34		- public function down()
35		- {
36		- Schema::drop('coaches');
37		- }
	29	+ /**
	30	+ * Reverse the migrations.
	31	+ *
	32	+ * @return void
	33	+ */
	34	+ public function down()
	35	+ {
	36	+ Schema::drop('coaches');
	37	+ }
38	38	}

		@@ -4,26 +4,26 @@
		block discarded – undo
4	4
5	5	class CreatePlayersTable
6	6	{
7		- /**
8		- * Run the migrations.
9		- *
10		- * @return void
11		- */
12		- public function run()
13		- {
14		- Capsule::schema()->dropIfExists('players');
15		- Capsule::schema()->create('players', function ($table) {
16		- $table->increments('id');
17		- $table->string('name');
18		- $table->string('surname');
19		- $table->tinyInteger('age');
20		- $table->string('nationality',2);
21		- $table->float('skillAvg');
22		- $table->float('wageReq');
23		- $table->float('val');
24		- $table->string('role',2);
25		- $table->integer('team_id')->nullable();
26		- $table->timestamps();
27		- });
28		- }
	7	+ /**
	8	+ * Run the migrations.
	9	+ *
	10	+ * @return void
	11	+ */
	12	+ public function run()
	13	+ {
	14	+ Capsule::schema()->dropIfExists('players');
	15	+ Capsule::schema()->create('players', function ($table) {
	16	+ $table->increments('id');
	17	+ $table->string('name');
	18	+ $table->string('surname');
	19	+ $table->tinyInteger('age');
	20	+ $table->string('nationality',2);
	21	+ $table->float('skillAvg');
	22	+ $table->float('wageReq');
	23	+ $table->float('val');
	24	+ $table->string('role',2);
	25	+ $table->integer('team_id')->nullable();
	26	+ $table->timestamps();
	27	+ });
	28	+ }
29	29	}

		@@ -10,149 +10,149 @@
		block discarded – undo
10	10	*/
11	11	class Match
12	12	{
13		- /**
14		- * @var Team
15		- */
16		- private $homeTeam;
17		- /**
18		- * @var Team
19		- */
20		- private $awayTeam;
21		-
22		- /**
23		- * Match constructor.
24		- * @param Team $home
25		- * @param Team $away
26		- */
27		- public function __construct(Team $home, Team $away)
28		- {
29		- $this->homeTeam = $home;
30		- $this->awayTeam = $away;
31		- }
32		-
33		- /**
34		- * @return MatchResult
35		- */
36		- public function simulate()
37		- {
38		- $homePoints = $this->homeTeam->getAvgSkill();
39		- $awayPoints = $this->awayTeam->getAvgSkill();
40		-
41		- $homePoints += $this->malusModule(
42		- $this->homeTeam->coach->favouriteModule,
43		- $this->homeTeam->playersPerRoleArray()
44		- );
45		- $awayPoints += $this->malusModule(
46		- $this->awayTeam->coach->favouriteModule,
47		- $this->awayTeam->playersPerRoleArray()
48		- );
49		-
50		- $goalHome = 0;
51		- $goalAway = 0;
52		-
53		- if (Randomizer::boolOnPercentage(80)) {
54		-
55		- if (($homePoints - $awayPoints) < 0) {
56		- $goalAway = ($awayPoints - $homePoints) % 6;
57		- $goalHome += $this->chance();
58		- $goalAway += $this->chance();
59		- $goalHome += $this->bonusHome();
60		- } else {
61		- $goalHome = ($homePoints - $awayPoints) % 6;
62		- $goalAway += $this->chance();
63		- $goalHome += $this->bonusHome();
64		- }
65		-
66		- } else {
67		- $goalHome += $this->chance();
68		- $goalAway += $this->chance();
69		- $goalHome += $this->bonusHome();
70		- }
71		-
72		- $goalHome += $this->bonusAge($this->homeTeam);
73		- $goalAway += $this->bonusAge($this->awayTeam);
74		-
75		-
76		- //Bonus on Good GoalKeeper
77		- $goalies = $this->homeTeam->getBestPlayerForRole("GK");
78		- $goalAway -= $this->bonusGoalkeeper($goalies);
79		- $goalies = $this->awayTeam->getBestPlayerForRole("GK");
80		- $goalHome -= $this->bonusGoalkeeper($goalies);
81		- //
82		-
83		- $homeModule = new Module($this->homeTeam->coach->favouriteModule);
84		- $awayModule = new Module($this->awayTeam->coach->favouriteModule);
85		-
86		- if ($homeModule->isOffensive()) {
87		- $goalHome += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;
88		- $goalAway += Randomizer::boolOnPercentage(20) ? 1 : 0;
89		- }
90		- if ($awayModule->isOffensive()) {
91		- $goalAway += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;
92		- $goalHome += Randomizer::boolOnPercentage(20) ? 1 : 0;
93		- }
94		-
95		- if ($awayModule->isDefensive()) {
96		- $goalHome -= Randomizer::boolOnPercentage(50) ? 1 : 0;
97		- }
98		- if ($homeModule->isDefensive()) {
99		- $goalAway -= Randomizer::boolOnPercentage(50) ? 1 : 0;
100		- }
101		-
102		- $goalHome = $goalHome < 0 ? 0 : $goalHome;
103		- $goalAway = $goalAway < 0 ? 0 : $goalAway;
104		- return new MatchResult($goalHome, $goalAway, $this->homeTeam, $this->awayTeam);
105		- }
106		-
107		- private function bonusAge(Team $team)
108		- {
109		- if ($team->getAvgAge() > 29 \|\| $team->getAvgAge() < 24) {
110		- return $this->chance();
111		- }
112		- return 0;
113		- }
114		-
115		- /**
116		- * @param $goalkeeper
117		- * @return int
118		- */
119		- private function bonusGoalKeeper($goalkeeper)
120		- {
121		-
122		- $skillGoalkeeper = empty($goalkeeper) ? 1 : $goalkeeper->skillAvg;
123		- return (Randomizer::boolOnPercentage($skillGoalkeeper) ? 1 : 0);
124		-
125		- }
126		-
127		- /**
128		- * @return int
129		- */
130		- private function chance()
131		- {
132		- return rand(0, 3);
133		- }
134		-
135		- /**
136		- * @return int
137		- */
138		- private function bonusHome()
139		- {
140		- return Randomizer::boolOnPercentage(66) ? 1 : 0;
141		- }
142		-
143		- /**
144		- * @param $moduleString
145		- * @param $playersRoleArray
146		- * @return int
147		- */
148		- private function malusModule($moduleString, $playersRoleArray)
149		- {
150		- $module = new Module($moduleString);
151		- if ($module->isApplicableToArray($playersRoleArray)) {
152		- return rand(1, 10);
153		- } else {
154		- return (-1) * rand(1, 10);
155		- }
156		- }
	13	+ /**
	14	+ * @var Team
	15	+ */
	16	+ private $homeTeam;
	17	+ /**
	18	+ * @var Team
	19	+ */
	20	+ private $awayTeam;
	21	+
	22	+ /**
	23	+ * Match constructor.
	24	+ * @param Team $home
	25	+ * @param Team $away
	26	+ */
	27	+ public function __construct(Team $home, Team $away)
	28	+ {
	29	+ $this->homeTeam = $home;
	30	+ $this->awayTeam = $away;
	31	+ }
	32	+
	33	+ /**
	34	+ * @return MatchResult
	35	+ */
	36	+ public function simulate()
	37	+ {
	38	+ $homePoints = $this->homeTeam->getAvgSkill();
	39	+ $awayPoints = $this->awayTeam->getAvgSkill();
	40	+
	41	+ $homePoints += $this->malusModule(
	42	+ $this->homeTeam->coach->favouriteModule,
	43	+ $this->homeTeam->playersPerRoleArray()
	44	+ );
	45	+ $awayPoints += $this->malusModule(
	46	+ $this->awayTeam->coach->favouriteModule,
	47	+ $this->awayTeam->playersPerRoleArray()
	48	+ );
	49	+
	50	+ $goalHome = 0;
	51	+ $goalAway = 0;
	52	+
	53	+ if (Randomizer::boolOnPercentage(80)) {
	54	+
	55	+ if (($homePoints - $awayPoints) < 0) {
	56	+ $goalAway = ($awayPoints - $homePoints) % 6;
	57	+ $goalHome += $this->chance();
	58	+ $goalAway += $this->chance();
	59	+ $goalHome += $this->bonusHome();
	60	+ } else {
	61	+ $goalHome = ($homePoints - $awayPoints) % 6;
	62	+ $goalAway += $this->chance();
	63	+ $goalHome += $this->bonusHome();
	64	+ }
	65	+
	66	+ } else {
	67	+ $goalHome += $this->chance();
	68	+ $goalAway += $this->chance();
	69	+ $goalHome += $this->bonusHome();
	70	+ }
	71	+
	72	+ $goalHome += $this->bonusAge($this->homeTeam);
	73	+ $goalAway += $this->bonusAge($this->awayTeam);
	74	+
	75	+
	76	+ //Bonus on Good GoalKeeper
	77	+ $goalies = $this->homeTeam->getBestPlayerForRole("GK");
	78	+ $goalAway -= $this->bonusGoalkeeper($goalies);
	79	+ $goalies = $this->awayTeam->getBestPlayerForRole("GK");
	80	+ $goalHome -= $this->bonusGoalkeeper($goalies);
	81	+ //
	82	+
	83	+ $homeModule = new Module($this->homeTeam->coach->favouriteModule);
	84	+ $awayModule = new Module($this->awayTeam->coach->favouriteModule);
	85	+
	86	+ if ($homeModule->isOffensive()) {
	87	+ $goalHome += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;
	88	+ $goalAway += Randomizer::boolOnPercentage(20) ? 1 : 0;
	89	+ }
	90	+ if ($awayModule->isOffensive()) {
	91	+ $goalAway += Randomizer::boolOnPercentage(50) ? rand(1, 2) : 0;
	92	+ $goalHome += Randomizer::boolOnPercentage(20) ? 1 : 0;
	93	+ }
	94	+
	95	+ if ($awayModule->isDefensive()) {
	96	+ $goalHome -= Randomizer::boolOnPercentage(50) ? 1 : 0;
	97	+ }
	98	+ if ($homeModule->isDefensive()) {
	99	+ $goalAway -= Randomizer::boolOnPercentage(50) ? 1 : 0;
	100	+ }
	101	+
	102	+ $goalHome = $goalHome < 0 ? 0 : $goalHome;
	103	+ $goalAway = $goalAway < 0 ? 0 : $goalAway;
	104	+ return new MatchResult($goalHome, $goalAway, $this->homeTeam, $this->awayTeam);
	105	+ }
	106	+
	107	+ private function bonusAge(Team $team)
	108	+ {
	109	+ if ($team->getAvgAge() > 29 \|\| $team->getAvgAge() < 24) {
	110	+ return $this->chance();
	111	+ }
	112	+ return 0;
	113	+ }
	114	+
	115	+ /**
	116	+ * @param $goalkeeper
	117	+ * @return int
	118	+ */
	119	+ private function bonusGoalKeeper($goalkeeper)
	120	+ {
	121	+
	122	+ $skillGoalkeeper = empty($goalkeeper) ? 1 : $goalkeeper->skillAvg;
	123	+ return (Randomizer::boolOnPercentage($skillGoalkeeper) ? 1 : 0);
	124	+
	125	+ }
	126	+
	127	+ /**
	128	+ * @return int
	129	+ */
	130	+ private function chance()
	131	+ {
	132	+ return rand(0, 3);
	133	+ }
	134	+
	135	+ /**
	136	+ * @return int
	137	+ */
	138	+ private function bonusHome()
	139	+ {
	140	+ return Randomizer::boolOnPercentage(66) ? 1 : 0;
	141	+ }
	142	+
	143	+ /**
	144	+ * @param $moduleString
	145	+ * @param $playersRoleArray
	146	+ * @return int
	147	+ */
	148	+ private function malusModule($moduleString, $playersRoleArray)
	149	+ {
	150	+ $module = new Module($moduleString);
	151	+ if ($module->isApplicableToArray($playersRoleArray)) {
	152	+ return rand(1, 10);
	153	+ } else {
	154	+ return (-1) * rand(1, 10);
	155	+ }
	156	+ }
157	157
158	158	}
159	159	\ No newline at end of file

		@@ -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

		@@ -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

		@@ -9,65 +9,65 @@
		block discarded – undo
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

		@@ -12,15 +12,15 @@
		block discarded – undo
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

vikkio88 / dsManager-php

Push — master ( 24e320...176aa1 )

Status

Category

Doc Comments +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

Indentation +30 added lines, -30 removed lines patch added patch discarded remove patch

Indentation +22 added lines, -22 removed lines patch added patch discarded remove patch

Indentation +144 added lines, -144 removed lines patch added patch discarded remove patch

Indentation +24 added lines, -24 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +54 added lines, -54 removed lines patch added patch discarded remove patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch