Inspection of "improved layout and method to get player info" - vikkio88/dsManager-php - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 36889c...d49014 )

by Vincenzo

created 2016-09-02 23:25 UTC

Status

Unused Use Statements +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -2,7 +2,7 @@
 block discarded – undo
 
 namespace App\Lib\DsManager\Models;
 
-use App\Lib\DsManager\Helpers\Randomizer;
+use App\Lib\DsManager\Helpers\Randomizer;
 use App\Lib\Helpers\Config;
 
 

Please login to merge, or discard this patch.

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

@@ -11,164 +11,164 @@
 block discarded – undo
  */
 class Match extends DsManagerModel
 {
-    /**
-     * @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);
-    }
-
-    /**
-     * @param Team $team
-     * @return int
-     */
-    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);
-        }
-    }
-
-    /**
-     * @param array $ormMatchArray
-     * @return Match
-     */
-    public static function fromArray($ormMatchArray = [])
-    {
-        $homeTeam = Team::fromArray($ormMatchArray['home_team']);
-        $awayTeam = Team::fromArray($ormMatchArray['away_team']);
-        return new Match($homeTeam, $awayTeam);
-    }
-
-    /**
-     * @return mixed
-     */
-    function toArray()
-    {
-        $result = [];
-        $result['home_team_id'] = $this->homeTeam->id;
-        $result['away_team_id'] = $this->awayTeam->id;
-        return $result;
-    }
+	/**
+	 * @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);
+	}
+
+	/**
+	 * @param Team $team
+	 * @return int
+	 */
+	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);
+		}
+	}
+
+	/**
+	 * @param array $ormMatchArray
+	 * @return Match
+	 */
+	public static function fromArray($ormMatchArray = [])
+	{
+		$homeTeam = Team::fromArray($ormMatchArray['home_team']);
+		$awayTeam = Team::fromArray($ormMatchArray['away_team']);
+		return new Match($homeTeam, $awayTeam);
+	}
+
+	/**
+	 * @return mixed
+	 */
+	function toArray()
+	{
+		$result = [];
+		$result['home_team_id'] = $this->homeTeam->id;
+		$result['away_team_id'] = $this->awayTeam->id;
+		return $result;
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

api/database/seeds/BMatchesSeeder.php 1 patch

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

@@ -3,20 +3,20 @@
 block discarded – undo
 
 class BMatchesSeeder
 {
-    function run()
-    {
-        $teams = \App\Lib\DsManager\Models\Orm\Team::all()->toArray();
-        $halfTheTeams = count($teams) / 2;
-        $chunks = array_chunk($teams, $halfTheTeams);
-        $teamsSlice1 = $chunks[0];
-        $teamsSlice2 = $chunks[1];
-        for ($i = 0; $i < $halfTheTeams; $i++) {
-            \App\Lib\DsManager\Models\Orm\Match::create(
-                [
-                    'home_team_id' => $teamsSlice1[$i]['id'],
-                    'away_team_id' => $teamsSlice2[$i]['id']
-                ]
-            );
-        }
-    }
+	function run()
+	{
+		$teams = \App\Lib\DsManager\Models\Orm\Team::all()->toArray();
+		$halfTheTeams = count($teams) / 2;
+		$chunks = array_chunk($teams, $halfTheTeams);
+		$teamsSlice1 = $chunks[0];
+		$teamsSlice2 = $chunks[1];
+		for ($i = 0; $i < $halfTheTeams; $i++) {
+			\App\Lib\DsManager\Models\Orm\Match::create(
+				[
+					'home_team_id' => $teamsSlice1[$i]['id'],
+					'away_team_id' => $teamsSlice2[$i]['id']
+				]
+			);
+		}
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

api/database/migrations/CreateMatchTable.php 2 patches

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

@@ -5,24 +5,24 @@
 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('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('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.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -13,7 +13,7 @@
 block discarded – undo
     public function run()
     {
         Capsule::schema()->dropIfExists('matches');
-        Capsule::schema()->create('matches', function (Blueprint $table) {
+        Capsule::schema()->create('matches', function(Blueprint $table) {
             $table->increments('id');
             $table->integer('home_team_id');
             $table->integer('goal_home')->default(0);

Please login to merge, or discard this patch.

api/Lib/DsManager/Models/Orm/Match.php 2 patches

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

@@ -9,62 +9,62 @@
 block discarded – undo
 class Match extends DsManagerOrm
 {
 
-    /**
-     * @var string
-     */
-    protected $table = 'matches';
+	/**
+	 * @var string
+	 */
+	protected $table = 'matches';
 
-    /**
-     * @var array
-     */
-    protected $fillable = [
-        'home_team_id',
-        'away_team_id'
-    ];
+	/**
+	 * @var array
+	 */
+	protected $fillable = [
+		'home_team_id',
+		'away_team_id'
+	];
 
-    /**
-     * @var array
-     */
-    protected $hidden = [
-        'home_team_id',
-        'away_team_id',
-        'created_at',
-        'updated_at',
-        'info'
-    ];
+	/**
+	 * @var array
+	 */
+	protected $hidden = [
+		'home_team_id',
+		'away_team_id',
+		'created_at',
+		'updated_at',
+		'info'
+	];
 
-    /**
-     * @var array
-     */
-    protected $casts = [
-        'simulated' => 'boolean'
-    ];
+	/**
+	 * @var array
+	 */
+	protected $casts = [
+		'simulated' => 'boolean'
+	];
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function homeTeam()
-    {
-        return $this->belongsTo(Team::class, 'home_team_id');
-    }
+	/**
+	 * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+	 */
+	public function homeTeam()
+	{
+		return $this->belongsTo(Team::class, 'home_team_id');
+	}
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function awayTeam()
-    {
-        return $this->belongsTo(Team::class, 'away_team_id');
-    }
+	/**
+	 * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+	 */
+	public function awayTeam()
+	{
+		return $this->belongsTo(Team::class, 'away_team_id');
+	}
 
-    public function scopeComplete($query){
-        return $query->with(
-            'homeTeam',
-            'homeTeam.roster',
-            'homeTeam.coach',
-            'awayTeam',
-            'awayTeam.roster',
-            'awayTeam.coach'
-        );
-    }
+	public function scopeComplete($query){
+		return $query->with(
+			'homeTeam',
+			'homeTeam.roster',
+			'homeTeam.coach',
+			'awayTeam',
+			'awayTeam.roster',
+			'awayTeam.coach'
+		);
+	}
 
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -56,7 +56,7 @@
 block discarded – undo
         return $this->belongsTo(Team::class, 'away_team_id');
     }
 
-    public function scopeComplete($query){
+    public function scopeComplete($query) {
         return $query->with(
             'homeTeam',
             'homeTeam.roster',

Please login to merge, or discard this patch.

api/config/generic.php 1 patch

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

		@@ -74,10 +74,10 @@
		block discarded – undo
74	74	'ro_MD',
75	75	'tr_TR'
76	76	],
77		- 'rosters' => [
78		- 'min' => 11,
79		- 'max' => 18
80		- ],
	77	+ 'rosters' => [
	78	+ 'min' => 11,
	79	+ 'max' => 18
	80	+ ],
81	81	];
82	82
83	83

Please login to merge, or discard this patch.

api/tests/OrmModelsTest.php 1 patch

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

@@ -8,101 +8,101 @@
 block discarded – undo
 {
 
 
-    /**
-     * @group OrmModels
-     * @group PlayerOrm
-     */
-    public function testPlayerOrmGetSet()
-    {
-        $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller();
-        $playerM = $rndFiller->getPlayer();
-        $arrayPl = $playerM->toArray();
-        $playerO = \App\Lib\DsManager\Models\Orm\Player::create($arrayPl);
-        $this->assertNotEmpty($playerO);
+	/**
+	 * @group OrmModels
+	 * @group PlayerOrm
+	 */
+	public function testPlayerOrmGetSet()
+	{
+		$rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller();
+		$playerM = $rndFiller->getPlayer();
+		$arrayPl = $playerM->toArray();
+		$playerO = \App\Lib\DsManager\Models\Orm\Player::create($arrayPl);
+		$this->assertNotEmpty($playerO);
 
-        $newPlayer = \App\Lib\DsManager\Models\Player::fromArray($playerO->toArray());
-        $this->assertNotEmpty($newPlayer);
-    }
+		$newPlayer = \App\Lib\DsManager\Models\Player::fromArray($playerO->toArray());
+		$this->assertNotEmpty($newPlayer);
+	}
 
-    /**
-     * @group OrmModels
-     * @group CoachOrm
-     */
-    public function testCoachOrmGetSet()
-    {
-        $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller();
-        $coach = $rndFiller->getCoach();
-        $arrayPl = $coach->toArray();
-        $coachO = \App\Lib\DsManager\Models\Orm\Coach::create($arrayPl);
-        $this->assertNotEmpty($coachO);
+	/**
+	 * @group OrmModels
+	 * @group CoachOrm
+	 */
+	public function testCoachOrmGetSet()
+	{
+		$rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller();
+		$coach = $rndFiller->getCoach();
+		$arrayPl = $coach->toArray();
+		$coachO = \App\Lib\DsManager\Models\Orm\Coach::create($arrayPl);
+		$this->assertNotEmpty($coachO);
 
-        $newCoach = \App\Lib\DsManager\Models\Coach::fromArray($coachO->toArray());
-        $this->assertNotEmpty($newCoach);
-    }
+		$newCoach = \App\Lib\DsManager\Models\Coach::fromArray($coachO->toArray());
+		$this->assertNotEmpty($newCoach);
+	}
 
-    /**
-     * @group OrmModels
-     * @group TeamOrm
-     */
-    public function testTeamOrm()
-    {
-        $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller();
-        $team = $rndFiller->getTeam($rndFiller->getLocale());
-        $teamArray = $team->toArray();
-        $this->assertNotEmpty($team);
-        $teamO = \App\Lib\DsManager\Models\Orm\Team::create($teamArray);
-        $this->assertNotEmpty($teamArray);
-        $this->assertNotEmpty($teamArray['roster']);
-        foreach ($teamArray['roster'] as $player) {
-            $player['team_id'] = $teamO->id;
-            $playerO = \App\Lib\DsManager\Models\Orm\Player::create($player);
-            $this->assertNotEmpty($playerO);
-        }
-        $teamArray['coach']['team_id'] = $teamO->id;
-        $coachO = \App\Lib\DsManager\Models\Orm\Coach::create($teamArray['coach']);
-        $this->assertNotEmpty($coachO);
+	/**
+	 * @group OrmModels
+	 * @group TeamOrm
+	 */
+	public function testTeamOrm()
+	{
+		$rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller();
+		$team = $rndFiller->getTeam($rndFiller->getLocale());
+		$teamArray = $team->toArray();
+		$this->assertNotEmpty($team);
+		$teamO = \App\Lib\DsManager\Models\Orm\Team::create($teamArray);
+		$this->assertNotEmpty($teamArray);
+		$this->assertNotEmpty($teamArray['roster']);
+		foreach ($teamArray['roster'] as $player) {
+			$player['team_id'] = $teamO->id;
+			$playerO = \App\Lib\DsManager\Models\Orm\Player::create($player);
+			$this->assertNotEmpty($playerO);
+		}
+		$teamArray['coach']['team_id'] = $teamO->id;
+		$coachO = \App\Lib\DsManager\Models\Orm\Coach::create($teamArray['coach']);
+		$this->assertNotEmpty($coachO);
 
-        $this->assertNotEmpty(
-            \App\Lib\DsManager\Models\Orm\Team::with(
-                'roster'
-            )->with(
-                'coach'
-            )->where(
-                [
-                    'id' => $teamO->id
-                ]
-            )->get()->toArray()
-        );
-    }
+		$this->assertNotEmpty(
+			\App\Lib\DsManager\Models\Orm\Team::with(
+				'roster'
+			)->with(
+				'coach'
+			)->where(
+				[
+					'id' => $teamO->id
+				]
+			)->get()->toArray()
+		);
+	}
 
-    /**
-     * @group Match
-     * @group createnewmatch
-     */
-    public function testCreateNewMatch()
-    {
-        $teams = \App\Lib\DsManager\Models\Orm\Team::with(
-            'roster',
-            'coach'
-        )->get();
-        $this->assertNotNull($teams);
-        $teams = $teams->toArray();
-        $homeIndex = array_rand($teams);
-        $teamHome = $teams[$homeIndex];
-        unset($teams[$homeIndex]);
-        $teamAway = $teams[array_rand($teams)];
-        $this->assertNotNull($teamHome);
-        $this->assertNotNull($teamAway);
-        $matchO = \App\Lib\DsManager\Models\Orm\Match::create(
-            [
-                'home_team_id' => $teamHome['id'],
-                'away_team_id' => $teamAway['id']
-            ]
-        );
-        $this->assertNotNull($matchO);
-        $matchNew = \App\Lib\DsManager\Models\Orm\Match::complete()->where('id', $matchO->id)->first();
-        $this->assertNotNull($matchNew);
-        $match = \App\Lib\DsManager\Models\Match::fromArray($matchNew->toArray());
-        $this->assertNotNull($match);
-    }
+	/**
+	 * @group Match
+	 * @group createnewmatch
+	 */
+	public function testCreateNewMatch()
+	{
+		$teams = \App\Lib\DsManager\Models\Orm\Team::with(
+			'roster',
+			'coach'
+		)->get();
+		$this->assertNotNull($teams);
+		$teams = $teams->toArray();
+		$homeIndex = array_rand($teams);
+		$teamHome = $teams[$homeIndex];
+		unset($teams[$homeIndex]);
+		$teamAway = $teams[array_rand($teams)];
+		$this->assertNotNull($teamHome);
+		$this->assertNotNull($teamAway);
+		$matchO = \App\Lib\DsManager\Models\Orm\Match::create(
+			[
+				'home_team_id' => $teamHome['id'],
+				'away_team_id' => $teamAway['id']
+			]
+		);
+		$this->assertNotNull($matchO);
+		$matchNew = \App\Lib\DsManager\Models\Orm\Match::complete()->where('id', $matchO->id)->first();
+		$this->assertNotNull($matchNew);
+		$match = \App\Lib\DsManager\Models\Match::fromArray($matchNew->toArray());
+		$this->assertNotNull($match);
+	}
 }

Please login to merge, or discard this patch.

api/database/seeds/ATeamsSeeder.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/Lib/DsManager/Models/Orm/Team.php 1 patch

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

@@ -8,45 +8,45 @@
 block discarded – undo
  */
 class Team extends DsManagerOrm
 {
-    /**
-     * @var string
-     */
-    protected $table = 'teams';
+	/**
+	 * @var string
+	 */
+	protected $table = 'teams';
 
-    /**
-     * @var array
-     */
-    protected $fillable = [
-        'name',
-        'nationality'
-    ];
+	/**
+	 * @var array
+	 */
+	protected $fillable = [
+		'name',
+		'nationality'
+	];
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function roster()
-    {
-        return $this->hasMany(Player::class);
-    }
+	/**
+	 * @return \Illuminate\Database\Eloquent\Relations\HasMany
+	 */
+	public function roster()
+	{
+		return $this->hasMany(Player::class);
+	}
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function coach()
-    {
-        return $this->hasOne(Coach::class);
-    }
+	/**
+	 * @return \Illuminate\Database\Eloquent\Relations\HasMany
+	 */
+	public function coach()
+	{
+		return $this->hasOne(Coach::class);
+	}
 
-    /**
-     * @param $query
-     * @return mixed
-     */
-    public function scopeComplete($query)
-    {
-        return $query->with(
-            'roster',
-            'coach'
-        );
-    }
+	/**
+	 * @param $query
+	 * @return mixed
+	 */
+	public function scopeComplete($query)
+	{
+		return $query->with(
+			'roster',
+			'coach'
+		);
+	}
 
 }
\ No newline at end of file

Please login to merge, or discard this patch.

api/Lib/DsManager/Models/Orm/MatchPlayer.php 2 patches

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

@@ -9,47 +9,47 @@
 block discarded – undo
 class MatchPlayer extends DsManagerOrm
 {
 
-    /**
-     * @var string
-     */
-    protected $table = 'match_players';
-
-    /**
-     * @var array
-     */
-    protected $fillable = [
-        'match_id',
-        'team_id',
-        'player_id',
-        'goals',
-        'vote'
-    ];
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function player()
-    {
-        return $this->belongsTo(Player::class, 'player_id');
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function team()
-    {
-        return $this->belongsTo(Team::class, 'team_id');
-    }
-
-    /**
-     * @param $query
-     * @return mixed
-     */
-    public function scopeComplete($query){
-        return $query->with(
-            'team',
-            'player'
-        );
-    }
+	/**
+	 * @var string
+	 */
+	protected $table = 'match_players';
+
+	/**
+	 * @var array
+	 */
+	protected $fillable = [
+		'match_id',
+		'team_id',
+		'player_id',
+		'goals',
+		'vote'
+	];
+
+	/**
+	 * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+	 */
+	public function player()
+	{
+		return $this->belongsTo(Player::class, 'player_id');
+	}
+
+	/**
+	 * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+	 */
+	public function team()
+	{
+		return $this->belongsTo(Team::class, 'team_id');
+	}
+
+	/**
+	 * @param $query
+	 * @return mixed
+	 */
+	public function scopeComplete($query){
+		return $query->with(
+			'team',
+			'player'
+		);
+	}
 
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -56,7 +56,7 @@
 block discarded – undo
         return $this->belongsTo(Team::class, 'away_team_id');
     }
 
-    public function scopeComplete($query){
+    public function scopeComplete($query) {
         return $query->with(
             'homeTeam',
             'homeTeam.roster',

Please login to merge, or discard this patch.

		@@ -2,7 +2,7 @@
		block discarded – undo
2	2
3	3	namespace App\Lib\DsManager\Models;
4	4
5		-use App\Lib\DsManager\Helpers\Randomizer;
	5	+use App\Lib\DsManager\Helpers\Randomizer;
6	6	use App\Lib\Helpers\Config;
7	7
8	8

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

		@@ -3,20 +3,20 @@
		block discarded – undo
3	3
4	4	class BMatchesSeeder
5	5	{
6		- function run()
7		- {
8		- $teams = \App\Lib\DsManager\Models\Orm\Team::all()->toArray();
9		- $halfTheTeams = count($teams) / 2;
10		- $chunks = array_chunk($teams, $halfTheTeams);
11		- $teamsSlice1 = $chunks[0];
12		- $teamsSlice2 = $chunks[1];
13		- for ($i = 0; $i < $halfTheTeams; $i++) {
14		- \App\Lib\DsManager\Models\Orm\Match::create(
15		- [
16		- 'home_team_id' => $teamsSlice1[$i]['id'],
17		- 'away_team_id' => $teamsSlice2[$i]['id']
18		- ]
19		- );
20		- }
21		- }
	6	+ function run()
	7	+ {
	8	+ $teams = \App\Lib\DsManager\Models\Orm\Team::all()->toArray();
	9	+ $halfTheTeams = count($teams) / 2;
	10	+ $chunks = array_chunk($teams, $halfTheTeams);
	11	+ $teamsSlice1 = $chunks[0];
	12	+ $teamsSlice2 = $chunks[1];
	13	+ for ($i = 0; $i < $halfTheTeams; $i++) {
	14	+ \App\Lib\DsManager\Models\Orm\Match::create(
	15	+ [
	16	+ 'home_team_id' => $teamsSlice1[$i]['id'],
	17	+ 'away_team_id' => $teamsSlice2[$i]['id']
	18	+ ]
	19	+ );
	20	+ }
	21	+ }
22	22	}
23	23	\ No newline at end of file

		@@ -5,24 +5,24 @@
		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('home_team_id');
19		- $table->integer('goal_home')->default(0);
20		- $table->integer('away_team_id');
21		- $table->integer('goal_away')->default(0);
22		- $table->boolean('simulated')->default(false);
23		- $table->text('info')->nullable();
24		- $table->date('match_date')->default(\Carbon\Carbon::now());
25		- $table->timestamps();
26		- });
27		- }
	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('home_team_id');
	19	+ $table->integer('goal_home')->default(0);
	20	+ $table->integer('away_team_id');
	21	+ $table->integer('goal_away')->default(0);
	22	+ $table->boolean('simulated')->default(false);
	23	+ $table->text('info')->nullable();
	24	+ $table->date('match_date')->default(\Carbon\Carbon::now());
	25	+ $table->timestamps();
	26	+ });
	27	+ }
28	28	}

		@@ -13,7 +13,7 @@
		block discarded – undo
13	13	public function run()
14	14	{
15	15	Capsule::schema()->dropIfExists('matches');
16		- Capsule::schema()->create('matches', function (Blueprint $table) {
	16	+ Capsule::schema()->create('matches', function(Blueprint $table) {
17	17	$table->increments('id');
18	18	$table->integer('home_team_id');
19	19	$table->integer('goal_home')->default(0);

		@@ -9,62 +9,62 @@
		block discarded – undo
9	9	class Match extends DsManagerOrm
10	10	{
11	11
12		- /**
13		- * @var string
14		- */
15		- protected $table = 'matches';
	12	+ /**
	13	+ * @var string
	14	+ */
	15	+ protected $table = 'matches';
16	16
17		- /**
18		- * @var array
19		- */
20		- protected $fillable = [
21		- 'home_team_id',
22		- 'away_team_id'
23		- ];
	17	+ /**
	18	+ * @var array
	19	+ */
	20	+ protected $fillable = [
	21	+ 'home_team_id',
	22	+ 'away_team_id'
	23	+ ];
24	24
25		- /**
26		- * @var array
27		- */
28		- protected $hidden = [
29		- 'home_team_id',
30		- 'away_team_id',
31		- 'created_at',
32		- 'updated_at',
33		- 'info'
34		- ];
	25	+ /**
	26	+ * @var array
	27	+ */
	28	+ protected $hidden = [
	29	+ 'home_team_id',
	30	+ 'away_team_id',
	31	+ 'created_at',
	32	+ 'updated_at',
	33	+ 'info'
	34	+ ];
35	35
36		- /**
37		- * @var array
38		- */
39		- protected $casts = [
40		- 'simulated' => 'boolean'
41		- ];
	36	+ /**
	37	+ * @var array
	38	+ */
	39	+ protected $casts = [
	40	+ 'simulated' => 'boolean'
	41	+ ];
42	42
43		- /**
44		- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
45		- */
46		- public function homeTeam()
47		- {
48		- return $this->belongsTo(Team::class, 'home_team_id');
49		- }
	43	+ /**
	44	+ * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
	45	+ */
	46	+ public function homeTeam()
	47	+ {
	48	+ return $this->belongsTo(Team::class, 'home_team_id');
	49	+ }
50	50
51		- /**
52		- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
53		- */
54		- public function awayTeam()
55		- {
56		- return $this->belongsTo(Team::class, 'away_team_id');
57		- }
	51	+ /**
	52	+ * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
	53	+ */
	54	+ public function awayTeam()
	55	+ {
	56	+ return $this->belongsTo(Team::class, 'away_team_id');
	57	+ }
58	58
59		- public function scopeComplete($query){
60		- return $query->with(
61		- 'homeTeam',
62		- 'homeTeam.roster',
63		- 'homeTeam.coach',
64		- 'awayTeam',
65		- 'awayTeam.roster',
66		- 'awayTeam.coach'
67		- );
68		- }
	59	+ public function scopeComplete($query){
	60	+ return $query->with(
	61	+ 'homeTeam',
	62	+ 'homeTeam.roster',
	63	+ 'homeTeam.coach',
	64	+ 'awayTeam',
	65	+ 'awayTeam.roster',
	66	+ 'awayTeam.coach'
	67	+ );
	68	+ }
69	69
70	70	}
71	71	\ No newline at end of file

		@@ -56,7 +56,7 @@
		block discarded – undo
56	56	return $this->belongsTo(Team::class, 'away_team_id');
57	57	}
58	58
59		- public function scopeComplete($query){
	59	+ public function scopeComplete($query) {
60	60	return $query->with(
61	61	'homeTeam',
62	62	'homeTeam.roster',

		@@ -8,101 +8,101 @@
		block discarded – undo
8	8	{
9	9
10	10
11		- /**
12		- * @group OrmModels
13		- * @group PlayerOrm
14		- */
15		- public function testPlayerOrmGetSet()
16		- {
17		- $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller();
18		- $playerM = $rndFiller->getPlayer();
19		- $arrayPl = $playerM->toArray();
20		- $playerO = \App\Lib\DsManager\Models\Orm\Player::create($arrayPl);
21		- $this->assertNotEmpty($playerO);
	11	+ /**
	12	+ * @group OrmModels
	13	+ * @group PlayerOrm
	14	+ */
	15	+ public function testPlayerOrmGetSet()
	16	+ {
	17	+ $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller();
	18	+ $playerM = $rndFiller->getPlayer();
	19	+ $arrayPl = $playerM->toArray();
	20	+ $playerO = \App\Lib\DsManager\Models\Orm\Player::create($arrayPl);
	21	+ $this->assertNotEmpty($playerO);
22	22
23		- $newPlayer = \App\Lib\DsManager\Models\Player::fromArray($playerO->toArray());
24		- $this->assertNotEmpty($newPlayer);
25		- }
	23	+ $newPlayer = \App\Lib\DsManager\Models\Player::fromArray($playerO->toArray());
	24	+ $this->assertNotEmpty($newPlayer);
	25	+ }
26	26
27		- /**
28		- * @group OrmModels
29		- * @group CoachOrm
30		- */
31		- public function testCoachOrmGetSet()
32		- {
33		- $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller();
34		- $coach = $rndFiller->getCoach();
35		- $arrayPl = $coach->toArray();
36		- $coachO = \App\Lib\DsManager\Models\Orm\Coach::create($arrayPl);
37		- $this->assertNotEmpty($coachO);
	27	+ /**
	28	+ * @group OrmModels
	29	+ * @group CoachOrm
	30	+ */
	31	+ public function testCoachOrmGetSet()
	32	+ {
	33	+ $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller();
	34	+ $coach = $rndFiller->getCoach();
	35	+ $arrayPl = $coach->toArray();
	36	+ $coachO = \App\Lib\DsManager\Models\Orm\Coach::create($arrayPl);
	37	+ $this->assertNotEmpty($coachO);
38	38
39		- $newCoach = \App\Lib\DsManager\Models\Coach::fromArray($coachO->toArray());
40		- $this->assertNotEmpty($newCoach);
41		- }
	39	+ $newCoach = \App\Lib\DsManager\Models\Coach::fromArray($coachO->toArray());
	40	+ $this->assertNotEmpty($newCoach);
	41	+ }
42	42
43		- /**
44		- * @group OrmModels
45		- * @group TeamOrm
46		- */
47		- public function testTeamOrm()
48		- {
49		- $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller();
50		- $team = $rndFiller->getTeam($rndFiller->getLocale());
51		- $teamArray = $team->toArray();
52		- $this->assertNotEmpty($team);
53		- $teamO = \App\Lib\DsManager\Models\Orm\Team::create($teamArray);
54		- $this->assertNotEmpty($teamArray);
55		- $this->assertNotEmpty($teamArray['roster']);
56		- foreach ($teamArray['roster'] as $player) {
57		- $player['team_id'] = $teamO->id;
58		- $playerO = \App\Lib\DsManager\Models\Orm\Player::create($player);
59		- $this->assertNotEmpty($playerO);
60		- }
61		- $teamArray['coach']['team_id'] = $teamO->id;
62		- $coachO = \App\Lib\DsManager\Models\Orm\Coach::create($teamArray['coach']);
63		- $this->assertNotEmpty($coachO);
	43	+ /**
	44	+ * @group OrmModels
	45	+ * @group TeamOrm
	46	+ */
	47	+ public function testTeamOrm()
	48	+ {
	49	+ $rndFiller = new \App\Lib\DsManager\Helpers\RandomFiller();
	50	+ $team = $rndFiller->getTeam($rndFiller->getLocale());
	51	+ $teamArray = $team->toArray();
	52	+ $this->assertNotEmpty($team);
	53	+ $teamO = \App\Lib\DsManager\Models\Orm\Team::create($teamArray);
	54	+ $this->assertNotEmpty($teamArray);
	55	+ $this->assertNotEmpty($teamArray['roster']);
	56	+ foreach ($teamArray['roster'] as $player) {
	57	+ $player['team_id'] = $teamO->id;
	58	+ $playerO = \App\Lib\DsManager\Models\Orm\Player::create($player);
	59	+ $this->assertNotEmpty($playerO);
	60	+ }
	61	+ $teamArray['coach']['team_id'] = $teamO->id;
	62	+ $coachO = \App\Lib\DsManager\Models\Orm\Coach::create($teamArray['coach']);
	63	+ $this->assertNotEmpty($coachO);
64	64
65		- $this->assertNotEmpty(
66		- \App\Lib\DsManager\Models\Orm\Team::with(
67		- 'roster'
68		- )->with(
69		- 'coach'
70		- )->where(
71		- [
72		- 'id' => $teamO->id
73		- ]
74		- )->get()->toArray()
75		- );
76		- }
	65	+ $this->assertNotEmpty(
	66	+ \App\Lib\DsManager\Models\Orm\Team::with(
	67	+ 'roster'
	68	+ )->with(
	69	+ 'coach'
	70	+ )->where(
	71	+ [
	72	+ 'id' => $teamO->id
	73	+ ]
	74	+ )->get()->toArray()
	75	+ );
	76	+ }
77	77
78		- /**
79		- * @group Match
80		- * @group createnewmatch
81		- */
82		- public function testCreateNewMatch()
83		- {
84		- $teams = \App\Lib\DsManager\Models\Orm\Team::with(
85		- 'roster',
86		- 'coach'
87		- )->get();
88		- $this->assertNotNull($teams);
89		- $teams = $teams->toArray();
90		- $homeIndex = array_rand($teams);
91		- $teamHome = $teams[$homeIndex];
92		- unset($teams[$homeIndex]);
93		- $teamAway = $teams[array_rand($teams)];
94		- $this->assertNotNull($teamHome);
95		- $this->assertNotNull($teamAway);
96		- $matchO = \App\Lib\DsManager\Models\Orm\Match::create(
97		- [
98		- 'home_team_id' => $teamHome['id'],
99		- 'away_team_id' => $teamAway['id']
100		- ]
101		- );
102		- $this->assertNotNull($matchO);
103		- $matchNew = \App\Lib\DsManager\Models\Orm\Match::complete()->where('id', $matchO->id)->first();
104		- $this->assertNotNull($matchNew);
105		- $match = \App\Lib\DsManager\Models\Match::fromArray($matchNew->toArray());
106		- $this->assertNotNull($match);
107		- }
	78	+ /**
	79	+ * @group Match
	80	+ * @group createnewmatch
	81	+ */
	82	+ public function testCreateNewMatch()
	83	+ {
	84	+ $teams = \App\Lib\DsManager\Models\Orm\Team::with(
	85	+ 'roster',
	86	+ 'coach'
	87	+ )->get();
	88	+ $this->assertNotNull($teams);
	89	+ $teams = $teams->toArray();
	90	+ $homeIndex = array_rand($teams);
	91	+ $teamHome = $teams[$homeIndex];
	92	+ unset($teams[$homeIndex]);
	93	+ $teamAway = $teams[array_rand($teams)];
	94	+ $this->assertNotNull($teamHome);
	95	+ $this->assertNotNull($teamAway);
	96	+ $matchO = \App\Lib\DsManager\Models\Orm\Match::create(
	97	+ [
	98	+ 'home_team_id' => $teamHome['id'],
	99	+ 'away_team_id' => $teamAway['id']
	100	+ ]
	101	+ );
	102	+ $this->assertNotNull($matchO);
	103	+ $matchNew = \App\Lib\DsManager\Models\Orm\Match::complete()->where('id', $matchO->id)->first();
	104	+ $this->assertNotNull($matchNew);
	105	+ $match = \App\Lib\DsManager\Models\Match::fromArray($matchNew->toArray());
	106	+ $this->assertNotNull($match);
	107	+ }
108	108	}

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

		@@ -8,45 +8,45 @@
		block discarded – undo
8	8	*/
9	9	class Team extends DsManagerOrm
10	10	{
11		- /**
12		- * @var string
13		- */
14		- protected $table = 'teams';
	11	+ /**
	12	+ * @var string
	13	+ */
	14	+ protected $table = 'teams';
15	15
16		- /**
17		- * @var array
18		- */
19		- protected $fillable = [
20		- 'name',
21		- 'nationality'
22		- ];
	16	+ /**
	17	+ * @var array
	18	+ */
	19	+ protected $fillable = [
	20	+ 'name',
	21	+ 'nationality'
	22	+ ];
23	23
24		- /**
25		- * @return \Illuminate\Database\Eloquent\Relations\HasMany
26		- */
27		- public function roster()
28		- {
29		- return $this->hasMany(Player::class);
30		- }
	24	+ /**
	25	+ * @return \Illuminate\Database\Eloquent\Relations\HasMany
	26	+ */
	27	+ public function roster()
	28	+ {
	29	+ return $this->hasMany(Player::class);
	30	+ }
31	31
32		- /**
33		- * @return \Illuminate\Database\Eloquent\Relations\HasMany
34		- */
35		- public function coach()
36		- {
37		- return $this->hasOne(Coach::class);
38		- }
	32	+ /**
	33	+ * @return \Illuminate\Database\Eloquent\Relations\HasMany
	34	+ */
	35	+ public function coach()
	36	+ {
	37	+ return $this->hasOne(Coach::class);
	38	+ }
39	39
40		- /**
41		- * @param $query
42		- * @return mixed
43		- */
44		- public function scopeComplete($query)
45		- {
46		- return $query->with(
47		- 'roster',
48		- 'coach'
49		- );
50		- }
	40	+ /**
	41	+ * @param $query
	42	+ * @return mixed
	43	+ */
	44	+ public function scopeComplete($query)
	45	+ {
	46	+ return $query->with(
	47	+ 'roster',
	48	+ 'coach'
	49	+ );
	50	+ }
51	51
52	52	}
53	53	\ No newline at end of file

		@@ -9,47 +9,47 @@
		block discarded – undo
9	9	class MatchPlayer extends DsManagerOrm
10	10	{
11	11
12		- /**
13		- * @var string
14		- */
15		- protected $table = 'match_players';
16		-
17		- /**
18		- * @var array
19		- */
20		- protected $fillable = [
21		- 'match_id',
22		- 'team_id',
23		- 'player_id',
24		- 'goals',
25		- 'vote'
26		- ];
27		-
28		- /**
29		- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
30		- */
31		- public function player()
32		- {
33		- return $this->belongsTo(Player::class, 'player_id');
34		- }
35		-
36		- /**
37		- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
38		- */
39		- public function team()
40		- {
41		- return $this->belongsTo(Team::class, 'team_id');
42		- }
43		-
44		- /**
45		- * @param $query
46		- * @return mixed
47		- */
48		- public function scopeComplete($query){
49		- return $query->with(
50		- 'team',
51		- 'player'
52		- );
53		- }
	12	+ /**
	13	+ * @var string
	14	+ */
	15	+ protected $table = 'match_players';
	16	+
	17	+ /**
	18	+ * @var array
	19	+ */
	20	+ protected $fillable = [
	21	+ 'match_id',
	22	+ 'team_id',
	23	+ 'player_id',
	24	+ 'goals',
	25	+ 'vote'
	26	+ ];
	27	+
	28	+ /**
	29	+ * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
	30	+ */
	31	+ public function player()
	32	+ {
	33	+ return $this->belongsTo(Player::class, 'player_id');
	34	+ }
	35	+
	36	+ /**
	37	+ * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
	38	+ */
	39	+ public function team()
	40	+ {
	41	+ return $this->belongsTo(Team::class, 'team_id');
	42	+ }
	43	+
	44	+ /**
	45	+ * @param $query
	46	+ * @return mixed
	47	+ */
	48	+ public function scopeComplete($query){
	49	+ return $query->with(
	50	+ 'team',
	51	+ 'player'
	52	+ );
	53	+ }
54	54
55	55	}
56	56	\ No newline at end of file

vikkio88 / dsManager-php

Push — master ( 36889c...d49014 )

Status

Category

Unused Use Statements +1 added lines, -1 removed lines patch added patch discarded remove patch

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

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

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

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

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

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

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

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

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

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

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

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch