Inspection of "cleaned up MatchSimulator" - vikkio88/dsManager-php - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( c27acc...5e9888 )

by Vincenzo

created 2016-09-03 23:23 UTC

Status

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

@@ -5,22 +5,22 @@
 block discarded – undo
 
 class CreateMatchPlayersTable
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        Capsule::schema()->dropIfExists('match_players');
-        Capsule::schema()->create('match_players', function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('match_id');
-            $table->integer('team_id');
-            $table->integer('player_id')->default(0);
-            $table->unsignedTinyInteger('goals')->default(0);
-            $table->unsignedTinyInteger('vote')->default(6);
-            $table->timestamps();
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		Capsule::schema()->dropIfExists('match_players');
+		Capsule::schema()->create('match_players', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('match_id');
+			$table->integer('team_id');
+			$table->integer('player_id')->default(0);
+			$table->unsignedTinyInteger('goals')->default(0);
+			$table->unsignedTinyInteger('vote')->default(6);
+			$table->timestamps();
+		});
+	}
 }

Please login to merge, or discard this patch.

api/tests/ModelsTest.php 1 patch

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

@@ -8,227 +8,227 @@
 block discarded – undo
 {
 
 
-    /**
-     * @group Player
-     */
-    public function testGetRandomPlayer()
-    {
-        $rndF = new \App\Lib\DsManager\Helpers\RandomFiller();
-        $player = $rndF->getPlayer(null, $rndF->getLocale());
-        $array = $player->toArray();
-        $this->assertNotEmpty($array);
-
-        $newPlayer = \App\Lib\DsManager\Models\Player::fromArray($array);
-        $this->assertNotEmpty($newPlayer->toArray());
-    }
-
-    /**
-     * @group Coach
-     */
-    public function testGetRandomCoach()
-    {
-        $rndF = new \App\Lib\DsManager\Helpers\RandomFiller();
-        $coach = $rndF->getCoach();
-        $this->assertNotEmpty($coach->toArray());
-    }
-
-    /**
-     * @group Coaches
-     */
-    public function testGetRandomCoaches()
-    {
-        foreach (\App\Lib\Helpers\Config::get('generic.localesSmall') as $nat) {
-            $rndF = new \App\Lib\DsManager\Helpers\RandomFiller($nat);
-            $coach = $rndF->getCoach();
-            $this->assertNotEmpty($coach->toArray());
-        }
-    }
-
-    /**
-     * @group Players
-     */
-    public function testGetRandomPlayers()
-    {
-        foreach (\App\Lib\Helpers\Config::get('generic.localesSmall') as $nat) {
-            $rndF = new \App\Lib\DsManager\Helpers\RandomFiller($nat);
-            $player = $rndF->getPlayer();
-            $this->assertNotEmpty($player->toArray());
-        }
-    }
-
-    /**
-     * @group Team
-     */
-    public function testGetRandomTeam()
-    {
-        $rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
-        $team = $rndF->getTeam();
-        $this->assertNotEmpty($team);
-        $this->assertNotEmpty($team->name);
-        $this->assertNotEmpty($team->getAvgSkill());
-
-        //After Adding a player
-        $player = $rndF->getPlayer();
-        $this->assertNotEmpty($player->toArray());
-        $team->roster[] = $player;
-        $this->assertNotEmpty($team->getAvgSkill());
-        $this->assertNotEmpty($team->getAvgAge());
-
-        $this->assertNotEmpty($team->coach->toArray());
-
-        $teamArray = $team->toArray();
-        $this->assertNotEmpty($teamArray);
-
-        $newTeam = \App\Lib\DsManager\Models\Team::fromArray($teamArray);
-        $this->assertNotEmpty($newTeam->toArray());
-
-    }
-
-    /**
-     * @group Teams
-     */
-    public function testGetRandomTeams()
-    {
-        $rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
-
-        for ($i = 1; $i <= 20; $i++) {
-            $team = $rndF->getTeam();
-            $this->assertGreaterThanOrEqual(
-                \App\Lib\Helpers\Config::get('generic.rosters')['min'],
-                count($team->roster)
-            );
-            $this->assertNotEmpty($team->name);
-            $this->assertNotEmpty($team->nationality);
-            $this->assertNotEmpty($team->getAvgSkill());
-            $this->assertNotEmpty($team->getAvgAge());
-        }
-    }
-
-    /**
-     * @group Match
-     */
-    public function testGetRandomMatch()
-    {
-        for ($i = 1; $i <= 30; $i++) {
-            $rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
-            $spanish = $rndF->getTeam();
-            $rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
-            $italian = $rndF->getTeam();
-            $this->assertNotEmpty($spanish);
-            $this->assertNotEmpty($italian);
-            $this->assertNotEmpty($italian->name);
-            $this->assertNotEmpty($spanish);
-            $this->assertNotEmpty($spanish->name);
-
-            $this->assertNotEmpty($italian->getAvgSkill());
-            $this->assertNotEmpty($spanish->getAvgSkill());
-            $result = (new \App\Lib\DsManager\Models\Match($italian, $spanish))->simulate()->toArray();
-            $this->assertNotEmpty($result);
-            $this->assertGreaterThanOrEqual(0, $result['goal_home']);
-            $this->assertGreaterThanOrEqual(0, $result['goal_away']);
-
-        }
-    }
-
-    /**
-     * @group Match
-     * @group MatchResult
-     * @group matchresultoutput
-     */
-    public function testMatchFromExistingTeams()
-    {
-        $teamHome = 1;
-        $teamAway = 2;
-        $homeOrm = \App\Lib\DsManager\Models\Orm\Team::with('roster', 'coach')->where(['id' => $teamHome])->first();
-        $awayOrm = \App\Lib\DsManager\Models\Orm\Team::with('roster', 'coach')->where(['id' => $teamAway])->first();
-        $home = \App\Lib\DsManager\Models\Team::fromArray($homeOrm->toArray());
-        $away = \App\Lib\DsManager\Models\Team::fromArray($awayOrm->toArray());
-
-        $match = new \App\Lib\DsManager\Models\Match($home, $away);
-        $result = $match->simulate()->toArray();
-        $this->assertNotEmpty($result);
-        $this->assertGreaterThanOrEqual(0, $result['goal_away']);
-        $this->assertGreaterThanOrEqual(0, $result['goal_home']);
-        if ($result['goal_home'] > 0) {
-            $this->assertNotEmpty($result['info']['scorers']['home']);
-            foreach ($result['info']['scorers']['home'] as $scorerHome) {
-                $this->assertEquals($scorerHome->team_id, $teamHome);
-            }
-        } else {
-            $this->assertEmpty($result['info']['scorers']['home']);
-        }
-        if ($result['goal_away'] > 0) {
-            $this->assertNotEmpty($result['info']['scorers']['away']);
-            foreach ($result['info']['scorers']['away'] as $scorerAway) {
-                $this->assertEquals($scorerAway->team_id, $teamAway);
-            }
-        } else {
-            $this->assertEmpty($result['info']['scorers']['away']);
-        }
-        if ($result['goal_home'] == $result['goal_away']) {
-            $this->assertTrue($result['info']['is_draw']);
-        } else {
-            $this->assertFalse($result['info']['is_draw']);
-        }
-    }
-
-    /**
-     * @group Matches
-     */
-    public function testGetRandomMatchesOneTeam()
-    {
-        $rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
-        $myTeam = $rndF->getTeam();
-        $myTeam->id = 1000;
-        $win = 0;
-        $lost = 0;
-        $draw = 0;
-
-        for ($i = 1; $i <= 2; $i++) {
-
-            $randomLocale = \App\Lib\Helpers\Config::get('generic.localesSmall');
-            shuffle($randomLocale);
-            $randomLocale = $randomLocale[0];
-            $rndF = new \App\Lib\DsManager\Helpers\RandomFiller($randomLocale);
-            $opponent = $rndF->getTeam();
-            $opponent->id = 6000;
-            $result = (new \App\Lib\DsManager\Models\Match($opponent, $myTeam))->simulate()->toArray();
-            $this->assertNotEmpty($result);
-            $result = $result['info'];
-            if (!$result['is_draw']) {
-                if ($result['winner_id'] == $myTeam->id) {
-                    $win++;
-                } else {
-                    $lost++;
-                }
-            } else {
-                $draw++;
-            }
-        }
-        $this->assertGreaterThanOrEqual(0, $win);
-        $this->assertGreaterThanOrEqual(0, $lost);
-        $this->assertGreaterThanOrEqual(0, $draw);
-    }
-
-    /**
-     * @group Module
-     */
-    public function testModule()
-    {
-        $rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
-        $team = $rndF->getTeam();
-
-        $modules = \App\Lib\Helpers\Config::get("modules.modules");
-        $modules = array_keys($modules);
-        foreach ($modules as $mod) {
-            $module = new \App\Lib\DsManager\Models\Module($mod);
-            $this->assertNotEmpty($module);
-            $this->assertNotNull($module->isDefensive());
-            $this->assertNotNull($module->isBalanced());
-            $this->assertNotNull($module->isOffensive());
-            $this->assertTrue(is_array($module->getRoleNeeded()));
-        }
-        $this->assertGreaterThan(0, $team->playersPerRoleArray());
-    }
+	/**
+	 * @group Player
+	 */
+	public function testGetRandomPlayer()
+	{
+		$rndF = new \App\Lib\DsManager\Helpers\RandomFiller();
+		$player = $rndF->getPlayer(null, $rndF->getLocale());
+		$array = $player->toArray();
+		$this->assertNotEmpty($array);
+
+		$newPlayer = \App\Lib\DsManager\Models\Player::fromArray($array);
+		$this->assertNotEmpty($newPlayer->toArray());
+	}
+
+	/**
+	 * @group Coach
+	 */
+	public function testGetRandomCoach()
+	{
+		$rndF = new \App\Lib\DsManager\Helpers\RandomFiller();
+		$coach = $rndF->getCoach();
+		$this->assertNotEmpty($coach->toArray());
+	}
+
+	/**
+	 * @group Coaches
+	 */
+	public function testGetRandomCoaches()
+	{
+		foreach (\App\Lib\Helpers\Config::get('generic.localesSmall') as $nat) {
+			$rndF = new \App\Lib\DsManager\Helpers\RandomFiller($nat);
+			$coach = $rndF->getCoach();
+			$this->assertNotEmpty($coach->toArray());
+		}
+	}
+
+	/**
+	 * @group Players
+	 */
+	public function testGetRandomPlayers()
+	{
+		foreach (\App\Lib\Helpers\Config::get('generic.localesSmall') as $nat) {
+			$rndF = new \App\Lib\DsManager\Helpers\RandomFiller($nat);
+			$player = $rndF->getPlayer();
+			$this->assertNotEmpty($player->toArray());
+		}
+	}
+
+	/**
+	 * @group Team
+	 */
+	public function testGetRandomTeam()
+	{
+		$rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
+		$team = $rndF->getTeam();
+		$this->assertNotEmpty($team);
+		$this->assertNotEmpty($team->name);
+		$this->assertNotEmpty($team->getAvgSkill());
+
+		//After Adding a player
+		$player = $rndF->getPlayer();
+		$this->assertNotEmpty($player->toArray());
+		$team->roster[] = $player;
+		$this->assertNotEmpty($team->getAvgSkill());
+		$this->assertNotEmpty($team->getAvgAge());
+
+		$this->assertNotEmpty($team->coach->toArray());
+
+		$teamArray = $team->toArray();
+		$this->assertNotEmpty($teamArray);
+
+		$newTeam = \App\Lib\DsManager\Models\Team::fromArray($teamArray);
+		$this->assertNotEmpty($newTeam->toArray());
+
+	}
+
+	/**
+	 * @group Teams
+	 */
+	public function testGetRandomTeams()
+	{
+		$rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
+
+		for ($i = 1; $i <= 20; $i++) {
+			$team = $rndF->getTeam();
+			$this->assertGreaterThanOrEqual(
+				\App\Lib\Helpers\Config::get('generic.rosters')['min'],
+				count($team->roster)
+			);
+			$this->assertNotEmpty($team->name);
+			$this->assertNotEmpty($team->nationality);
+			$this->assertNotEmpty($team->getAvgSkill());
+			$this->assertNotEmpty($team->getAvgAge());
+		}
+	}
+
+	/**
+	 * @group Match
+	 */
+	public function testGetRandomMatch()
+	{
+		for ($i = 1; $i <= 30; $i++) {
+			$rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
+			$spanish = $rndF->getTeam();
+			$rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
+			$italian = $rndF->getTeam();
+			$this->assertNotEmpty($spanish);
+			$this->assertNotEmpty($italian);
+			$this->assertNotEmpty($italian->name);
+			$this->assertNotEmpty($spanish);
+			$this->assertNotEmpty($spanish->name);
+
+			$this->assertNotEmpty($italian->getAvgSkill());
+			$this->assertNotEmpty($spanish->getAvgSkill());
+			$result = (new \App\Lib\DsManager\Models\Match($italian, $spanish))->simulate()->toArray();
+			$this->assertNotEmpty($result);
+			$this->assertGreaterThanOrEqual(0, $result['goal_home']);
+			$this->assertGreaterThanOrEqual(0, $result['goal_away']);
+
+		}
+	}
+
+	/**
+	 * @group Match
+	 * @group MatchResult
+	 * @group matchresultoutput
+	 */
+	public function testMatchFromExistingTeams()
+	{
+		$teamHome = 1;
+		$teamAway = 2;
+		$homeOrm = \App\Lib\DsManager\Models\Orm\Team::with('roster', 'coach')->where(['id' => $teamHome])->first();
+		$awayOrm = \App\Lib\DsManager\Models\Orm\Team::with('roster', 'coach')->where(['id' => $teamAway])->first();
+		$home = \App\Lib\DsManager\Models\Team::fromArray($homeOrm->toArray());
+		$away = \App\Lib\DsManager\Models\Team::fromArray($awayOrm->toArray());
+
+		$match = new \App\Lib\DsManager\Models\Match($home, $away);
+		$result = $match->simulate()->toArray();
+		$this->assertNotEmpty($result);
+		$this->assertGreaterThanOrEqual(0, $result['goal_away']);
+		$this->assertGreaterThanOrEqual(0, $result['goal_home']);
+		if ($result['goal_home'] > 0) {
+			$this->assertNotEmpty($result['info']['scorers']['home']);
+			foreach ($result['info']['scorers']['home'] as $scorerHome) {
+				$this->assertEquals($scorerHome->team_id, $teamHome);
+			}
+		} else {
+			$this->assertEmpty($result['info']['scorers']['home']);
+		}
+		if ($result['goal_away'] > 0) {
+			$this->assertNotEmpty($result['info']['scorers']['away']);
+			foreach ($result['info']['scorers']['away'] as $scorerAway) {
+				$this->assertEquals($scorerAway->team_id, $teamAway);
+			}
+		} else {
+			$this->assertEmpty($result['info']['scorers']['away']);
+		}
+		if ($result['goal_home'] == $result['goal_away']) {
+			$this->assertTrue($result['info']['is_draw']);
+		} else {
+			$this->assertFalse($result['info']['is_draw']);
+		}
+	}
+
+	/**
+	 * @group Matches
+	 */
+	public function testGetRandomMatchesOneTeam()
+	{
+		$rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
+		$myTeam = $rndF->getTeam();
+		$myTeam->id = 1000;
+		$win = 0;
+		$lost = 0;
+		$draw = 0;
+
+		for ($i = 1; $i <= 2; $i++) {
+
+			$randomLocale = \App\Lib\Helpers\Config::get('generic.localesSmall');
+			shuffle($randomLocale);
+			$randomLocale = $randomLocale[0];
+			$rndF = new \App\Lib\DsManager\Helpers\RandomFiller($randomLocale);
+			$opponent = $rndF->getTeam();
+			$opponent->id = 6000;
+			$result = (new \App\Lib\DsManager\Models\Match($opponent, $myTeam))->simulate()->toArray();
+			$this->assertNotEmpty($result);
+			$result = $result['info'];
+			if (!$result['is_draw']) {
+				if ($result['winner_id'] == $myTeam->id) {
+					$win++;
+				} else {
+					$lost++;
+				}
+			} else {
+				$draw++;
+			}
+		}
+		$this->assertGreaterThanOrEqual(0, $win);
+		$this->assertGreaterThanOrEqual(0, $lost);
+		$this->assertGreaterThanOrEqual(0, $draw);
+	}
+
+	/**
+	 * @group Module
+	 */
+	public function testModule()
+	{
+		$rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
+		$team = $rndF->getTeam();
+
+		$modules = \App\Lib\Helpers\Config::get("modules.modules");
+		$modules = array_keys($modules);
+		foreach ($modules as $mod) {
+			$module = new \App\Lib\DsManager\Models\Module($mod);
+			$this->assertNotEmpty($module);
+			$this->assertNotNull($module->isDefensive());
+			$this->assertNotNull($module->isBalanced());
+			$this->assertNotNull($module->isOffensive());
+			$this->assertTrue(is_array($module->getRoleNeeded()));
+		}
+		$this->assertGreaterThan(0, $team->playersPerRoleArray());
+	}
 
 }

Please login to merge, or discard this patch.

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

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

@@ -13,118 +13,118 @@
 block discarded – undo
  */
 class MatchResult extends DsManagerModel
 {
-    /**
-     * @var
-     */
-    private $goalHome;
-    /**
-     * @var
-     */
-    private $goalAway;
-    /**
-     * @var Team
-     */
-    private $homeTeam;
-    /**
-     * @var Team
-     */
-    private $awayTeam;
+	/**
+	 * @var
+	 */
+	private $goalHome;
+	/**
+	 * @var
+	 */
+	private $goalAway;
+	/**
+	 * @var Team
+	 */
+	private $homeTeam;
+	/**
+	 * @var Team
+	 */
+	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;
+	}
 
-    /**
-     * @return array
-     */
-    public function getWinnerLoser()
-    {
-        $isDraw = false;
-        $winner = $this->awayTeam;
-        $loser = $this->homeTeam;
-        if ($this->goalAway == $this->goalHome) {
-            $isDraw = true;
-        } else if ($this->goalHome < $this->goalAway) {
-            $winner = $this->awayTeam;
-            $loser = $this->homeTeam;
-        }
-        return [
-            'is_draw' => $isDraw,
-            'winner_id' => $winner->id,
-            'loser_id' => $loser->id
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function getWinnerLoser()
+	{
+		$isDraw = false;
+		$winner = $this->awayTeam;
+		$loser = $this->homeTeam;
+		if ($this->goalAway == $this->goalHome) {
+			$isDraw = true;
+		} else if ($this->goalHome < $this->goalAway) {
+			$winner = $this->awayTeam;
+			$loser = $this->homeTeam;
+		}
+		return [
+			'is_draw' => $isDraw,
+			'winner_id' => $winner->id,
+			'loser_id' => $loser->id
+		];
+	}
 
-    /**
-     * @return array
-     */
-    public function toArray()
-    {
-        $result = [];
-        $result['home_team_id'] = $this->homeTeam->id;
-        $result['away_team_id'] = $this->awayTeam->id;
-        $result['goal_home'] = $this->goalHome;
-        $result['goal_away'] = $this->goalAway;
-        $result['info'] = $this->getWinnerLoser();
-        $result['info']['scorers'] = $this->getScorers();
-        $result['simulated'] = true;
-        return $result;
-    }
-    /**
-     * @return array
-     */
-    private function getScorers()
-    {
-        $scorers = [
-            'home' => [],
-            'away' => []
-        ];
-        for ($i = 0; $i < $this->goalHome; $i++) {
-            $scorers['home'][] = $this->pickAScorer($this->homeTeam);
-        }
-        for ($i = 0; $i < $this->goalAway; $i++) {
-            $scorers['away'][] = $this->pickAScorer($this->awayTeam);
-        }
-        return $scorers;
-    }
+	/**
+	 * @return array
+	 */
+	public function toArray()
+	{
+		$result = [];
+		$result['home_team_id'] = $this->homeTeam->id;
+		$result['away_team_id'] = $this->awayTeam->id;
+		$result['goal_home'] = $this->goalHome;
+		$result['goal_away'] = $this->goalAway;
+		$result['info'] = $this->getWinnerLoser();
+		$result['info']['scorers'] = $this->getScorers();
+		$result['simulated'] = true;
+		return $result;
+	}
+	/**
+	 * @return array
+	 */
+	private function getScorers()
+	{
+		$scorers = [
+			'home' => [],
+			'away' => []
+		];
+		for ($i = 0; $i < $this->goalHome; $i++) {
+			$scorers['home'][] = $this->pickAScorer($this->homeTeam);
+		}
+		for ($i = 0; $i < $this->goalAway; $i++) {
+			$scorers['away'][] = $this->pickAScorer($this->awayTeam);
+		}
+		return $scorers;
+	}
 
-    /**
-     * @param Team $team
-     * @return Player
-     */
-    private function pickAScorer(Team $team)
-    {
-        $player = null;
-        if (Randomizer::boolOnPercentage(70)) {
-            $roles = Config::get('modules.roles');
-            $forwards = array_splice($roles, count($roles) / 2);
-            $pos = array_rand($forwards);
-            unset($forwards[$pos]);
-            $player = $team->getBestPlayerForRole($pos);
-            while (empty($player)) {
-                if (!empty($forwards)) {
-                    $pos = array_rand($forwards);
-                    unset($forwards[$pos]);
-                    $player = $team->getBestPlayerForRole($pos);
-                } else {
-                    $player = $team->roster[array_rand($team->roster)];
-                }
-            }
-        } else {
-            $player = $team->roster[array_rand($team->roster)];
-        }
-        return $player;
-    }
+	/**
+	 * @param Team $team
+	 * @return Player
+	 */
+	private function pickAScorer(Team $team)
+	{
+		$player = null;
+		if (Randomizer::boolOnPercentage(70)) {
+			$roles = Config::get('modules.roles');
+			$forwards = array_splice($roles, count($roles) / 2);
+			$pos = array_rand($forwards);
+			unset($forwards[$pos]);
+			$player = $team->getBestPlayerForRole($pos);
+			while (empty($player)) {
+				if (!empty($forwards)) {
+					$pos = array_rand($forwards);
+					unset($forwards[$pos]);
+					$player = $team->getBestPlayerForRole($pos);
+				} else {
+					$player = $team->roster[array_rand($team->roster)];
+				}
+			}
+		} else {
+			$player = $team->roster[array_rand($team->roster)];
+		}
+		return $player;
+	}
 
 }
\ No newline at end of file

Please login to merge, or discard this patch.

api/Lib/DsManager/Helpers/Randomizer.php 1 patch

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

@@ -10,22 +10,22 @@
 block discarded – undo
  */
 class Randomizer
 {
-    /**
-     * @param $percentage
-     * @return bool
-     */
-    public static function boolOnPercentage($percentage)
-    {
-        return (rand(0, 100) < $percentage);
-    }
+	/**
+	 * @param $percentage
+	 * @return bool
+	 */
+	public static function boolOnPercentage($percentage)
+	{
+		return (rand(0, 100) < $percentage);
+	}
 
-    /**
-     * @param $skill
-     * @return int
-     */
-    public static function voteFromSkill($skill)
-    {
-        return rand((2 * ($skill - 100) / 25), 10);
-    }
+	/**
+	 * @param $skill
+	 * @return int
+	 */
+	public static function voteFromSkill($skill)
+	{
+		return rand((2 * ($skill - 100) / 25), 10);
+	}
 
 }
\ No newline at end of file

Please login to merge, or discard this patch.

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

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

@@ -9,118 +9,118 @@
 block discarded – undo
  */
 class MatchResult extends Match
 {
-    /**
-     * @var array
-     */
-    protected $fillable = [
-        'goal_home',
-        'goal_away',
-        'info',
-        'simulated'
-    ];
+	/**
+	 * @var array
+	 */
+	protected $fillable = [
+		'goal_home',
+		'goal_away',
+		'info',
+		'simulated'
+	];
 
-    protected $hidden = [
-        'home_team_id',
-        'away_team_id',
-        'created_at',
-        'updated_at'
-    ];
+	protected $hidden = [
+		'home_team_id',
+		'away_team_id',
+		'created_at',
+		'updated_at'
+	];
 
-    /**
-     * @var array
-     */
-    protected $casts = [
-        'info' => 'json',
-        'simulated' => 'boolean'
-    ];
+	/**
+	 * @var array
+	 */
+	protected $casts = [
+		'info' => 'json',
+		'simulated' => 'boolean'
+	];
 
-    public static function resolveAttributes(array $attributes, $matchId)
-    {
-        self::generateAppearances(
-            [
-                $attributes['home_team_id'],
-                $attributes['away_team_id']
-            ],
-            $matchId
-        );
-        if (array_key_exists('info', $attributes)) {
-            if (array_key_exists('scorers', $attributes['info'])) {
-                foreach ($attributes['info']['scorers']['home'] as $scorerHome) {
-                    self::addScorer($matchId, $attributes['home_team_id'], $scorerHome->id);
-                }
-                foreach ($attributes['info']['scorers']['away'] as $scorerAway) {
-                    self::addScorer($matchId, $attributes['away_team_id'], $scorerAway->id);
-                }
-                unset($attributes['info']['scorers']);
-            }
-            $attributes['info'] = json_encode($attributes['info']);
-        }
-        return $attributes;
-    }
+	public static function resolveAttributes(array $attributes, $matchId)
+	{
+		self::generateAppearances(
+			[
+				$attributes['home_team_id'],
+				$attributes['away_team_id']
+			],
+			$matchId
+		);
+		if (array_key_exists('info', $attributes)) {
+			if (array_key_exists('scorers', $attributes['info'])) {
+				foreach ($attributes['info']['scorers']['home'] as $scorerHome) {
+					self::addScorer($matchId, $attributes['home_team_id'], $scorerHome->id);
+				}
+				foreach ($attributes['info']['scorers']['away'] as $scorerAway) {
+					self::addScorer($matchId, $attributes['away_team_id'], $scorerAway->id);
+				}
+				unset($attributes['info']['scorers']);
+			}
+			$attributes['info'] = json_encode($attributes['info']);
+		}
+		return $attributes;
+	}
 
-    private static function addScorer($matchId, $teamId, $playerId)
-    {
-        $scorer = MatchPlayer::where(
-            [
-                'match_id' => $matchId,
-                'team_id' => $teamId,
-                'player_id' => $playerId
-            ]
-        )->first();
-        if (!empty($scorer)) {
-            $scorer->goals = $scorer->goals + 1;
-            $scorer->vote = $scorer->vote <= 9 ? $scorer->vote + rand(0, 1) : $scorer->vote;
-            $scorer->save();
-        } else {
-            MatchPlayer::create(
-                [
-                    'match_id' => $matchId,
-                    'team_id' => $teamId,
-                    'player_id' => $playerId,
-                    'goals' => 1
-                ]
-            );
-        }
-    }
+	private static function addScorer($matchId, $teamId, $playerId)
+	{
+		$scorer = MatchPlayer::where(
+			[
+				'match_id' => $matchId,
+				'team_id' => $teamId,
+				'player_id' => $playerId
+			]
+		)->first();
+		if (!empty($scorer)) {
+			$scorer->goals = $scorer->goals + 1;
+			$scorer->vote = $scorer->vote <= 9 ? $scorer->vote + rand(0, 1) : $scorer->vote;
+			$scorer->save();
+		} else {
+			MatchPlayer::create(
+				[
+					'match_id' => $matchId,
+					'team_id' => $teamId,
+					'player_id' => $playerId,
+					'goals' => 1
+				]
+			);
+		}
+	}
 
-    private static function generateAppearances(
-        $teamIds,
-        $matchId
-    )
-    {
-        foreach ($teamIds as $id) {
-            $players = Player::where('team_id', $id)->get()->random(11);
-            foreach ($players as $player) {
-                MatchPlayer::create(
-                    [
-                        'match_id' => $matchId,
-                        'team_id' => $id,
-                        'player_id' => $player->id,
-                        'vote' => Randomizer::voteFromSkill($player->skillAvg)
-                    ]
-                );
-            }
-        }
-    }
+	private static function generateAppearances(
+		$teamIds,
+		$matchId
+	)
+	{
+		foreach ($teamIds as $id) {
+			$players = Player::where('team_id', $id)->get()->random(11);
+			foreach ($players as $player) {
+				MatchPlayer::create(
+					[
+						'match_id' => $matchId,
+						'team_id' => $id,
+						'player_id' => $player->id,
+						'vote' => Randomizer::voteFromSkill($player->skillAvg)
+					]
+				);
+			}
+		}
+	}
 
-    public function scorers()
-    {
-        return $this->belongsToMany(
-            Player::class,
-            'match_players',
-            'match_id'
-        )->withPivot(
-            'team_id',
-            'goals'
-        )->where(
-            'goals', '>', 0
-        );
-    }
+	public function scorers()
+	{
+		return $this->belongsToMany(
+			Player::class,
+			'match_players',
+			'match_id'
+		)->withPivot(
+			'team_id',
+			'goals'
+		)->where(
+			'goals', '>', 0
+		);
+	}
 
-    public function scopeComplete($query)
-    {
-        return parent::scopeComplete($query)->with('scorers');
-    }
+	public function scopeComplete($query)
+	{
+		return parent::scopeComplete($query)->with('scorers');
+	}
 
 
 }
\ No newline at end of file

Please login to merge, or discard this patch.

api/Lib/DsManager/Models/Orm/Player.php 1 patch

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

@@ -9,70 +9,70 @@
 block discarded – undo
 class Player extends DsManagerOrm
 {
 
-    /**
-     * @var string
-     */
-    protected $table = 'players';
+	/**
+	 * @var string
+	 */
+	protected $table = 'players';
 
-    /**
-     * @var array
-     */
-    protected $fillable = [
-        'name',
-        'surname',
-        'age',
-        'nationality',
-        'skillAvg',
-        'wageReq',
-        'val',
-        'role',
-        'team_id'
-    ];
+	/**
+	 * @var array
+	 */
+	protected $fillable = [
+		'name',
+		'surname',
+		'age',
+		'nationality',
+		'skillAvg',
+		'wageReq',
+		'val',
+		'role',
+		'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);
+	}
 
-    public function lastMatches()
-    {
-        return $this->hasMany(MatchPlayer::class)
-            ->orderBy('updated_at', 'DESC')
-            ->limit(5);
-    }
+	public function lastMatches()
+	{
+		return $this->hasMany(MatchPlayer::class)
+			->orderBy('updated_at', 'DESC')
+			->limit(5);
+	}
 
-    public function goals()
-    {
-        return $this->hasOne(MatchPlayer::class)
-            ->selectRaw('player_id, sum(goals) as count')
-            ->groupBy('player_id');
-    }
+	public function goals()
+	{
+		return $this->hasOne(MatchPlayer::class)
+			->selectRaw('player_id, sum(goals) as count')
+			->groupBy('player_id');
+	}
 
-    public function appearances()
-    {
-        return $this->hasOne(MatchPlayer::class)
-            ->selectRaw('player_id, count(match_id) as count')
-            ->groupBy('player_id');
-    }
+	public function appearances()
+	{
+		return $this->hasOne(MatchPlayer::class)
+			->selectRaw('player_id, count(match_id) as count')
+			->groupBy('player_id');
+	}
 
-    public function avg()
-    {
-        return $this->hasOne(MatchPlayer::class)
-            ->selectRaw('player_id, round(avg(vote),2) as avg')
-            ->groupBy('player_id');
-    }
+	public function avg()
+	{
+		return $this->hasOne(MatchPlayer::class)
+			->selectRaw('player_id, round(avg(vote),2) as avg')
+			->groupBy('player_id');
+	}
 
-    public function scopeStatistics($query)
-    {
-        return $query->with(
-            'goals',
-            'appearances',
-            'avg',
-            'lastMatches',
-            'team'
-        );
-    }
+	public function scopeStatistics($query)
+	{
+		return $query->with(
+			'goals',
+			'appearances',
+			'avg',
+			'lastMatches',
+			'team'
+		);
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

api/database/seeds/A000TeamsSeeder.php 1 patch

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

@@ -3,20 +3,20 @@
 block discarded – undo
 
 class ATeamsSeeder
 {
-    function run()
-    {
-        $teamNumber = 16;
-        $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller();
-        for ($i = 1; $i <= $teamNumber; $i++) {
-            $team = $rndFiller->getTeam($rndFiller->getLocale());
-            $teamArray = $team->toArray();
-            $teamO = \App\Lib\DsManager\Models\Orm\Team::create($teamArray);
-            foreach ($teamArray['roster'] as $player) {
-                $player['team_id'] = $teamO->id;
-                \App\Lib\DsManager\Models\Orm\Player::create($player);
-            }
-            $teamArray['coach']['team_id'] = $teamO->id;
-            \App\Lib\DsManager\Models\Orm\Coach::create($teamArray['coach']);
-        }
-    }
+	function run()
+	{
+		$teamNumber = 16;
+		$rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller();
+		for ($i = 1; $i <= $teamNumber; $i++) {
+			$team = $rndFiller->getTeam($rndFiller->getLocale());
+			$teamArray = $team->toArray();
+			$teamO = \App\Lib\DsManager\Models\Orm\Team::create($teamArray);
+			foreach ($teamArray['roster'] as $player) {
+				$player['team_id'] = $teamO->id;
+				\App\Lib\DsManager\Models\Orm\Player::create($player);
+			}
+			$teamArray['coach']['team_id'] = $teamO->id;
+			\App\Lib\DsManager\Models\Orm\Coach::create($teamArray['coach']);
+		}
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

api/database/seeds/A001LeaguesSeeder.php 1 patch

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

@@ -9,46 +9,46 @@
 block discarded – undo
 
 class A001LeaguesSeeder
 {
-    function run()
-    {
-        $leagues = [
-            'friendly' => 16,
-            'europa league' => 8
-        ];
-        $teams = Team::all()->toArray();
-        foreach ($leagues as $league => $teamsNum) {
+	function run()
+	{
+		$leagues = [
+			'friendly' => 16,
+			'europa league' => 8
+		];
+		$teams = Team::all()->toArray();
+		foreach ($leagues as $league => $teamsNum) {
 
-            $teamCopy = $teams;
-            $league = League::create(
-                [
-                    'name' => $league,
-                    'teams' => $teamsNum
-                ]
-            );
+			$teamCopy = $teams;
+			$league = League::create(
+				[
+					'name' => $league,
+					'teams' => $teamsNum
+				]
+			);
 
-            //Create Rounds
-            shuffle($teamCopy);
-            $teamCopy = array_splice($teamCopy, 0, $teamsNum);
-            $rounds = LeagueFixtureGenerator::generate($teamCopy);
-            foreach ($rounds as $i => $round) {
+			//Create Rounds
+			shuffle($teamCopy);
+			$teamCopy = array_splice($teamCopy, 0, $teamsNum);
+			$rounds = LeagueFixtureGenerator::generate($teamCopy);
+			foreach ($rounds as $i => $round) {
 
-                $leagueRound = LeagueRound::create(
-                    [
-                        'league_id' => $league->id,
-                        'day' => $i + 1
-                    ]
-                );
+				$leagueRound = LeagueRound::create(
+					[
+						'league_id' => $league->id,
+						'day' => $i + 1
+					]
+				);
 
-                foreach ($round as $match) {
-                    $newMatch = Match::create(
-                        [
-                            'home_team_id' => $match['home_team_id'],
-                            'away_team_id' => $match['away_team_id'],
-                            'league_round_id' => $leagueRound->id
-                        ]
-                    );
-                }
-            }
-        }
-    }
+				foreach ($round as $match) {
+					$newMatch = Match::create(
+						[
+							'home_team_id' => $match['home_team_id'],
+							'away_team_id' => $match['away_team_id'],
+							'league_round_id' => $leagueRound->id
+						]
+					);
+				}
+			}
+		}
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

api/database/migrations/CreateMatchTable.php 1 patch

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

@@ -5,25 +5,25 @@
 block discarded – undo
 
 class CreateMatchTable
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        Capsule::schema()->dropIfExists('matches');
-        Capsule::schema()->create('matches', function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('league_round_id')->nullable();
-            $table->integer('home_team_id');
-            $table->integer('goal_home')->default(0);
-            $table->integer('away_team_id');
-            $table->integer('goal_away')->default(0);
-            $table->boolean('simulated')->default(false);
-            $table->text('info')->nullable();
-            $table->date('match_date')->default(\Carbon\Carbon::now());
-            $table->timestamps();
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		Capsule::schema()->dropIfExists('matches');
+		Capsule::schema()->create('matches', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('league_round_id')->nullable();
+			$table->integer('home_team_id');
+			$table->integer('goal_home')->default(0);
+			$table->integer('away_team_id');
+			$table->integer('goal_away')->default(0);
+			$table->boolean('simulated')->default(false);
+			$table->text('info')->nullable();
+			$table->date('match_date')->default(\Carbon\Carbon::now());
+			$table->timestamps();
+		});
+	}
 }

Please login to merge, or discard this patch.

		@@ -5,22 +5,22 @@
		block discarded – undo
5	5
6	6	class CreateMatchPlayersTable
7	7	{
8		- /**
9		- * Run the migrations.
10		- *
11		- * @return void
12		- */
13		- public function run()
14		- {
15		- Capsule::schema()->dropIfExists('match_players');
16		- Capsule::schema()->create('match_players', function (Blueprint $table) {
17		- $table->increments('id');
18		- $table->integer('match_id');
19		- $table->integer('team_id');
20		- $table->integer('player_id')->default(0);
21		- $table->unsignedTinyInteger('goals')->default(0);
22		- $table->unsignedTinyInteger('vote')->default(6);
23		- $table->timestamps();
24		- });
25		- }
	8	+ /**
	9	+ * Run the migrations.
	10	+ *
	11	+ * @return void
	12	+ */
	13	+ public function run()
	14	+ {
	15	+ Capsule::schema()->dropIfExists('match_players');
	16	+ Capsule::schema()->create('match_players', function (Blueprint $table) {
	17	+ $table->increments('id');
	18	+ $table->integer('match_id');
	19	+ $table->integer('team_id');
	20	+ $table->integer('player_id')->default(0);
	21	+ $table->unsignedTinyInteger('goals')->default(0);
	22	+ $table->unsignedTinyInteger('vote')->default(6);
	23	+ $table->timestamps();
	24	+ });
	25	+ }
26	26	}

		@@ -8,227 +8,227 @@
		block discarded – undo
8	8	{
9	9
10	10
11		- /**
12		- * @group Player
13		- */
14		- public function testGetRandomPlayer()
15		- {
16		- $rndF = new \App\Lib\DsManager\Helpers\RandomFiller();
17		- $player = $rndF->getPlayer(null, $rndF->getLocale());
18		- $array = $player->toArray();
19		- $this->assertNotEmpty($array);
20		-
21		- $newPlayer = \App\Lib\DsManager\Models\Player::fromArray($array);
22		- $this->assertNotEmpty($newPlayer->toArray());
23		- }
24		-
25		- /**
26		- * @group Coach
27		- */
28		- public function testGetRandomCoach()
29		- {
30		- $rndF = new \App\Lib\DsManager\Helpers\RandomFiller();
31		- $coach = $rndF->getCoach();
32		- $this->assertNotEmpty($coach->toArray());
33		- }
34		-
35		- /**
36		- * @group Coaches
37		- */
38		- public function testGetRandomCoaches()
39		- {
40		- foreach (\App\Lib\Helpers\Config::get('generic.localesSmall') as $nat) {
41		- $rndF = new \App\Lib\DsManager\Helpers\RandomFiller($nat);
42		- $coach = $rndF->getCoach();
43		- $this->assertNotEmpty($coach->toArray());
44		- }
45		- }
46		-
47		- /**
48		- * @group Players
49		- */
50		- public function testGetRandomPlayers()
51		- {
52		- foreach (\App\Lib\Helpers\Config::get('generic.localesSmall') as $nat) {
53		- $rndF = new \App\Lib\DsManager\Helpers\RandomFiller($nat);
54		- $player = $rndF->getPlayer();
55		- $this->assertNotEmpty($player->toArray());
56		- }
57		- }
58		-
59		- /**
60		- * @group Team
61		- */
62		- public function testGetRandomTeam()
63		- {
64		- $rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
65		- $team = $rndF->getTeam();
66		- $this->assertNotEmpty($team);
67		- $this->assertNotEmpty($team->name);
68		- $this->assertNotEmpty($team->getAvgSkill());
69		-
70		- //After Adding a player
71		- $player = $rndF->getPlayer();
72		- $this->assertNotEmpty($player->toArray());
73		- $team->roster[] = $player;
74		- $this->assertNotEmpty($team->getAvgSkill());
75		- $this->assertNotEmpty($team->getAvgAge());
76		-
77		- $this->assertNotEmpty($team->coach->toArray());
78		-
79		- $teamArray = $team->toArray();
80		- $this->assertNotEmpty($teamArray);
81		-
82		- $newTeam = \App\Lib\DsManager\Models\Team::fromArray($teamArray);
83		- $this->assertNotEmpty($newTeam->toArray());
84		-
85		- }
86		-
87		- /**
88		- * @group Teams
89		- */
90		- public function testGetRandomTeams()
91		- {
92		- $rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
93		-
94		- for ($i = 1; $i <= 20; $i++) {
95		- $team = $rndF->getTeam();
96		- $this->assertGreaterThanOrEqual(
97		- \App\Lib\Helpers\Config::get('generic.rosters')['min'],
98		- count($team->roster)
99		- );
100		- $this->assertNotEmpty($team->name);
101		- $this->assertNotEmpty($team->nationality);
102		- $this->assertNotEmpty($team->getAvgSkill());
103		- $this->assertNotEmpty($team->getAvgAge());
104		- }
105		- }
106		-
107		- /**
108		- * @group Match
109		- */
110		- public function testGetRandomMatch()
111		- {
112		- for ($i = 1; $i <= 30; $i++) {
113		- $rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
114		- $spanish = $rndF->getTeam();
115		- $rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
116		- $italian = $rndF->getTeam();
117		- $this->assertNotEmpty($spanish);
118		- $this->assertNotEmpty($italian);
119		- $this->assertNotEmpty($italian->name);
120		- $this->assertNotEmpty($spanish);
121		- $this->assertNotEmpty($spanish->name);
122		-
123		- $this->assertNotEmpty($italian->getAvgSkill());
124		- $this->assertNotEmpty($spanish->getAvgSkill());
125		- $result = (new \App\Lib\DsManager\Models\Match($italian, $spanish))->simulate()->toArray();
126		- $this->assertNotEmpty($result);
127		- $this->assertGreaterThanOrEqual(0, $result['goal_home']);
128		- $this->assertGreaterThanOrEqual(0, $result['goal_away']);
129		-
130		- }
131		- }
132		-
133		- /**
134		- * @group Match
135		- * @group MatchResult
136		- * @group matchresultoutput
137		- */
138		- public function testMatchFromExistingTeams()
139		- {
140		- $teamHome = 1;
141		- $teamAway = 2;
142		- $homeOrm = \App\Lib\DsManager\Models\Orm\Team::with('roster', 'coach')->where(['id' => $teamHome])->first();
143		- $awayOrm = \App\Lib\DsManager\Models\Orm\Team::with('roster', 'coach')->where(['id' => $teamAway])->first();
144		- $home = \App\Lib\DsManager\Models\Team::fromArray($homeOrm->toArray());
145		- $away = \App\Lib\DsManager\Models\Team::fromArray($awayOrm->toArray());
146		-
147		- $match = new \App\Lib\DsManager\Models\Match($home, $away);
148		- $result = $match->simulate()->toArray();
149		- $this->assertNotEmpty($result);
150		- $this->assertGreaterThanOrEqual(0, $result['goal_away']);
151		- $this->assertGreaterThanOrEqual(0, $result['goal_home']);
152		- if ($result['goal_home'] > 0) {
153		- $this->assertNotEmpty($result['info']['scorers']['home']);
154		- foreach ($result['info']['scorers']['home'] as $scorerHome) {
155		- $this->assertEquals($scorerHome->team_id, $teamHome);
156		- }
157		- } else {
158		- $this->assertEmpty($result['info']['scorers']['home']);
159		- }
160		- if ($result['goal_away'] > 0) {
161		- $this->assertNotEmpty($result['info']['scorers']['away']);
162		- foreach ($result['info']['scorers']['away'] as $scorerAway) {
163		- $this->assertEquals($scorerAway->team_id, $teamAway);
164		- }
165		- } else {
166		- $this->assertEmpty($result['info']['scorers']['away']);
167		- }
168		- if ($result['goal_home'] == $result['goal_away']) {
169		- $this->assertTrue($result['info']['is_draw']);
170		- } else {
171		- $this->assertFalse($result['info']['is_draw']);
172		- }
173		- }
174		-
175		- /**
176		- * @group Matches
177		- */
178		- public function testGetRandomMatchesOneTeam()
179		- {
180		- $rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
181		- $myTeam = $rndF->getTeam();
182		- $myTeam->id = 1000;
183		- $win = 0;
184		- $lost = 0;
185		- $draw = 0;
186		-
187		- for ($i = 1; $i <= 2; $i++) {
188		-
189		- $randomLocale = \App\Lib\Helpers\Config::get('generic.localesSmall');
190		- shuffle($randomLocale);
191		- $randomLocale = $randomLocale[0];
192		- $rndF = new \App\Lib\DsManager\Helpers\RandomFiller($randomLocale);
193		- $opponent = $rndF->getTeam();
194		- $opponent->id = 6000;
195		- $result = (new \App\Lib\DsManager\Models\Match($opponent, $myTeam))->simulate()->toArray();
196		- $this->assertNotEmpty($result);
197		- $result = $result['info'];
198		- if (!$result['is_draw']) {
199		- if ($result['winner_id'] == $myTeam->id) {
200		- $win++;
201		- } else {
202		- $lost++;
203		- }
204		- } else {
205		- $draw++;
206		- }
207		- }
208		- $this->assertGreaterThanOrEqual(0, $win);
209		- $this->assertGreaterThanOrEqual(0, $lost);
210		- $this->assertGreaterThanOrEqual(0, $draw);
211		- }
212		-
213		- /**
214		- * @group Module
215		- */
216		- public function testModule()
217		- {
218		- $rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
219		- $team = $rndF->getTeam();
220		-
221		- $modules = \App\Lib\Helpers\Config::get("modules.modules");
222		- $modules = array_keys($modules);
223		- foreach ($modules as $mod) {
224		- $module = new \App\Lib\DsManager\Models\Module($mod);
225		- $this->assertNotEmpty($module);
226		- $this->assertNotNull($module->isDefensive());
227		- $this->assertNotNull($module->isBalanced());
228		- $this->assertNotNull($module->isOffensive());
229		- $this->assertTrue(is_array($module->getRoleNeeded()));
230		- }
231		- $this->assertGreaterThan(0, $team->playersPerRoleArray());
232		- }
	11	+ /**
	12	+ * @group Player
	13	+ */
	14	+ public function testGetRandomPlayer()
	15	+ {
	16	+ $rndF = new \App\Lib\DsManager\Helpers\RandomFiller();
	17	+ $player = $rndF->getPlayer(null, $rndF->getLocale());
	18	+ $array = $player->toArray();
	19	+ $this->assertNotEmpty($array);
	20	+
	21	+ $newPlayer = \App\Lib\DsManager\Models\Player::fromArray($array);
	22	+ $this->assertNotEmpty($newPlayer->toArray());
	23	+ }
	24	+
	25	+ /**
	26	+ * @group Coach
	27	+ */
	28	+ public function testGetRandomCoach()
	29	+ {
	30	+ $rndF = new \App\Lib\DsManager\Helpers\RandomFiller();
	31	+ $coach = $rndF->getCoach();
	32	+ $this->assertNotEmpty($coach->toArray());
	33	+ }
	34	+
	35	+ /**
	36	+ * @group Coaches
	37	+ */
	38	+ public function testGetRandomCoaches()
	39	+ {
	40	+ foreach (\App\Lib\Helpers\Config::get('generic.localesSmall') as $nat) {
	41	+ $rndF = new \App\Lib\DsManager\Helpers\RandomFiller($nat);
	42	+ $coach = $rndF->getCoach();
	43	+ $this->assertNotEmpty($coach->toArray());
	44	+ }
	45	+ }
	46	+
	47	+ /**
	48	+ * @group Players
	49	+ */
	50	+ public function testGetRandomPlayers()
	51	+ {
	52	+ foreach (\App\Lib\Helpers\Config::get('generic.localesSmall') as $nat) {
	53	+ $rndF = new \App\Lib\DsManager\Helpers\RandomFiller($nat);
	54	+ $player = $rndF->getPlayer();
	55	+ $this->assertNotEmpty($player->toArray());
	56	+ }
	57	+ }
	58	+
	59	+ /**
	60	+ * @group Team
	61	+ */
	62	+ public function testGetRandomTeam()
	63	+ {
	64	+ $rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
	65	+ $team = $rndF->getTeam();
	66	+ $this->assertNotEmpty($team);
	67	+ $this->assertNotEmpty($team->name);
	68	+ $this->assertNotEmpty($team->getAvgSkill());
	69	+
	70	+ //After Adding a player
	71	+ $player = $rndF->getPlayer();
	72	+ $this->assertNotEmpty($player->toArray());
	73	+ $team->roster[] = $player;
	74	+ $this->assertNotEmpty($team->getAvgSkill());
	75	+ $this->assertNotEmpty($team->getAvgAge());
	76	+
	77	+ $this->assertNotEmpty($team->coach->toArray());
	78	+
	79	+ $teamArray = $team->toArray();
	80	+ $this->assertNotEmpty($teamArray);
	81	+
	82	+ $newTeam = \App\Lib\DsManager\Models\Team::fromArray($teamArray);
	83	+ $this->assertNotEmpty($newTeam->toArray());
	84	+
	85	+ }
	86	+
	87	+ /**
	88	+ * @group Teams
	89	+ */
	90	+ public function testGetRandomTeams()
	91	+ {
	92	+ $rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
	93	+
	94	+ for ($i = 1; $i <= 20; $i++) {
	95	+ $team = $rndF->getTeam();
	96	+ $this->assertGreaterThanOrEqual(
	97	+ \App\Lib\Helpers\Config::get('generic.rosters')['min'],
	98	+ count($team->roster)
	99	+ );
	100	+ $this->assertNotEmpty($team->name);
	101	+ $this->assertNotEmpty($team->nationality);
	102	+ $this->assertNotEmpty($team->getAvgSkill());
	103	+ $this->assertNotEmpty($team->getAvgAge());
	104	+ }
	105	+ }
	106	+
	107	+ /**
	108	+ * @group Match
	109	+ */
	110	+ public function testGetRandomMatch()
	111	+ {
	112	+ for ($i = 1; $i <= 30; $i++) {
	113	+ $rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
	114	+ $spanish = $rndF->getTeam();
	115	+ $rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
	116	+ $italian = $rndF->getTeam();
	117	+ $this->assertNotEmpty($spanish);
	118	+ $this->assertNotEmpty($italian);
	119	+ $this->assertNotEmpty($italian->name);
	120	+ $this->assertNotEmpty($spanish);
	121	+ $this->assertNotEmpty($spanish->name);
	122	+
	123	+ $this->assertNotEmpty($italian->getAvgSkill());
	124	+ $this->assertNotEmpty($spanish->getAvgSkill());
	125	+ $result = (new \App\Lib\DsManager\Models\Match($italian, $spanish))->simulate()->toArray();
	126	+ $this->assertNotEmpty($result);
	127	+ $this->assertGreaterThanOrEqual(0, $result['goal_home']);
	128	+ $this->assertGreaterThanOrEqual(0, $result['goal_away']);
	129	+
	130	+ }
	131	+ }
	132	+
	133	+ /**
	134	+ * @group Match
	135	+ * @group MatchResult
	136	+ * @group matchresultoutput
	137	+ */
	138	+ public function testMatchFromExistingTeams()
	139	+ {
	140	+ $teamHome = 1;
	141	+ $teamAway = 2;
	142	+ $homeOrm = \App\Lib\DsManager\Models\Orm\Team::with('roster', 'coach')->where(['id' => $teamHome])->first();
	143	+ $awayOrm = \App\Lib\DsManager\Models\Orm\Team::with('roster', 'coach')->where(['id' => $teamAway])->first();
	144	+ $home = \App\Lib\DsManager\Models\Team::fromArray($homeOrm->toArray());
	145	+ $away = \App\Lib\DsManager\Models\Team::fromArray($awayOrm->toArray());
	146	+
	147	+ $match = new \App\Lib\DsManager\Models\Match($home, $away);
	148	+ $result = $match->simulate()->toArray();
	149	+ $this->assertNotEmpty($result);
	150	+ $this->assertGreaterThanOrEqual(0, $result['goal_away']);
	151	+ $this->assertGreaterThanOrEqual(0, $result['goal_home']);
	152	+ if ($result['goal_home'] > 0) {
	153	+ $this->assertNotEmpty($result['info']['scorers']['home']);
	154	+ foreach ($result['info']['scorers']['home'] as $scorerHome) {
	155	+ $this->assertEquals($scorerHome->team_id, $teamHome);
	156	+ }
	157	+ } else {
	158	+ $this->assertEmpty($result['info']['scorers']['home']);
	159	+ }
	160	+ if ($result['goal_away'] > 0) {
	161	+ $this->assertNotEmpty($result['info']['scorers']['away']);
	162	+ foreach ($result['info']['scorers']['away'] as $scorerAway) {
	163	+ $this->assertEquals($scorerAway->team_id, $teamAway);
	164	+ }
	165	+ } else {
	166	+ $this->assertEmpty($result['info']['scorers']['away']);
	167	+ }
	168	+ if ($result['goal_home'] == $result['goal_away']) {
	169	+ $this->assertTrue($result['info']['is_draw']);
	170	+ } else {
	171	+ $this->assertFalse($result['info']['is_draw']);
	172	+ }
	173	+ }
	174	+
	175	+ /**
	176	+ * @group Matches
	177	+ */
	178	+ public function testGetRandomMatchesOneTeam()
	179	+ {
	180	+ $rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
	181	+ $myTeam = $rndF->getTeam();
	182	+ $myTeam->id = 1000;
	183	+ $win = 0;
	184	+ $lost = 0;
	185	+ $draw = 0;
	186	+
	187	+ for ($i = 1; $i <= 2; $i++) {
	188	+
	189	+ $randomLocale = \App\Lib\Helpers\Config::get('generic.localesSmall');
	190	+ shuffle($randomLocale);
	191	+ $randomLocale = $randomLocale[0];
	192	+ $rndF = new \App\Lib\DsManager\Helpers\RandomFiller($randomLocale);
	193	+ $opponent = $rndF->getTeam();
	194	+ $opponent->id = 6000;
	195	+ $result = (new \App\Lib\DsManager\Models\Match($opponent, $myTeam))->simulate()->toArray();
	196	+ $this->assertNotEmpty($result);
	197	+ $result = $result['info'];
	198	+ if (!$result['is_draw']) {
	199	+ if ($result['winner_id'] == $myTeam->id) {
	200	+ $win++;
	201	+ } else {
	202	+ $lost++;
	203	+ }
	204	+ } else {
	205	+ $draw++;
	206	+ }
	207	+ }
	208	+ $this->assertGreaterThanOrEqual(0, $win);
	209	+ $this->assertGreaterThanOrEqual(0, $lost);
	210	+ $this->assertGreaterThanOrEqual(0, $draw);
	211	+ }
	212	+
	213	+ /**
	214	+ * @group Module
	215	+ */
	216	+ public function testModule()
	217	+ {
	218	+ $rndF = new \App\Lib\DsManager\Helpers\RandomFiller("it_IT");
	219	+ $team = $rndF->getTeam();
	220	+
	221	+ $modules = \App\Lib\Helpers\Config::get("modules.modules");
	222	+ $modules = array_keys($modules);
	223	+ foreach ($modules as $mod) {
	224	+ $module = new \App\Lib\DsManager\Models\Module($mod);
	225	+ $this->assertNotEmpty($module);
	226	+ $this->assertNotNull($module->isDefensive());
	227	+ $this->assertNotNull($module->isBalanced());
	228	+ $this->assertNotNull($module->isOffensive());
	229	+ $this->assertTrue(is_array($module->getRoleNeeded()));
	230	+ }
	231	+ $this->assertGreaterThan(0, $team->playersPerRoleArray());
	232	+ }
233	233
234	234	}

		@@ -13,118 +13,118 @@
		block discarded – undo
13	13	*/
14	14	class MatchResult extends DsManagerModel
15	15	{
16		- /**
17		- * @var
18		- */
19		- private $goalHome;
20		- /**
21		- * @var
22		- */
23		- private $goalAway;
24		- /**
25		- * @var Team
26		- */
27		- private $homeTeam;
28		- /**
29		- * @var Team
30		- */
31		- private $awayTeam;
	16	+ /**
	17	+ * @var
	18	+ */
	19	+ private $goalHome;
	20	+ /**
	21	+ * @var
	22	+ */
	23	+ private $goalAway;
	24	+ /**
	25	+ * @var Team
	26	+ */
	27	+ private $homeTeam;
	28	+ /**
	29	+ * @var Team
	30	+ */
	31	+ private $awayTeam;
32	32
33		- /**
34		- * MatchResult constructor.
35		- * @param $goalHome
36		- * @param $goalAway
37		- * @param Team $home
38		- * @param Team $away
39		- */
40		- public function __construct($goalHome, $goalAway, Team $home, Team $away)
41		- {
42		- $this->goalHome = $goalHome;
43		- $this->goalAway = $goalAway;
44		- $this->homeTeam = $home;
45		- $this->awayTeam = $away;
46		- }
	33	+ /**
	34	+ * MatchResult constructor.
	35	+ * @param $goalHome
	36	+ * @param $goalAway
	37	+ * @param Team $home
	38	+ * @param Team $away
	39	+ */
	40	+ public function __construct($goalHome, $goalAway, Team $home, Team $away)
	41	+ {
	42	+ $this->goalHome = $goalHome;
	43	+ $this->goalAway = $goalAway;
	44	+ $this->homeTeam = $home;
	45	+ $this->awayTeam = $away;
	46	+ }
47	47
48		- /**
49		- * @return array
50		- */
51		- public function getWinnerLoser()
52		- {
53		- $isDraw = false;
54		- $winner = $this->awayTeam;
55		- $loser = $this->homeTeam;
56		- if ($this->goalAway == $this->goalHome) {
57		- $isDraw = true;
58		- } else if ($this->goalHome < $this->goalAway) {
59		- $winner = $this->awayTeam;
60		- $loser = $this->homeTeam;
61		- }
62		- return [
63		- 'is_draw' => $isDraw,
64		- 'winner_id' => $winner->id,
65		- 'loser_id' => $loser->id
66		- ];
67		- }
	48	+ /**
	49	+ * @return array
	50	+ */
	51	+ public function getWinnerLoser()
	52	+ {
	53	+ $isDraw = false;
	54	+ $winner = $this->awayTeam;
	55	+ $loser = $this->homeTeam;
	56	+ if ($this->goalAway == $this->goalHome) {
	57	+ $isDraw = true;
	58	+ } else if ($this->goalHome < $this->goalAway) {
	59	+ $winner = $this->awayTeam;
	60	+ $loser = $this->homeTeam;
	61	+ }
	62	+ return [
	63	+ 'is_draw' => $isDraw,
	64	+ 'winner_id' => $winner->id,
	65	+ 'loser_id' => $loser->id
	66	+ ];
	67	+ }
68	68
69		- /**
70		- * @return array
71		- */
72		- public function toArray()
73		- {
74		- $result = [];
75		- $result['home_team_id'] = $this->homeTeam->id;
76		- $result['away_team_id'] = $this->awayTeam->id;
77		- $result['goal_home'] = $this->goalHome;
78		- $result['goal_away'] = $this->goalAway;
79		- $result['info'] = $this->getWinnerLoser();
80		- $result['info']['scorers'] = $this->getScorers();
81		- $result['simulated'] = true;
82		- return $result;
83		- }
84		- /**
85		- * @return array
86		- */
87		- private function getScorers()
88		- {
89		- $scorers = [
90		- 'home' => [],
91		- 'away' => []
92		- ];
93		- for ($i = 0; $i < $this->goalHome; $i++) {
94		- $scorers['home'][] = $this->pickAScorer($this->homeTeam);
95		- }
96		- for ($i = 0; $i < $this->goalAway; $i++) {
97		- $scorers['away'][] = $this->pickAScorer($this->awayTeam);
98		- }
99		- return $scorers;
100		- }
	69	+ /**
	70	+ * @return array
	71	+ */
	72	+ public function toArray()
	73	+ {
	74	+ $result = [];
	75	+ $result['home_team_id'] = $this->homeTeam->id;
	76	+ $result['away_team_id'] = $this->awayTeam->id;
	77	+ $result['goal_home'] = $this->goalHome;
	78	+ $result['goal_away'] = $this->goalAway;
	79	+ $result['info'] = $this->getWinnerLoser();
	80	+ $result['info']['scorers'] = $this->getScorers();
	81	+ $result['simulated'] = true;
	82	+ return $result;
	83	+ }
	84	+ /**
	85	+ * @return array
	86	+ */
	87	+ private function getScorers()
	88	+ {
	89	+ $scorers = [
	90	+ 'home' => [],
	91	+ 'away' => []
	92	+ ];
	93	+ for ($i = 0; $i < $this->goalHome; $i++) {
	94	+ $scorers['home'][] = $this->pickAScorer($this->homeTeam);
	95	+ }
	96	+ for ($i = 0; $i < $this->goalAway; $i++) {
	97	+ $scorers['away'][] = $this->pickAScorer($this->awayTeam);
	98	+ }
	99	+ return $scorers;
	100	+ }
101	101
102		- /**
103		- * @param Team $team
104		- * @return Player
105		- */
106		- private function pickAScorer(Team $team)
107		- {
108		- $player = null;
109		- if (Randomizer::boolOnPercentage(70)) {
110		- $roles = Config::get('modules.roles');
111		- $forwards = array_splice($roles, count($roles) / 2);
112		- $pos = array_rand($forwards);
113		- unset($forwards[$pos]);
114		- $player = $team->getBestPlayerForRole($pos);
115		- while (empty($player)) {
116		- if (!empty($forwards)) {
117		- $pos = array_rand($forwards);
118		- unset($forwards[$pos]);
119		- $player = $team->getBestPlayerForRole($pos);
120		- } else {
121		- $player = $team->roster[array_rand($team->roster)];
122		- }
123		- }
124		- } else {
125		- $player = $team->roster[array_rand($team->roster)];
126		- }
127		- return $player;
128		- }
	102	+ /**
	103	+ * @param Team $team
	104	+ * @return Player
	105	+ */
	106	+ private function pickAScorer(Team $team)
	107	+ {
	108	+ $player = null;
	109	+ if (Randomizer::boolOnPercentage(70)) {
	110	+ $roles = Config::get('modules.roles');
	111	+ $forwards = array_splice($roles, count($roles) / 2);
	112	+ $pos = array_rand($forwards);
	113	+ unset($forwards[$pos]);
	114	+ $player = $team->getBestPlayerForRole($pos);
	115	+ while (empty($player)) {
	116	+ if (!empty($forwards)) {
	117	+ $pos = array_rand($forwards);
	118	+ unset($forwards[$pos]);
	119	+ $player = $team->getBestPlayerForRole($pos);
	120	+ } else {
	121	+ $player = $team->roster[array_rand($team->roster)];
	122	+ }
	123	+ }
	124	+ } else {
	125	+ $player = $team->roster[array_rand($team->roster)];
	126	+ }
	127	+ return $player;
	128	+ }
129	129
130	130	}
131	131	\ No newline at end of file

		@@ -10,22 +10,22 @@
		block discarded – undo
10	10	*/
11	11	class Randomizer
12	12	{
13		- /**
14		- * @param $percentage
15		- * @return bool
16		- */
17		- public static function boolOnPercentage($percentage)
18		- {
19		- return (rand(0, 100) < $percentage);
20		- }
	13	+ /**
	14	+ * @param $percentage
	15	+ * @return bool
	16	+ */
	17	+ public static function boolOnPercentage($percentage)
	18	+ {
	19	+ return (rand(0, 100) < $percentage);
	20	+ }
21	21
22		- /**
23		- * @param $skill
24		- * @return int
25		- */
26		- public static function voteFromSkill($skill)
27		- {
28		- return rand((2 * ($skill - 100) / 25), 10);
29		- }
	22	+ /**
	23	+ * @param $skill
	24	+ * @return int
	25	+ */
	26	+ public static function voteFromSkill($skill)
	27	+ {
	28	+ return rand((2 * ($skill - 100) / 25), 10);
	29	+ }
30	30
31	31	}
32	32	\ No newline at end of file

		@@ -9,118 +9,118 @@
		block discarded – undo
9	9	*/
10	10	class MatchResult extends Match
11	11	{
12		- /**
13		- * @var array
14		- */
15		- protected $fillable = [
16		- 'goal_home',
17		- 'goal_away',
18		- 'info',
19		- 'simulated'
20		- ];
	12	+ /**
	13	+ * @var array
	14	+ */
	15	+ protected $fillable = [
	16	+ 'goal_home',
	17	+ 'goal_away',
	18	+ 'info',
	19	+ 'simulated'
	20	+ ];
21	21
22		- protected $hidden = [
23		- 'home_team_id',
24		- 'away_team_id',
25		- 'created_at',
26		- 'updated_at'
27		- ];
	22	+ protected $hidden = [
	23	+ 'home_team_id',
	24	+ 'away_team_id',
	25	+ 'created_at',
	26	+ 'updated_at'
	27	+ ];
28	28
29		- /**
30		- * @var array
31		- */
32		- protected $casts = [
33		- 'info' => 'json',
34		- 'simulated' => 'boolean'
35		- ];
	29	+ /**
	30	+ * @var array
	31	+ */
	32	+ protected $casts = [
	33	+ 'info' => 'json',
	34	+ 'simulated' => 'boolean'
	35	+ ];
36	36
37		- public static function resolveAttributes(array $attributes, $matchId)
38		- {
39		- self::generateAppearances(
40		- [
41		- $attributes['home_team_id'],
42		- $attributes['away_team_id']
43		- ],
44		- $matchId
45		- );
46		- if (array_key_exists('info', $attributes)) {
47		- if (array_key_exists('scorers', $attributes['info'])) {
48		- foreach ($attributes['info']['scorers']['home'] as $scorerHome) {
49		- self::addScorer($matchId, $attributes['home_team_id'], $scorerHome->id);
50		- }
51		- foreach ($attributes['info']['scorers']['away'] as $scorerAway) {
52		- self::addScorer($matchId, $attributes['away_team_id'], $scorerAway->id);
53		- }
54		- unset($attributes['info']['scorers']);
55		- }
56		- $attributes['info'] = json_encode($attributes['info']);
57		- }
58		- return $attributes;
59		- }
	37	+ public static function resolveAttributes(array $attributes, $matchId)
	38	+ {
	39	+ self::generateAppearances(
	40	+ [
	41	+ $attributes['home_team_id'],
	42	+ $attributes['away_team_id']
	43	+ ],
	44	+ $matchId
	45	+ );
	46	+ if (array_key_exists('info', $attributes)) {
	47	+ if (array_key_exists('scorers', $attributes['info'])) {
	48	+ foreach ($attributes['info']['scorers']['home'] as $scorerHome) {
	49	+ self::addScorer($matchId, $attributes['home_team_id'], $scorerHome->id);
	50	+ }
	51	+ foreach ($attributes['info']['scorers']['away'] as $scorerAway) {
	52	+ self::addScorer($matchId, $attributes['away_team_id'], $scorerAway->id);
	53	+ }
	54	+ unset($attributes['info']['scorers']);
	55	+ }
	56	+ $attributes['info'] = json_encode($attributes['info']);
	57	+ }
	58	+ return $attributes;
	59	+ }
60	60
61		- private static function addScorer($matchId, $teamId, $playerId)
62		- {
63		- $scorer = MatchPlayer::where(
64		- [
65		- 'match_id' => $matchId,
66		- 'team_id' => $teamId,
67		- 'player_id' => $playerId
68		- ]
69		- )->first();
70		- if (!empty($scorer)) {
71		- $scorer->goals = $scorer->goals + 1;
72		- $scorer->vote = $scorer->vote <= 9 ? $scorer->vote + rand(0, 1) : $scorer->vote;
73		- $scorer->save();
74		- } else {
75		- MatchPlayer::create(
76		- [
77		- 'match_id' => $matchId,
78		- 'team_id' => $teamId,
79		- 'player_id' => $playerId,
80		- 'goals' => 1
81		- ]
82		- );
83		- }
84		- }
	61	+ private static function addScorer($matchId, $teamId, $playerId)
	62	+ {
	63	+ $scorer = MatchPlayer::where(
	64	+ [
	65	+ 'match_id' => $matchId,
	66	+ 'team_id' => $teamId,
	67	+ 'player_id' => $playerId
	68	+ ]
	69	+ )->first();
	70	+ if (!empty($scorer)) {
	71	+ $scorer->goals = $scorer->goals + 1;
	72	+ $scorer->vote = $scorer->vote <= 9 ? $scorer->vote + rand(0, 1) : $scorer->vote;
	73	+ $scorer->save();
	74	+ } else {
	75	+ MatchPlayer::create(
	76	+ [
	77	+ 'match_id' => $matchId,
	78	+ 'team_id' => $teamId,
	79	+ 'player_id' => $playerId,
	80	+ 'goals' => 1
	81	+ ]
	82	+ );
	83	+ }
	84	+ }
85	85
86		- private static function generateAppearances(
87		- $teamIds,
88		- $matchId
89		- )
90		- {
91		- foreach ($teamIds as $id) {
92		- $players = Player::where('team_id', $id)->get()->random(11);
93		- foreach ($players as $player) {
94		- MatchPlayer::create(
95		- [
96		- 'match_id' => $matchId,
97		- 'team_id' => $id,
98		- 'player_id' => $player->id,
99		- 'vote' => Randomizer::voteFromSkill($player->skillAvg)
100		- ]
101		- );
102		- }
103		- }
104		- }
	86	+ private static function generateAppearances(
	87	+ $teamIds,
	88	+ $matchId
	89	+ )
	90	+ {
	91	+ foreach ($teamIds as $id) {
	92	+ $players = Player::where('team_id', $id)->get()->random(11);
	93	+ foreach ($players as $player) {
	94	+ MatchPlayer::create(
	95	+ [
	96	+ 'match_id' => $matchId,
	97	+ 'team_id' => $id,
	98	+ 'player_id' => $player->id,
	99	+ 'vote' => Randomizer::voteFromSkill($player->skillAvg)
	100	+ ]
	101	+ );
	102	+ }
	103	+ }
	104	+ }
105	105
106		- public function scorers()
107		- {
108		- return $this->belongsToMany(
109		- Player::class,
110		- 'match_players',
111		- 'match_id'
112		- )->withPivot(
113		- 'team_id',
114		- 'goals'
115		- )->where(
116		- 'goals', '>', 0
117		- );
118		- }
	106	+ public function scorers()
	107	+ {
	108	+ return $this->belongsToMany(
	109	+ Player::class,
	110	+ 'match_players',
	111	+ 'match_id'
	112	+ )->withPivot(
	113	+ 'team_id',
	114	+ 'goals'
	115	+ )->where(
	116	+ 'goals', '>', 0
	117	+ );
	118	+ }
119	119
120		- public function scopeComplete($query)
121		- {
122		- return parent::scopeComplete($query)->with('scorers');
123		- }
	120	+ public function scopeComplete($query)
	121	+ {
	122	+ return parent::scopeComplete($query)->with('scorers');
	123	+ }
124	124
125	125
126	126	}
127	127	\ No newline at end of file

		@@ -9,70 +9,70 @@
		block discarded – undo
9	9	class Player extends DsManagerOrm
10	10	{
11	11
12		- /**
13		- * @var string
14		- */
15		- protected $table = 'players';
	12	+ /**
	13	+ * @var string
	14	+ */
	15	+ protected $table = 'players';
16	16
17		- /**
18		- * @var array
19		- */
20		- protected $fillable = [
21		- 'name',
22		- 'surname',
23		- 'age',
24		- 'nationality',
25		- 'skillAvg',
26		- 'wageReq',
27		- 'val',
28		- 'role',
29		- 'team_id'
30		- ];
	17	+ /**
	18	+ * @var array
	19	+ */
	20	+ protected $fillable = [
	21	+ 'name',
	22	+ 'surname',
	23	+ 'age',
	24	+ 'nationality',
	25	+ 'skillAvg',
	26	+ 'wageReq',
	27	+ 'val',
	28	+ 'role',
	29	+ 'team_id'
	30	+ ];
31	31
32		- /**
33		- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
34		- */
35		- public function team()
36		- {
37		- return $this->belongsTo(Team::class);
38		- }
	32	+ /**
	33	+ * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
	34	+ */
	35	+ public function team()
	36	+ {
	37	+ return $this->belongsTo(Team::class);
	38	+ }
39	39
40		- public function lastMatches()
41		- {
42		- return $this->hasMany(MatchPlayer::class)
43		- ->orderBy('updated_at', 'DESC')
44		- ->limit(5);
45		- }
	40	+ public function lastMatches()
	41	+ {
	42	+ return $this->hasMany(MatchPlayer::class)
	43	+ ->orderBy('updated_at', 'DESC')
	44	+ ->limit(5);
	45	+ }
46	46
47		- public function goals()
48		- {
49		- return $this->hasOne(MatchPlayer::class)
50		- ->selectRaw('player_id, sum(goals) as count')
51		- ->groupBy('player_id');
52		- }
	47	+ public function goals()
	48	+ {
	49	+ return $this->hasOne(MatchPlayer::class)
	50	+ ->selectRaw('player_id, sum(goals) as count')
	51	+ ->groupBy('player_id');
	52	+ }
53	53
54		- public function appearances()
55		- {
56		- return $this->hasOne(MatchPlayer::class)
57		- ->selectRaw('player_id, count(match_id) as count')
58		- ->groupBy('player_id');
59		- }
	54	+ public function appearances()
	55	+ {
	56	+ return $this->hasOne(MatchPlayer::class)
	57	+ ->selectRaw('player_id, count(match_id) as count')
	58	+ ->groupBy('player_id');
	59	+ }
60	60
61		- public function avg()
62		- {
63		- return $this->hasOne(MatchPlayer::class)
64		- ->selectRaw('player_id, round(avg(vote),2) as avg')
65		- ->groupBy('player_id');
66		- }
	61	+ public function avg()
	62	+ {
	63	+ return $this->hasOne(MatchPlayer::class)
	64	+ ->selectRaw('player_id, round(avg(vote),2) as avg')
	65	+ ->groupBy('player_id');
	66	+ }
67	67
68		- public function scopeStatistics($query)
69		- {
70		- return $query->with(
71		- 'goals',
72		- 'appearances',
73		- 'avg',
74		- 'lastMatches',
75		- 'team'
76		- );
77		- }
	68	+ public function scopeStatistics($query)
	69	+ {
	70	+ return $query->with(
	71	+ 'goals',
	72	+ 'appearances',
	73	+ 'avg',
	74	+ 'lastMatches',
	75	+ 'team'
	76	+ );
	77	+ }
78	78	}
79	79	\ No newline at end of file

		@@ -3,20 +3,20 @@
		block discarded – undo
3	3
4	4	class ATeamsSeeder
5	5	{
6		- function run()
7		- {
8		- $teamNumber = 16;
9		- $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller();
10		- for ($i = 1; $i <= $teamNumber; $i++) {
11		- $team = $rndFiller->getTeam($rndFiller->getLocale());
12		- $teamArray = $team->toArray();
13		- $teamO = \App\Lib\DsManager\Models\Orm\Team::create($teamArray);
14		- foreach ($teamArray['roster'] as $player) {
15		- $player['team_id'] = $teamO->id;
16		- \App\Lib\DsManager\Models\Orm\Player::create($player);
17		- }
18		- $teamArray['coach']['team_id'] = $teamO->id;
19		- \App\Lib\DsManager\Models\Orm\Coach::create($teamArray['coach']);
20		- }
21		- }
	6	+ function run()
	7	+ {
	8	+ $teamNumber = 16;
	9	+ $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller();
	10	+ for ($i = 1; $i <= $teamNumber; $i++) {
	11	+ $team = $rndFiller->getTeam($rndFiller->getLocale());
	12	+ $teamArray = $team->toArray();
	13	+ $teamO = \App\Lib\DsManager\Models\Orm\Team::create($teamArray);
	14	+ foreach ($teamArray['roster'] as $player) {
	15	+ $player['team_id'] = $teamO->id;
	16	+ \App\Lib\DsManager\Models\Orm\Player::create($player);
	17	+ }
	18	+ $teamArray['coach']['team_id'] = $teamO->id;
	19	+ \App\Lib\DsManager\Models\Orm\Coach::create($teamArray['coach']);
	20	+ }
	21	+ }
22	22	}
23	23	\ No newline at end of file

		@@ -9,46 +9,46 @@
		block discarded – undo
9	9
10	10	class A001LeaguesSeeder
11	11	{
12		- function run()
13		- {
14		- $leagues = [
15		- 'friendly' => 16,
16		- 'europa league' => 8
17		- ];
18		- $teams = Team::all()->toArray();
19		- foreach ($leagues as $league => $teamsNum) {
	12	+ function run()
	13	+ {
	14	+ $leagues = [
	15	+ 'friendly' => 16,
	16	+ 'europa league' => 8
	17	+ ];
	18	+ $teams = Team::all()->toArray();
	19	+ foreach ($leagues as $league => $teamsNum) {
20	20
21		- $teamCopy = $teams;
22		- $league = League::create(
23		- [
24		- 'name' => $league,
25		- 'teams' => $teamsNum
26		- ]
27		- );
	21	+ $teamCopy = $teams;
	22	+ $league = League::create(
	23	+ [
	24	+ 'name' => $league,
	25	+ 'teams' => $teamsNum
	26	+ ]
	27	+ );
28	28
29		- //Create Rounds
30		- shuffle($teamCopy);
31		- $teamCopy = array_splice($teamCopy, 0, $teamsNum);
32		- $rounds = LeagueFixtureGenerator::generate($teamCopy);
33		- foreach ($rounds as $i => $round) {
	29	+ //Create Rounds
	30	+ shuffle($teamCopy);
	31	+ $teamCopy = array_splice($teamCopy, 0, $teamsNum);
	32	+ $rounds = LeagueFixtureGenerator::generate($teamCopy);
	33	+ foreach ($rounds as $i => $round) {
34	34
35		- $leagueRound = LeagueRound::create(
36		- [
37		- 'league_id' => $league->id,
38		- 'day' => $i + 1
39		- ]
40		- );
	35	+ $leagueRound = LeagueRound::create(
	36	+ [
	37	+ 'league_id' => $league->id,
	38	+ 'day' => $i + 1
	39	+ ]
	40	+ );
41	41
42		- foreach ($round as $match) {
43		- $newMatch = Match::create(
44		- [
45		- 'home_team_id' => $match['home_team_id'],
46		- 'away_team_id' => $match['away_team_id'],
47		- 'league_round_id' => $leagueRound->id
48		- ]
49		- );
50		- }
51		- }
52		- }
53		- }
	42	+ foreach ($round as $match) {
	43	+ $newMatch = Match::create(
	44	+ [
	45	+ 'home_team_id' => $match['home_team_id'],
	46	+ 'away_team_id' => $match['away_team_id'],
	47	+ 'league_round_id' => $leagueRound->id
	48	+ ]
	49	+ );
	50	+ }
	51	+ }
	52	+ }
	53	+ }
54	54	}
55	55	\ No newline at end of file

		@@ -5,25 +5,25 @@
		block discarded – undo
5	5
6	6	class CreateMatchTable
7	7	{
8		- /**
9		- * Run the migrations.
10		- *
11		- * @return void
12		- */
13		- public function run()
14		- {
15		- Capsule::schema()->dropIfExists('matches');
16		- Capsule::schema()->create('matches', function (Blueprint $table) {
17		- $table->increments('id');
18		- $table->integer('league_round_id')->nullable();
19		- $table->integer('home_team_id');
20		- $table->integer('goal_home')->default(0);
21		- $table->integer('away_team_id');
22		- $table->integer('goal_away')->default(0);
23		- $table->boolean('simulated')->default(false);
24		- $table->text('info')->nullable();
25		- $table->date('match_date')->default(\Carbon\Carbon::now());
26		- $table->timestamps();
27		- });
28		- }
	8	+ /**
	9	+ * Run the migrations.
	10	+ *
	11	+ * @return void
	12	+ */
	13	+ public function run()
	14	+ {
	15	+ Capsule::schema()->dropIfExists('matches');
	16	+ Capsule::schema()->create('matches', function (Blueprint $table) {
	17	+ $table->increments('id');
	18	+ $table->integer('league_round_id')->nullable();
	19	+ $table->integer('home_team_id');
	20	+ $table->integer('goal_home')->default(0);
	21	+ $table->integer('away_team_id');
	22	+ $table->integer('goal_away')->default(0);
	23	+ $table->boolean('simulated')->default(false);
	24	+ $table->text('info')->nullable();
	25	+ $table->date('match_date')->default(\Carbon\Carbon::now());
	26	+ $table->timestamps();
	27	+ });
	28	+ }
29	29	}

vikkio88 / dsManager-php

Push — master ( c27acc...5e9888 )

Status

Category

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

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

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

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

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

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

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

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

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