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

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/Orm/MatchResult.php 1 patch

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

@@ -8,91 +8,91 @@
 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)
-    {
-        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)
+	{
+		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
-            ]
-        )->where('goals', '>', 0)->first();
-        if (!empty($scorer)) {
-            $scorer->goals = $scorer->goals + 1;
-            $scorer->vote = $scorer->vote + rand(0, 1);
-            $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
+			]
+		)->where('goals', '>', 0)->first();
+		if (!empty($scorer)) {
+			$scorer->goals = $scorer->goals + 1;
+			$scorer->vote = $scorer->vote + rand(0, 1);
+			$scorer->save();
+		} else {
+			MatchPlayer::create(
+				[
+					'match_id' => $matchId,
+					'team_id' => $teamId,
+					'player_id' => $playerId,
+					'goals' => 1
+				]
+			);
+		}
+	}
 
-    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 +41 added lines, -41 removed lines patch added patch discarded remove patch

@@ -9,46 +9,46 @@
 block discarded – undo
 class Player extends DsManagerOrm
 {
 
-    /**
-     * @var string
-     */
-    protected $table = 'players';
-
-    /**
-     * @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);
-    }
-
-    public function matches()
-    {
-        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');
-    }
+	/**
+	 * @var string
+	 */
+	protected $table = 'players';
+
+	/**
+	 * @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);
+	}
+
+	public function matches()
+	{
+		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');
+	}
 
 }
\ No newline at end of file

Please login to merge, or discard this patch.

api/index.php 2 patches

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

@@ -10,189 +10,189 @@
 block discarded – undo
 use \App\Lib\DsManager\Models\Orm\Coach;
 
 $configuration = [
-    'settings' => [
-        'displayErrorDetails' => true,
-    ],
+	'settings' => [
+		'displayErrorDetails' => true,
+	],
 ];
 $c = new \Slim\Container($configuration);
 $api = new \Slim\App($c);
 
 $api->get('/ping', function ($request, $response, $args) {
-    $jsonResp = json_encode(
-        [
-            "status" => "service up",
-            "message" => "in a bottle"
-        ]
-    );
-    return Responder::getJsonResponse($jsonResp, $response);
+	$jsonResp = json_encode(
+		[
+			"status" => "service up",
+			"message" => "in a bottle"
+		]
+	);
+	return Responder::getJsonResponse($jsonResp, $response);
 });
 
 $api->get('/players', function ($request, $response, $args) {
-    $json = json_encode(Player::all());
-    return Responder::getJsonResponse($json, $response);
+	$json = json_encode(Player::all());
+	return Responder::getJsonResponse($json, $response);
 });
 
 
 $api->get('/players/{id}', function ($request, $response, $args) {
-    return Responder::getJsonResponse(
-        Player::findOrFail($args['id']),
-        $response
-    );
+	return Responder::getJsonResponse(
+		Player::findOrFail($args['id']),
+		$response
+	);
 });
 
 $api->get('/coaches', function ($request, $response, $args) {
-    return Responder::getJsonResponse(
-        Coach::all(),
-        $response
-    );
+	return Responder::getJsonResponse(
+		Coach::all(),
+		$response
+	);
 });
 
 $api->get('/teams', function ($request, $response, $args) {
-    return Responder::getJsonResponse(
-        Team::all(),
-        $response
-    );
+	return Responder::getJsonResponse(
+		Team::all(),
+		$response
+	);
 });
 
 $api->get('/teams/{id}', function ($request, $response, $args) {
-    return Responder::getJsonResponse(
-        Team::complete()
-            ->where(
-                [
-                    'id' => $args['id']
-                ]
-            )->get(),
-        $response
-    );
+	return Responder::getJsonResponse(
+		Team::complete()
+			->where(
+				[
+					'id' => $args['id']
+				]
+			)->get(),
+		$response
+	);
 });
 
 $api->get('/teams/{id}/players', function ($request, $response, $args) {
-    return Responder::getJsonResponse(
-        Team::with(
-            'roster'
-        )->where(
-            [
-                'id' => $args['id']
-            ]
-        )->get(),
-        $response
-    );
+	return Responder::getJsonResponse(
+		Team::with(
+			'roster'
+		)->where(
+			[
+				'id' => $args['id']
+			]
+		)->get(),
+		$response
+	);
 });
 
 $api->get('/teams/{id}/players/{playerId}', function ($request, $response, $args) {
-    return Responder::getJsonResponse(
-        Player::with('matches','goals')->where(
-            [
-                'id' => $args['playerId'],
-                'team_id' => $args['id']
-            ]
-        )->get(),
-        $response
-    );
+	return Responder::getJsonResponse(
+		Player::with('matches','goals')->where(
+			[
+				'id' => $args['playerId'],
+				'team_id' => $args['id']
+			]
+		)->get(),
+		$response
+	);
 });
 
 $api->get('/teams/{id}/coach', function ($request, $response, $args) {
-    return Responder::getJsonResponse(
-        Team::with(
-            'coach'
-        )->where(
-            [
-                'id' => $args['id']
-            ]
-        )->get(),
-        $response
-    );
+	return Responder::getJsonResponse(
+		Team::with(
+			'coach'
+		)->where(
+			[
+				'id' => $args['id']
+			]
+		)->get(),
+		$response
+	);
 });
 
 $api->get('/matches', function ($request, $response, $args) {
-    return Responder::getJsonResponse(
-        \App\Lib\DsManager\Models\Orm\Match::with(
-            'homeTeam',
-            'awayTeam'
-        )->get(),
-        $response
-    );
+	return Responder::getJsonResponse(
+		\App\Lib\DsManager\Models\Orm\Match::with(
+			'homeTeam',
+			'awayTeam'
+		)->get(),
+		$response
+	);
 });
 
 $api->post('/matches', function ($request, $response, $args) {
-    $json = $request->getBody();
-    $json = json_decode($json, true);
-    return Responder::getJsonResponse(
-        \App\Lib\DsManager\Models\Orm\Match::create(
-            $json
-        ),
-        $response
-    );
+	$json = $request->getBody();
+	$json = json_decode($json, true);
+	return Responder::getJsonResponse(
+		\App\Lib\DsManager\Models\Orm\Match::create(
+			$json
+		),
+		$response
+	);
 });
 
 $api->get('/matches/{id}', function ($request, $response, $args) {
-    return Responder::getJsonResponse(
-        \App\Lib\DsManager\Models\Orm\Match::complete()
-            ->where(
-                [
-                    'id' => $args['id']
-                ]
-            )->first(),
-        $response
-    );
+	return Responder::getJsonResponse(
+		\App\Lib\DsManager\Models\Orm\Match::complete()
+			->where(
+				[
+					'id' => $args['id']
+				]
+			)->first(),
+		$response
+	);
 });
 
 $api->get('/matches/{id}/result', function ($request, $response, $args) {
-    $result = \App\Lib\DsManager\Models\Orm\MatchResult::complete()
-        ->where(
-            [
-                'id' => $args['id']
-            ]
-        )->first();
-
-    return Responder::getJsonResponse(
-        $result,
-        $response
-    );
+	$result = \App\Lib\DsManager\Models\Orm\MatchResult::complete()
+		->where(
+			[
+				'id' => $args['id']
+			]
+		)->first();
+
+	return Responder::getJsonResponse(
+		$result,
+		$response
+	);
 });
 
 $api->put('/matches/{id}/simulate', function ($request, $response, $args) {
-    $result = \App\Lib\DsManager\Models\Orm\MatchResult::complete()
-        ->where(
-            [
-                'id' => $args['id']
-            ]
-        )->first();
-
-    if (!empty($result) && !$result->simulated) {
-        //simulate match
-        $match = \App\Lib\DsManager\Models\Match::fromArray(
-            \App\Lib\DsManager\Models\Orm\Match::complete()
-                ->where(
-                    [
-                        'id' => $args['id']
-                    ]
-                )->first()->toArray()
-        );
-        $matchResult = $match->simulate()->toArray();
-        $result = \App\Lib\DsManager\Models\Orm\MatchResult::where(
-            [
-                'id' => $args['id']
-            ]
-        )->update(
-            \App\Lib\DsManager\Models\Orm\MatchResult::resolveAttributes(
-                $matchResult,
-                $args['id']
-            )
-        );
-        if ($result === 1) {
-            $result = \App\Lib\DsManager\Models\Orm\MatchResult::complete()
-                ->where(
-                    [
-                        'id' => $args['id']
-                    ]
-                )->first();
-        }
-
-    }
-    return Responder::getJsonResponse(
-        $result,
-        $response
-    );
+	$result = \App\Lib\DsManager\Models\Orm\MatchResult::complete()
+		->where(
+			[
+				'id' => $args['id']
+			]
+		)->first();
+
+	if (!empty($result) && !$result->simulated) {
+		//simulate match
+		$match = \App\Lib\DsManager\Models\Match::fromArray(
+			\App\Lib\DsManager\Models\Orm\Match::complete()
+				->where(
+					[
+						'id' => $args['id']
+					]
+				)->first()->toArray()
+		);
+		$matchResult = $match->simulate()->toArray();
+		$result = \App\Lib\DsManager\Models\Orm\MatchResult::where(
+			[
+				'id' => $args['id']
+			]
+		)->update(
+			\App\Lib\DsManager\Models\Orm\MatchResult::resolveAttributes(
+				$matchResult,
+				$args['id']
+			)
+		);
+		if ($result === 1) {
+			$result = \App\Lib\DsManager\Models\Orm\MatchResult::complete()
+				->where(
+					[
+						'id' => $args['id']
+					]
+				)->first();
+		}
+
+	}
+	return Responder::getJsonResponse(
+		$result,
+		$response
+	);
 });
 $api->run();
\ No newline at end of file

Please login to merge, or discard this patch.

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

@@ -17,7 +17,7 @@  discard block
 block discarded – undo
 $c = new \Slim\Container($configuration);
 $api = new \Slim\App($c);
 
-$api->get('/ping', function ($request, $response, $args) {
+$api->get('/ping', function($request, $response, $args) {
     $jsonResp = json_encode(
         [
             "status" => "service up",
@@ -27,34 +27,34 @@  discard block
 block discarded – undo
     return Responder::getJsonResponse($jsonResp, $response);
 });
 
-$api->get('/players', function ($request, $response, $args) {
+$api->get('/players', function($request, $response, $args) {
     $json = json_encode(Player::all());
     return Responder::getJsonResponse($json, $response);
 });
 
 
-$api->get('/players/{id}', function ($request, $response, $args) {
+$api->get('/players/{id}', function($request, $response, $args) {
     return Responder::getJsonResponse(
         Player::findOrFail($args['id']),
         $response
     );
 });
 
-$api->get('/coaches', function ($request, $response, $args) {
+$api->get('/coaches', function($request, $response, $args) {
     return Responder::getJsonResponse(
         Coach::all(),
         $response
     );
 });
 
-$api->get('/teams', function ($request, $response, $args) {
+$api->get('/teams', function($request, $response, $args) {
     return Responder::getJsonResponse(
         Team::all(),
         $response
     );
 });
 
-$api->get('/teams/{id}', function ($request, $response, $args) {
+$api->get('/teams/{id}', function($request, $response, $args) {
     return Responder::getJsonResponse(
         Team::complete()
             ->where(
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
     );
 });
 
-$api->get('/teams/{id}/players', function ($request, $response, $args) {
+$api->get('/teams/{id}/players', function($request, $response, $args) {
     return Responder::getJsonResponse(
         Team::with(
             'roster'
@@ -79,9 +79,9 @@  discard block
 block discarded – undo
     );
 });
 
-$api->get('/teams/{id}/players/{playerId}', function ($request, $response, $args) {
+$api->get('/teams/{id}/players/{playerId}', function($request, $response, $args) {
     return Responder::getJsonResponse(
-        Player::with('matches','goals')->where(
+        Player::with('matches', 'goals')->where(
             [
                 'id' => $args['playerId'],
                 'team_id' => $args['id']
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
     );
 });
 
-$api->get('/teams/{id}/coach', function ($request, $response, $args) {
+$api->get('/teams/{id}/coach', function($request, $response, $args) {
     return Responder::getJsonResponse(
         Team::with(
             'coach'
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
     );
 });
 
-$api->get('/matches', function ($request, $response, $args) {
+$api->get('/matches', function($request, $response, $args) {
     return Responder::getJsonResponse(
         \App\Lib\DsManager\Models\Orm\Match::with(
             'homeTeam',
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
     );
 });
 
-$api->post('/matches', function ($request, $response, $args) {
+$api->post('/matches', function($request, $response, $args) {
     $json = $request->getBody();
     $json = json_decode($json, true);
     return Responder::getJsonResponse(
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
     );
 });
 
-$api->get('/matches/{id}', function ($request, $response, $args) {
+$api->get('/matches/{id}', function($request, $response, $args) {
     return Responder::getJsonResponse(
         \App\Lib\DsManager\Models\Orm\Match::complete()
             ->where(
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
     );
 });
 
-$api->get('/matches/{id}/result', function ($request, $response, $args) {
+$api->get('/matches/{id}/result', function($request, $response, $args) {
     $result = \App\Lib\DsManager\Models\Orm\MatchResult::complete()
         ->where(
             [
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
     );
 });
 
-$api->put('/matches/{id}/simulate', function ($request, $response, $args) {
+$api->put('/matches/{id}/simulate', function($request, $response, $args) {
     $result = \App\Lib\DsManager\Models\Orm\MatchResult::complete()
         ->where(
             [

Please login to merge, or discard this patch.

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

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

		@@ -9,46 +9,46 @@
		block discarded – undo
9	9	class Player extends DsManagerOrm
10	10	{
11	11
12		- /**
13		- * @var string
14		- */
15		- protected $table = 'players';
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		- ];
31		-
32		- /**
33		- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
34		- */
35		- public function team()
36		- {
37		- return $this->belongsTo(Team::class);
38		- }
39		-
40		- public function matches()
41		- {
42		- return $this->hasMany(MatchPlayer::class)
43		- ->orderBy('updated_at', 'DESC')
44		- ->limit(5);
45		- }
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		- }
	12	+ /**
	13	+ * @var string
	14	+ */
	15	+ protected $table = 'players';
	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	+ ];
	31	+
	32	+ /**
	33	+ * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
	34	+ */
	35	+ public function team()
	36	+ {
	37	+ return $this->belongsTo(Team::class);
	38	+ }
	39	+
	40	+ public function matches()
	41	+ {
	42	+ return $this->hasMany(MatchPlayer::class)
	43	+ ->orderBy('updated_at', 'DESC')
	44	+ ->limit(5);
	45	+ }
	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	+ }
53	53
54	54	}
55	55	\ No newline at end of file

		@@ -10,189 +10,189 @@
		block discarded – undo
10	10	use \App\Lib\DsManager\Models\Orm\Coach;
11	11
12	12	$configuration = [
13		- 'settings' => [
14		- 'displayErrorDetails' => true,
15		- ],
	13	+ 'settings' => [
	14	+ 'displayErrorDetails' => true,
	15	+ ],
16	16	];
17	17	$c = new \Slim\Container($configuration);
18	18	$api = new \Slim\App($c);
19	19
20	20	$api->get('/ping', function ($request, $response, $args) {
21		- $jsonResp = json_encode(
22		- [
23		- "status" => "service up",
24		- "message" => "in a bottle"
25		- ]
26		- );
27		- return Responder::getJsonResponse($jsonResp, $response);
	21	+ $jsonResp = json_encode(
	22	+ [
	23	+ "status" => "service up",
	24	+ "message" => "in a bottle"
	25	+ ]
	26	+ );
	27	+ return Responder::getJsonResponse($jsonResp, $response);
28	28	});
29	29
30	30	$api->get('/players', function ($request, $response, $args) {
31		- $json = json_encode(Player::all());
32		- return Responder::getJsonResponse($json, $response);
	31	+ $json = json_encode(Player::all());
	32	+ return Responder::getJsonResponse($json, $response);
33	33	});
34	34
35	35
36	36	$api->get('/players/{id}', function ($request, $response, $args) {
37		- return Responder::getJsonResponse(
38		- Player::findOrFail($args['id']),
39		- $response
40		- );
	37	+ return Responder::getJsonResponse(
	38	+ Player::findOrFail($args['id']),
	39	+ $response
	40	+ );
41	41	});
42	42
43	43	$api->get('/coaches', function ($request, $response, $args) {
44		- return Responder::getJsonResponse(
45		- Coach::all(),
46		- $response
47		- );
	44	+ return Responder::getJsonResponse(
	45	+ Coach::all(),
	46	+ $response
	47	+ );
48	48	});
49	49
50	50	$api->get('/teams', function ($request, $response, $args) {
51		- return Responder::getJsonResponse(
52		- Team::all(),
53		- $response
54		- );
	51	+ return Responder::getJsonResponse(
	52	+ Team::all(),
	53	+ $response
	54	+ );
55	55	});
56	56
57	57	$api->get('/teams/{id}', function ($request, $response, $args) {
58		- return Responder::getJsonResponse(
59		- Team::complete()
60		- ->where(
61		- [
62		- 'id' => $args['id']
63		- ]
64		- )->get(),
65		- $response
66		- );
	58	+ return Responder::getJsonResponse(
	59	+ Team::complete()
	60	+ ->where(
	61	+ [
	62	+ 'id' => $args['id']
	63	+ ]
	64	+ )->get(),
	65	+ $response
	66	+ );
67	67	});
68	68
69	69	$api->get('/teams/{id}/players', function ($request, $response, $args) {
70		- return Responder::getJsonResponse(
71		- Team::with(
72		- 'roster'
73		- )->where(
74		- [
75		- 'id' => $args['id']
76		- ]
77		- )->get(),
78		- $response
79		- );
	70	+ return Responder::getJsonResponse(
	71	+ Team::with(
	72	+ 'roster'
	73	+ )->where(
	74	+ [
	75	+ 'id' => $args['id']
	76	+ ]
	77	+ )->get(),
	78	+ $response
	79	+ );
80	80	});
81	81
82	82	$api->get('/teams/{id}/players/{playerId}', function ($request, $response, $args) {
83		- return Responder::getJsonResponse(
84		- Player::with('matches','goals')->where(
85		- [
86		- 'id' => $args['playerId'],
87		- 'team_id' => $args['id']
88		- ]
89		- )->get(),
90		- $response
91		- );
	83	+ return Responder::getJsonResponse(
	84	+ Player::with('matches','goals')->where(
	85	+ [
	86	+ 'id' => $args['playerId'],
	87	+ 'team_id' => $args['id']
	88	+ ]
	89	+ )->get(),
	90	+ $response
	91	+ );
92	92	});
93	93
94	94	$api->get('/teams/{id}/coach', function ($request, $response, $args) {
95		- return Responder::getJsonResponse(
96		- Team::with(
97		- 'coach'
98		- )->where(
99		- [
100		- 'id' => $args['id']
101		- ]
102		- )->get(),
103		- $response
104		- );
	95	+ return Responder::getJsonResponse(
	96	+ Team::with(
	97	+ 'coach'
	98	+ )->where(
	99	+ [
	100	+ 'id' => $args['id']
	101	+ ]
	102	+ )->get(),
	103	+ $response
	104	+ );
105	105	});
106	106
107	107	$api->get('/matches', function ($request, $response, $args) {
108		- return Responder::getJsonResponse(
109		- \App\Lib\DsManager\Models\Orm\Match::with(
110		- 'homeTeam',
111		- 'awayTeam'
112		- )->get(),
113		- $response
114		- );
	108	+ return Responder::getJsonResponse(
	109	+ \App\Lib\DsManager\Models\Orm\Match::with(
	110	+ 'homeTeam',
	111	+ 'awayTeam'
	112	+ )->get(),
	113	+ $response
	114	+ );
115	115	});
116	116
117	117	$api->post('/matches', function ($request, $response, $args) {
118		- $json = $request->getBody();
119		- $json = json_decode($json, true);
120		- return Responder::getJsonResponse(
121		- \App\Lib\DsManager\Models\Orm\Match::create(
122		- $json
123		- ),
124		- $response
125		- );
	118	+ $json = $request->getBody();
	119	+ $json = json_decode($json, true);
	120	+ return Responder::getJsonResponse(
	121	+ \App\Lib\DsManager\Models\Orm\Match::create(
	122	+ $json
	123	+ ),
	124	+ $response
	125	+ );
126	126	});
127	127
128	128	$api->get('/matches/{id}', function ($request, $response, $args) {
129		- return Responder::getJsonResponse(
130		- \App\Lib\DsManager\Models\Orm\Match::complete()
131		- ->where(
132		- [
133		- 'id' => $args['id']
134		- ]
135		- )->first(),
136		- $response
137		- );
	129	+ return Responder::getJsonResponse(
	130	+ \App\Lib\DsManager\Models\Orm\Match::complete()
	131	+ ->where(
	132	+ [
	133	+ 'id' => $args['id']
	134	+ ]
	135	+ )->first(),
	136	+ $response
	137	+ );
138	138	});
139	139
140	140	$api->get('/matches/{id}/result', function ($request, $response, $args) {
141		- $result = \App\Lib\DsManager\Models\Orm\MatchResult::complete()
142		- ->where(
143		- [
144		- 'id' => $args['id']
145		- ]
146		- )->first();
147		-
148		- return Responder::getJsonResponse(
149		- $result,
150		- $response
151		- );
	141	+ $result = \App\Lib\DsManager\Models\Orm\MatchResult::complete()
	142	+ ->where(
	143	+ [
	144	+ 'id' => $args['id']
	145	+ ]
	146	+ )->first();
	147	+
	148	+ return Responder::getJsonResponse(
	149	+ $result,
	150	+ $response
	151	+ );
152	152	});
153	153
154	154	$api->put('/matches/{id}/simulate', function ($request, $response, $args) {
155		- $result = \App\Lib\DsManager\Models\Orm\MatchResult::complete()
156		- ->where(
157		- [
158		- 'id' => $args['id']
159		- ]
160		- )->first();
161		-
162		- if (!empty($result) && !$result->simulated) {
163		- //simulate match
164		- $match = \App\Lib\DsManager\Models\Match::fromArray(
165		- \App\Lib\DsManager\Models\Orm\Match::complete()
166		- ->where(
167		- [
168		- 'id' => $args['id']
169		- ]
170		- )->first()->toArray()
171		- );
172		- $matchResult = $match->simulate()->toArray();
173		- $result = \App\Lib\DsManager\Models\Orm\MatchResult::where(
174		- [
175		- 'id' => $args['id']
176		- ]
177		- )->update(
178		- \App\Lib\DsManager\Models\Orm\MatchResult::resolveAttributes(
179		- $matchResult,
180		- $args['id']
181		- )
182		- );
183		- if ($result === 1) {
184		- $result = \App\Lib\DsManager\Models\Orm\MatchResult::complete()
185		- ->where(
186		- [
187		- 'id' => $args['id']
188		- ]
189		- )->first();
190		- }
191		-
192		- }
193		- return Responder::getJsonResponse(
194		- $result,
195		- $response
196		- );
	155	+ $result = \App\Lib\DsManager\Models\Orm\MatchResult::complete()
	156	+ ->where(
	157	+ [
	158	+ 'id' => $args['id']
	159	+ ]
	160	+ )->first();
	161	+
	162	+ if (!empty($result) && !$result->simulated) {
	163	+ //simulate match
	164	+ $match = \App\Lib\DsManager\Models\Match::fromArray(
	165	+ \App\Lib\DsManager\Models\Orm\Match::complete()
	166	+ ->where(
	167	+ [
	168	+ 'id' => $args['id']
	169	+ ]
	170	+ )->first()->toArray()
	171	+ );
	172	+ $matchResult = $match->simulate()->toArray();
	173	+ $result = \App\Lib\DsManager\Models\Orm\MatchResult::where(
	174	+ [
	175	+ 'id' => $args['id']
	176	+ ]
	177	+ )->update(
	178	+ \App\Lib\DsManager\Models\Orm\MatchResult::resolveAttributes(
	179	+ $matchResult,
	180	+ $args['id']
	181	+ )
	182	+ );
	183	+ if ($result === 1) {
	184	+ $result = \App\Lib\DsManager\Models\Orm\MatchResult::complete()
	185	+ ->where(
	186	+ [
	187	+ 'id' => $args['id']
	188	+ ]
	189	+ )->first();
	190	+ }
	191	+
	192	+ }
	193	+ return Responder::getJsonResponse(
	194	+ $result,
	195	+ $response
	196	+ );
197	197	});
198	198	$api->run();
199	199	\ No newline at end of file

		@@ -17,7 +17,7 @@ discard block
		block discarded – undo
17	17	$c = new \Slim\Container($configuration);
18	18	$api = new \Slim\App($c);
19	19
20		-$api->get('/ping', function ($request, $response, $args) {
	20	+$api->get('/ping', function($request, $response, $args) {
21	21	$jsonResp = json_encode(
22	22	[
23	23	"status" => "service up",
		@@ -27,34 +27,34 @@ discard block
		block discarded – undo
27	27	return Responder::getJsonResponse($jsonResp, $response);
28	28	});
29	29
30		-$api->get('/players', function ($request, $response, $args) {
	30	+$api->get('/players', function($request, $response, $args) {
31	31	$json = json_encode(Player::all());
32	32	return Responder::getJsonResponse($json, $response);
33	33	});
34	34
35	35
36		-$api->get('/players/{id}', function ($request, $response, $args) {
	36	+$api->get('/players/{id}', function($request, $response, $args) {
37	37	return Responder::getJsonResponse(
38	38	Player::findOrFail($args['id']),
39	39	$response
40	40	);
41	41	});
42	42
43		-$api->get('/coaches', function ($request, $response, $args) {
	43	+$api->get('/coaches', function($request, $response, $args) {
44	44	return Responder::getJsonResponse(
45	45	Coach::all(),
46	46	$response
47	47	);
48	48	});
49	49
50		-$api->get('/teams', function ($request, $response, $args) {
	50	+$api->get('/teams', function($request, $response, $args) {
51	51	return Responder::getJsonResponse(
52	52	Team::all(),
53	53	$response
54	54	);
55	55	});
56	56
57		-$api->get('/teams/{id}', function ($request, $response, $args) {
	57	+$api->get('/teams/{id}', function($request, $response, $args) {
58	58	return Responder::getJsonResponse(
59	59	Team::complete()
60	60	->where(
		@@ -66,7 +66,7 @@ discard block
		block discarded – undo
66	66	);
67	67	});
68	68
69		-$api->get('/teams/{id}/players', function ($request, $response, $args) {
	69	+$api->get('/teams/{id}/players', function($request, $response, $args) {
70	70	return Responder::getJsonResponse(
71	71	Team::with(
72	72	'roster'
		@@ -79,9 +79,9 @@ discard block
		block discarded – undo
79	79	);
80	80	});
81	81
82		-$api->get('/teams/{id}/players/{playerId}', function ($request, $response, $args) {
	82	+$api->get('/teams/{id}/players/{playerId}', function($request, $response, $args) {
83	83	return Responder::getJsonResponse(
84		- Player::with('matches','goals')->where(
	84	+ Player::with('matches', 'goals')->where(
85	85	[
86	86	'id' => $args['playerId'],
87	87	'team_id' => $args['id']
		@@ -91,7 +91,7 @@ discard block
		block discarded – undo
91	91	);
92	92	});
93	93
94		-$api->get('/teams/{id}/coach', function ($request, $response, $args) {
	94	+$api->get('/teams/{id}/coach', function($request, $response, $args) {
95	95	return Responder::getJsonResponse(
96	96	Team::with(
97	97	'coach'
		@@ -104,7 +104,7 @@ discard block
		block discarded – undo
104	104	);
105	105	});
106	106
107		-$api->get('/matches', function ($request, $response, $args) {
	107	+$api->get('/matches', function($request, $response, $args) {
108	108	return Responder::getJsonResponse(
109	109	\App\Lib\DsManager\Models\Orm\Match::with(
110	110	'homeTeam',
		@@ -114,7 +114,7 @@ discard block
		block discarded – undo
114	114	);
115	115	});
116	116
117		-$api->post('/matches', function ($request, $response, $args) {
	117	+$api->post('/matches', function($request, $response, $args) {
118	118	$json = $request->getBody();
119	119	$json = json_decode($json, true);
120	120	return Responder::getJsonResponse(
		@@ -125,7 +125,7 @@ discard block
		block discarded – undo
125	125	);
126	126	});
127	127
128		-$api->get('/matches/{id}', function ($request, $response, $args) {
	128	+$api->get('/matches/{id}', function($request, $response, $args) {
129	129	return Responder::getJsonResponse(
130	130	\App\Lib\DsManager\Models\Orm\Match::complete()
131	131	->where(
		@@ -137,7 +137,7 @@ discard block
		block discarded – undo
137	137	);
138	138	});
139	139
140		-$api->get('/matches/{id}/result', function ($request, $response, $args) {
	140	+$api->get('/matches/{id}/result', function($request, $response, $args) {
141	141	$result = \App\Lib\DsManager\Models\Orm\MatchResult::complete()
142	142	->where(
143	143	[
		@@ -151,7 +151,7 @@ discard block
		block discarded – undo
151	151	);
152	152	});
153	153
154		-$api->put('/matches/{id}/simulate', function ($request, $response, $args) {
	154	+$api->put('/matches/{id}/simulate', function($request, $response, $args) {
155	155	$result = \App\Lib\DsManager\Models\Orm\MatchResult::complete()
156	156	->where(
157	157	[

vikkio88 / dsManager-php

Push — master ( 36889c...d49014 )

Status

Category

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

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

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

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

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