Inspection of "implemented round simulation ui" - vikkio88/dsManager-php - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 5e9888...3ffa02 )

by Vincenzo

created 2016-09-04 20:24 UTC

Status

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

@@ -4,10 +4,10 @@
 block discarded – undo
 require_once("vendor/autoload.php");
 
 
-use App\Lib\DsManager\Helpers\MatchSimulator;
-use App\Lib\DsManager\Models\Orm\League;
-use App\Lib\DsManager\Models\Orm\LeagueRound;
-use App\Lib\DsManager\Models\Orm\Match;
+use App\Lib\DsManager\Helpers\MatchSimulator;
+use App\Lib\DsManager\Models\Orm\League;
+use App\Lib\DsManager\Models\Orm\LeagueRound;
+use App\Lib\DsManager\Models\Orm\Match;
 use App\Lib\DsManager\Models\Orm\MatchResult;
 use \App\Lib\Helpers\Responder;
 use \App\Lib\DsManager\Models\Orm\Player;

Please login to merge, or discard this patch.

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

@@ -15,190 +15,190 @@
 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::statistics()->where(
-            [
-                'id' => $args['playerId'],
-                'team_id' => $args['id']
-            ]
-        )->get(),
-        $response
-    );
+	return Responder::getJsonResponse(
+		Player::statistics()->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('/leagues', function ($request, $response, $args) {
-    return Responder::getJsonResponse(
-        League::all(),
-        $response
-    );
+	return Responder::getJsonResponse(
+		League::all(),
+		$response
+	);
 });
 
 $api->get('/leagues/{id}', function ($request, $response, $args) {
-    return Responder::getJsonResponse(
-        League::with('rounds')
-            ->where(
-                [
-                    'id' => $args['id']
-                ]
-            )->first(),
-        $response
-    );
+	return Responder::getJsonResponse(
+		League::with('rounds')
+			->where(
+				[
+					'id' => $args['id']
+				]
+			)->first(),
+		$response
+	);
 });
 
 $api->get('/leagues/{id}/rounds/{roundId}', function ($request, $response, $args) {
-    return Responder::getJsonResponse(
-        LeagueRound::complete()
-            ->where(
-                [
-                    'id' => $args['roundId'],
-                ]
-            )->first(),
-        $response
-    );
+	return Responder::getJsonResponse(
+		LeagueRound::complete()
+			->where(
+				[
+					'id' => $args['roundId'],
+				]
+			)->first(),
+		$response
+	);
 });
 
 $api->put('/leagues/{id}/rounds/{roundId}/simulate', function ($request, $response, $args) {
-    return Responder::getJsonResponse(
-        MatchSimulator::simulateRound(
-            $args['roundId']
-        ),
-        $response
-    );
+	return Responder::getJsonResponse(
+		MatchSimulator::simulateRound(
+			$args['roundId']
+		),
+		$response
+	);
 });
 
 $api->get('/matches', function ($request, $response, $args) {
-    return Responder::getJsonResponse(
-        Match::teams()->get(),
-        $response
-    );
+	return Responder::getJsonResponse(
+		Match::teams()->get(),
+		$response
+	);
 });
 
 $api->post('/matches', function ($request, $response, $args) {
-    $json = $request->getBody();
-    $json = json_decode($json, true);
-    return Responder::getJsonResponse(
-        Match::create(
-            $json
-        ),
-        $response
-    );
+	$json = $request->getBody();
+	$json = json_decode($json, true);
+	return Responder::getJsonResponse(
+		Match::create(
+			$json
+		),
+		$response
+	);
 });
 
 $api->get('/matches/{id}', function ($request, $response, $args) {
-    return Responder::getJsonResponse(
-        Match::complete()
-            ->where(
-                [
-                    'id' => $args['id']
-                ]
-            )->first(),
-        $response
-    );
+	return Responder::getJsonResponse(
+		Match::complete()
+			->where(
+				[
+					'id' => $args['id']
+				]
+			)->first(),
+		$response
+	);
 });
 
 $api->get('/matches/{id}/result', function ($request, $response, $args) {
-    $result = MatchResult::complete()
-        ->where(
-            [
-                'id' => $args['id']
-            ]
-        )->first();
+	$result = MatchResult::complete()
+		->where(
+			[
+				'id' => $args['id']
+			]
+		)->first();
 
-    return Responder::getJsonResponse(
-        $result,
-        $response
-    );
+	return Responder::getJsonResponse(
+		$result,
+		$response
+	);
 });
 
 $api->put('/matches/{id}/simulate', function ($request, $response, $args) {
-    return Responder::getJsonResponse(
-        MatchSimulator::simulateCompleteResult(
-            $args['id']
-        ),
-        $response
-    );
+	return Responder::getJsonResponse(
+		MatchSimulator::simulateCompleteResult(
+			$args['id']
+		),
+		$response
+	);
 });
 $api->run();
\ No newline at end of file

Please login to merge, or discard this patch.

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

@@ -22,7 +22,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",
@@ -32,34 +32,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(
@@ -71,7 +71,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'
@@ -84,7 +84,7 @@  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::statistics()->where(
             [
@@ -96,7 +96,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'
@@ -109,14 +109,14 @@  discard block
 block discarded – undo
     );
 });
 
-$api->get('/leagues', function ($request, $response, $args) {
+$api->get('/leagues', function($request, $response, $args) {
     return Responder::getJsonResponse(
         League::all(),
         $response
     );
 });
 
-$api->get('/leagues/{id}', function ($request, $response, $args) {
+$api->get('/leagues/{id}', function($request, $response, $args) {
     return Responder::getJsonResponse(
         League::with('rounds')
             ->where(
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
     );
 });
 
-$api->get('/leagues/{id}/rounds/{roundId}', function ($request, $response, $args) {
+$api->get('/leagues/{id}/rounds/{roundId}', function($request, $response, $args) {
     return Responder::getJsonResponse(
         LeagueRound::complete()
             ->where(
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
     );
 });
 
-$api->put('/leagues/{id}/rounds/{roundId}/simulate', function ($request, $response, $args) {
+$api->put('/leagues/{id}/rounds/{roundId}/simulate', function($request, $response, $args) {
     return Responder::getJsonResponse(
         MatchSimulator::simulateRound(
             $args['roundId']
@@ -149,14 +149,14 @@  discard block
 block discarded – undo
     );
 });
 
-$api->get('/matches', function ($request, $response, $args) {
+$api->get('/matches', function($request, $response, $args) {
     return Responder::getJsonResponse(
         Match::teams()->get(),
         $response
     );
 });
 
-$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(
@@ -167,7 +167,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(
         Match::complete()
             ->where(
@@ -179,7 +179,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 = MatchResult::complete()
         ->where(
             [
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
     );
 });
 
-$api->put('/matches/{id}/simulate', function ($request, $response, $args) {
+$api->put('/matches/{id}/simulate', function($request, $response, $args) {
     return Responder::getJsonResponse(
         MatchSimulator::simulateCompleteResult(
             $args['id']

Please login to merge, or discard this patch.

api/tests/HelpersTest.php 1 patch

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

@@ -8,74 +8,74 @@
 block discarded – undo
 {
 
 
-    /**
-     * @group Helpers
-     * @group FixtureGenerator
-     * @group generatefixture
-     */
-    public function testFixtureGenerator()
-    {
-        $teams = \App\Lib\DsManager\Models\Orm\Team::all();
-        $rounds = \App\Lib\DsManager\Helpers\LeagueFixtureGenerator::generate(
-            $teams->toArray()
-        );
-        //Number of rounds
-        $this->assertCount($teams->count() - 1, $rounds);
-        //Matches for each round
-        foreach ($rounds as $round) {
-            $this->assertCount($teams->count() / 2, $round);
-        }
-    }
+	/**
+	 * @group Helpers
+	 * @group FixtureGenerator
+	 * @group generatefixture
+	 */
+	public function testFixtureGenerator()
+	{
+		$teams = \App\Lib\DsManager\Models\Orm\Team::all();
+		$rounds = \App\Lib\DsManager\Helpers\LeagueFixtureGenerator::generate(
+			$teams->toArray()
+		);
+		//Number of rounds
+		$this->assertCount($teams->count() - 1, $rounds);
+		//Matches for each round
+		foreach ($rounds as $round) {
+			$this->assertCount($teams->count() / 2, $round);
+		}
+	}
 
-    /**
-     * @group Helpers
-     * @group MatchSimulator
-     */
-    public function testMatchSimulator()
-    {
-        $match = \App\Lib\DsManager\Models\Orm\Match::where(
-            [
-                'simulated' => false
-            ]
-        )->get()->random(1);
-        $this->assertNotEmpty($match);
-        $result = \App\Lib\DsManager\Helpers\MatchSimulator::simulateCompleteResult($match->id);
-        $this->assertNotEmpty($result);
-        $match = \App\Lib\DsManager\Models\Orm\Match::where(
-            [
-                'id' => $match->id,
-                'simulated' => true
-            ]
-        )->first();
-        $this->assertNotEmpty($match);
-    }
+	/**
+	 * @group Helpers
+	 * @group MatchSimulator
+	 */
+	public function testMatchSimulator()
+	{
+		$match = \App\Lib\DsManager\Models\Orm\Match::where(
+			[
+				'simulated' => false
+			]
+		)->get()->random(1);
+		$this->assertNotEmpty($match);
+		$result = \App\Lib\DsManager\Helpers\MatchSimulator::simulateCompleteResult($match->id);
+		$this->assertNotEmpty($result);
+		$match = \App\Lib\DsManager\Models\Orm\Match::where(
+			[
+				'id' => $match->id,
+				'simulated' => true
+			]
+		)->first();
+		$this->assertNotEmpty($match);
+	}
 
-    /**
-     * @group Helpers
-     * @group RoundSimulator
-     */
-    public function testRoundSimulator()
-    {
-        $match = \App\Lib\DsManager\Models\Orm\Match::where(
-            [
-                'simulated' => false
-            ]
-        )->whereNotNull(
-            'league_round_id'
-        )->get()->random(1);
-        $this->assertNotEmpty($match);
-        $result = \App\Lib\DsManager\Helpers\MatchSimulator::simulateRound($match->league_round_id);
-        $this->assertNotEmpty($result);
-        $match = \App\Lib\DsManager\Models\Orm\Match::where(
-            [
-                'id' => $match->id,
-                'simulated' => true
-            ]
-        )->first();
-        $this->assertNotEmpty($match);
-        $round = \App\Lib\DsManager\Models\Orm\LeagueRound::find($match->league_round_id);
-        $this->assertNotEmpty($round);
-        $this->assertTrue($round->simulated);
-    }
+	/**
+	 * @group Helpers
+	 * @group RoundSimulator
+	 */
+	public function testRoundSimulator()
+	{
+		$match = \App\Lib\DsManager\Models\Orm\Match::where(
+			[
+				'simulated' => false
+			]
+		)->whereNotNull(
+			'league_round_id'
+		)->get()->random(1);
+		$this->assertNotEmpty($match);
+		$result = \App\Lib\DsManager\Helpers\MatchSimulator::simulateRound($match->league_round_id);
+		$this->assertNotEmpty($result);
+		$match = \App\Lib\DsManager\Models\Orm\Match::where(
+			[
+				'id' => $match->id,
+				'simulated' => true
+			]
+		)->first();
+		$this->assertNotEmpty($match);
+		$round = \App\Lib\DsManager\Models\Orm\LeagueRound::find($match->league_round_id);
+		$this->assertNotEmpty($round);
+		$this->assertTrue($round->simulated);
+	}
 
 }

Please login to merge, or discard this patch.

api/database/migrations/CreateLeagueRoundsTable.php 1 patch

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

@@ -5,20 +5,20 @@
 block discarded – undo
 
 class CreateLeagueRoundsTable
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        Capsule::schema()->dropIfExists('league_rounds');
-        Capsule::schema()->create('league_rounds', function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('league_id');
-            $table->boolean('simulated')->default(false);
-            $table->integer('day')->default(0);
-            $table->timestamps();
-        });
-    }
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		Capsule::schema()->dropIfExists('league_rounds');
+		Capsule::schema()->create('league_rounds', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('league_id');
+			$table->boolean('simulated')->default(false);
+			$table->integer('day')->default(0);
+			$table->timestamps();
+		});
+	}
 }

Please login to merge, or discard this patch.

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

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

@@ -9,54 +9,54 @@
 block discarded – undo
 class LeagueRound extends DsManagerOrm
 {
 
-    /**
-     * @var string
-     */
-    protected $table = 'league_rounds';
-
-    /**
-     * @var array
-     */
-    protected $fillable = [
-        'league_id',
-        'day',
-        'simulated'
-    ];
-
-    /**
-     * @var array
-     */
-    protected $casts = [
-        'simulated' => 'boolean'
-    ];
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne
-     */
-    public function league()
-    {
-        return $this->belongsTo(League::class);
-    }
-
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function matches()
-    {
-        return $this->hasMany(Match::class);
-    }
-
-    /**
-     * @param $query
-     * @return mixed
-     */
-    public function scopeComplete($query)
-    {
-        return $query->with(
-            'league',
-            'matches',
-            'matches.homeTeam',
-            'matches.AwayTeam'
-        );
-    }
+	/**
+	 * @var string
+	 */
+	protected $table = 'league_rounds';
+
+	/**
+	 * @var array
+	 */
+	protected $fillable = [
+		'league_id',
+		'day',
+		'simulated'
+	];
+
+	/**
+	 * @var array
+	 */
+	protected $casts = [
+		'simulated' => 'boolean'
+	];
+
+	/**
+	 * @return \Illuminate\Database\Eloquent\Relations\HasOne
+	 */
+	public function league()
+	{
+		return $this->belongsTo(League::class);
+	}
+
+	/**
+	 * @return \Illuminate\Database\Eloquent\Relations\HasMany
+	 */
+	public function matches()
+	{
+		return $this->hasMany(Match::class);
+	}
+
+	/**
+	 * @param $query
+	 * @return mixed
+	 */
+	public function scopeComplete($query)
+	{
+		return $query->with(
+			'league',
+			'matches',
+			'matches.homeTeam',
+			'matches.AwayTeam'
+		);
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

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

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

@@ -15,129 +15,129 @@
 block discarded – undo
  */
 class MatchSimulator
 {
-    /**
-     * @param $roundId
-     * @return string
-     */
-    public static function simulateRound($roundId)
-    {
-        $result = self::getCompleteRound($roundId);
-        if (!empty($result)
-            &&
-            !$result->simulated
-        ) {
-            $matches = Match::where(
-                [
-                    'league_round_id' => $roundId
-                ]
-            )->get();
-            foreach ($matches as $match) {
-                self::simulateSimpleResult($match->id)->toArray();
-            }
-            LeagueRound::find($roundId)->update(['simulated' => true]);
-            $result = self::getCompleteRound($roundId);
-        }
-        return $result;
-    }
+	/**
+	 * @param $roundId
+	 * @return string
+	 */
+	public static function simulateRound($roundId)
+	{
+		$result = self::getCompleteRound($roundId);
+		if (!empty($result)
+			&&
+			!$result->simulated
+		) {
+			$matches = Match::where(
+				[
+					'league_round_id' => $roundId
+				]
+			)->get();
+			foreach ($matches as $match) {
+				self::simulateSimpleResult($match->id)->toArray();
+			}
+			LeagueRound::find($roundId)->update(['simulated' => true]);
+			$result = self::getCompleteRound($roundId);
+		}
+		return $result;
+	}
 
-    /**
-     * @param $matchId
-     * @return mixed
-     */
-    public static function simulateCompleteResult($matchId)
-    {
-        $result = self::getCompleteResult($matchId);
-        if (!empty($result)
-            && !$result->simulated
-            && self::simulate($matchId) === 1
-        ) {
-            $result = self::getCompleteResult($matchId);
-        }
-        return $result;
-    }
+	/**
+	 * @param $matchId
+	 * @return mixed
+	 */
+	public static function simulateCompleteResult($matchId)
+	{
+		$result = self::getCompleteResult($matchId);
+		if (!empty($result)
+			&& !$result->simulated
+			&& self::simulate($matchId) === 1
+		) {
+			$result = self::getCompleteResult($matchId);
+		}
+		return $result;
+	}
 
-    /**
-     * @param $matchId
-     * @return mixed
-     */
-    public static function simulateSimpleResult($matchId)
-    {
-        $result = self::getSimpleResult($matchId);
-        if (!empty($result)
-            && !$result->simulated
-            && self::simulate($matchId) === 1
-        ) {
-            $result = self::getSimpleResult($matchId);
-        }
-        return $result;
-    }
+	/**
+	 * @param $matchId
+	 * @return mixed
+	 */
+	public static function simulateSimpleResult($matchId)
+	{
+		$result = self::getSimpleResult($matchId);
+		if (!empty($result)
+			&& !$result->simulated
+			&& self::simulate($matchId) === 1
+		) {
+			$result = self::getSimpleResult($matchId);
+		}
+		return $result;
+	}
 
-    /**
-     * @param $matchId
-     * @return mixed
-     */
-    private static function simulate($matchId)
-    {
-        $match = \App\Lib\DsManager\Models\Match::fromArray(
-            MatchOrm::complete()
-                ->where(
-                    [
-                        'id' => $matchId
-                    ]
-                )->first()->toArray()
-        );
-        $matchResult = $match->simulate()->toArray();
-        $result = MatchResult::where(
-            [
-                'id' => $matchId
-            ]
-        )->update(
-            MatchResult::resolveAttributes(
-                $matchResult,
-                $matchId
-            )
-        );
-        return $result;
-    }
+	/**
+	 * @param $matchId
+	 * @return mixed
+	 */
+	private static function simulate($matchId)
+	{
+		$match = \App\Lib\DsManager\Models\Match::fromArray(
+			MatchOrm::complete()
+				->where(
+					[
+						'id' => $matchId
+					]
+				)->first()->toArray()
+		);
+		$matchResult = $match->simulate()->toArray();
+		$result = MatchResult::where(
+			[
+				'id' => $matchId
+			]
+		)->update(
+			MatchResult::resolveAttributes(
+				$matchResult,
+				$matchId
+			)
+		);
+		return $result;
+	}
 
 
-    /**
-     * @param $matchId
-     * @return MatchResult
-     */
-    private static function getCompleteResult($matchId)
-    {
-        return MatchResult::complete()->where(
-            [
-                'id' => $matchId
-            ]
-        )->first();
-    }
+	/**
+	 * @param $matchId
+	 * @return MatchResult
+	 */
+	private static function getCompleteResult($matchId)
+	{
+		return MatchResult::complete()->where(
+			[
+				'id' => $matchId
+			]
+		)->first();
+	}
 
-    /**
-     * @param $matchId
-     * @return MatchResult
-     */
-    private static function getSimpleResult($matchId)
-    {
-        return MatchResult::teams()->where(
-            [
-                'id' => $matchId
-            ]
-        )->first();
-    }
+	/**
+	 * @param $matchId
+	 * @return MatchResult
+	 */
+	private static function getSimpleResult($matchId)
+	{
+		return MatchResult::teams()->where(
+			[
+				'id' => $matchId
+			]
+		)->first();
+	}
 
-    /**
-     * @param $roundId
-     * @return mixed
-     */
-    private static function getCompleteRound($roundId)
-    {
-        return LeagueRound::complete()->where(
-            [
-                'id' => $roundId
-            ]
-        )->first();
-    }
+	/**
+	 * @param $roundId
+	 * @return mixed
+	 */
+	private static function getCompleteRound($roundId)
+	{
+		return LeagueRound::complete()->where(
+			[
+				'id' => $roundId
+			]
+		)->first();
+	}
 
 }
\ No newline at end of file

Please login to merge, or discard this patch.

		@@ -22,7 +22,7 @@ discard block
		block discarded – undo
22	22	$c = new \Slim\Container($configuration);
23	23	$api = new \Slim\App($c);
24	24
25		-$api->get('/ping', function ($request, $response, $args) {
	25	+$api->get('/ping', function($request, $response, $args) {
26	26	$jsonResp = json_encode(
27	27	[
28	28	"status" => "service up",
		@@ -32,34 +32,34 @@ discard block
		block discarded – undo
32	32	return Responder::getJsonResponse($jsonResp, $response);
33	33	});
34	34
35		-$api->get('/players', function ($request, $response, $args) {
	35	+$api->get('/players', function($request, $response, $args) {
36	36	$json = json_encode(Player::all());
37	37	return Responder::getJsonResponse($json, $response);
38	38	});
39	39
40	40
41		-$api->get('/players/{id}', function ($request, $response, $args) {
	41	+$api->get('/players/{id}', function($request, $response, $args) {
42	42	return Responder::getJsonResponse(
43	43	Player::findOrFail($args['id']),
44	44	$response
45	45	);
46	46	});
47	47
48		-$api->get('/coaches', function ($request, $response, $args) {
	48	+$api->get('/coaches', function($request, $response, $args) {
49	49	return Responder::getJsonResponse(
50	50	Coach::all(),
51	51	$response
52	52	);
53	53	});
54	54
55		-$api->get('/teams', function ($request, $response, $args) {
	55	+$api->get('/teams', function($request, $response, $args) {
56	56	return Responder::getJsonResponse(
57	57	Team::all(),
58	58	$response
59	59	);
60	60	});
61	61
62		-$api->get('/teams/{id}', function ($request, $response, $args) {
	62	+$api->get('/teams/{id}', function($request, $response, $args) {
63	63	return Responder::getJsonResponse(
64	64	Team::complete()
65	65	->where(
		@@ -71,7 +71,7 @@ discard block
		block discarded – undo
71	71	);
72	72	});
73	73
74		-$api->get('/teams/{id}/players', function ($request, $response, $args) {
	74	+$api->get('/teams/{id}/players', function($request, $response, $args) {
75	75	return Responder::getJsonResponse(
76	76	Team::with(
77	77	'roster'
		@@ -84,7 +84,7 @@ discard block
		block discarded – undo
84	84	);
85	85	});
86	86
87		-$api->get('/teams/{id}/players/{playerId}', function ($request, $response, $args) {
	87	+$api->get('/teams/{id}/players/{playerId}', function($request, $response, $args) {
88	88	return Responder::getJsonResponse(
89	89	Player::statistics()->where(
90	90	[
		@@ -96,7 +96,7 @@ discard block
		block discarded – undo
96	96	);
97	97	});
98	98
99		-$api->get('/teams/{id}/coach', function ($request, $response, $args) {
	99	+$api->get('/teams/{id}/coach', function($request, $response, $args) {
100	100	return Responder::getJsonResponse(
101	101	Team::with(
102	102	'coach'
		@@ -109,14 +109,14 @@ discard block
		block discarded – undo
109	109	);
110	110	});
111	111
112		-$api->get('/leagues', function ($request, $response, $args) {
	112	+$api->get('/leagues', function($request, $response, $args) {
113	113	return Responder::getJsonResponse(
114	114	League::all(),
115	115	$response
116	116	);
117	117	});
118	118
119		-$api->get('/leagues/{id}', function ($request, $response, $args) {
	119	+$api->get('/leagues/{id}', function($request, $response, $args) {
120	120	return Responder::getJsonResponse(
121	121	League::with('rounds')
122	122	->where(
		@@ -128,7 +128,7 @@ discard block
		block discarded – undo
128	128	);
129	129	});
130	130
131		-$api->get('/leagues/{id}/rounds/{roundId}', function ($request, $response, $args) {
	131	+$api->get('/leagues/{id}/rounds/{roundId}', function($request, $response, $args) {
132	132	return Responder::getJsonResponse(
133	133	LeagueRound::complete()
134	134	->where(
		@@ -140,7 +140,7 @@ discard block
		block discarded – undo
140	140	);
141	141	});
142	142
143		-$api->put('/leagues/{id}/rounds/{roundId}/simulate', function ($request, $response, $args) {
	143	+$api->put('/leagues/{id}/rounds/{roundId}/simulate', function($request, $response, $args) {
144	144	return Responder::getJsonResponse(
145	145	MatchSimulator::simulateRound(
146	146	$args['roundId']
		@@ -149,14 +149,14 @@ discard block
		block discarded – undo
149	149	);
150	150	});
151	151
152		-$api->get('/matches', function ($request, $response, $args) {
	152	+$api->get('/matches', function($request, $response, $args) {
153	153	return Responder::getJsonResponse(
154	154	Match::teams()->get(),
155	155	$response
156	156	);
157	157	});
158	158
159		-$api->post('/matches', function ($request, $response, $args) {
	159	+$api->post('/matches', function($request, $response, $args) {
160	160	$json = $request->getBody();
161	161	$json = json_decode($json, true);
162	162	return Responder::getJsonResponse(
		@@ -167,7 +167,7 @@ discard block
		block discarded – undo
167	167	);
168	168	});
169	169
170		-$api->get('/matches/{id}', function ($request, $response, $args) {
	170	+$api->get('/matches/{id}', function($request, $response, $args) {
171	171	return Responder::getJsonResponse(
172	172	Match::complete()
173	173	->where(
		@@ -179,7 +179,7 @@ discard block
		block discarded – undo
179	179	);
180	180	});
181	181
182		-$api->get('/matches/{id}/result', function ($request, $response, $args) {
	182	+$api->get('/matches/{id}/result', function($request, $response, $args) {
183	183	$result = MatchResult::complete()
184	184	->where(
185	185	[
		@@ -193,7 +193,7 @@ discard block
		block discarded – undo
193	193	);
194	194	});
195	195
196		-$api->put('/matches/{id}/simulate', function ($request, $response, $args) {
	196	+$api->put('/matches/{id}/simulate', function($request, $response, $args) {
197	197	return Responder::getJsonResponse(
198	198	MatchSimulator::simulateCompleteResult(
199	199	$args['id']

		@@ -4,10 +4,10 @@
		block discarded – undo
4	4	require_once("vendor/autoload.php");
5	5
6	6
7		-use App\Lib\DsManager\Helpers\MatchSimulator;
8		-use App\Lib\DsManager\Models\Orm\League;
9		-use App\Lib\DsManager\Models\Orm\LeagueRound;
10		-use App\Lib\DsManager\Models\Orm\Match;
	7	+use App\Lib\DsManager\Helpers\MatchSimulator;
	8	+use App\Lib\DsManager\Models\Orm\League;
	9	+use App\Lib\DsManager\Models\Orm\LeagueRound;
	10	+use App\Lib\DsManager\Models\Orm\Match;
11	11	use App\Lib\DsManager\Models\Orm\MatchResult;
12	12	use \App\Lib\Helpers\Responder;
13	13	use \App\Lib\DsManager\Models\Orm\Player;

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

		@@ -8,74 +8,74 @@
		block discarded – undo
8	8	{
9	9
10	10
11		- /**
12		- * @group Helpers
13		- * @group FixtureGenerator
14		- * @group generatefixture
15		- */
16		- public function testFixtureGenerator()
17		- {
18		- $teams = \App\Lib\DsManager\Models\Orm\Team::all();
19		- $rounds = \App\Lib\DsManager\Helpers\LeagueFixtureGenerator::generate(
20		- $teams->toArray()
21		- );
22		- //Number of rounds
23		- $this->assertCount($teams->count() - 1, $rounds);
24		- //Matches for each round
25		- foreach ($rounds as $round) {
26		- $this->assertCount($teams->count() / 2, $round);
27		- }
28		- }
	11	+ /**
	12	+ * @group Helpers
	13	+ * @group FixtureGenerator
	14	+ * @group generatefixture
	15	+ */
	16	+ public function testFixtureGenerator()
	17	+ {
	18	+ $teams = \App\Lib\DsManager\Models\Orm\Team::all();
	19	+ $rounds = \App\Lib\DsManager\Helpers\LeagueFixtureGenerator::generate(
	20	+ $teams->toArray()
	21	+ );
	22	+ //Number of rounds
	23	+ $this->assertCount($teams->count() - 1, $rounds);
	24	+ //Matches for each round
	25	+ foreach ($rounds as $round) {
	26	+ $this->assertCount($teams->count() / 2, $round);
	27	+ }
	28	+ }
29	29
30		- /**
31		- * @group Helpers
32		- * @group MatchSimulator
33		- */
34		- public function testMatchSimulator()
35		- {
36		- $match = \App\Lib\DsManager\Models\Orm\Match::where(
37		- [
38		- 'simulated' => false
39		- ]
40		- )->get()->random(1);
41		- $this->assertNotEmpty($match);
42		- $result = \App\Lib\DsManager\Helpers\MatchSimulator::simulateCompleteResult($match->id);
43		- $this->assertNotEmpty($result);
44		- $match = \App\Lib\DsManager\Models\Orm\Match::where(
45		- [
46		- 'id' => $match->id,
47		- 'simulated' => true
48		- ]
49		- )->first();
50		- $this->assertNotEmpty($match);
51		- }
	30	+ /**
	31	+ * @group Helpers
	32	+ * @group MatchSimulator
	33	+ */
	34	+ public function testMatchSimulator()
	35	+ {
	36	+ $match = \App\Lib\DsManager\Models\Orm\Match::where(
	37	+ [
	38	+ 'simulated' => false
	39	+ ]
	40	+ )->get()->random(1);
	41	+ $this->assertNotEmpty($match);
	42	+ $result = \App\Lib\DsManager\Helpers\MatchSimulator::simulateCompleteResult($match->id);
	43	+ $this->assertNotEmpty($result);
	44	+ $match = \App\Lib\DsManager\Models\Orm\Match::where(
	45	+ [
	46	+ 'id' => $match->id,
	47	+ 'simulated' => true
	48	+ ]
	49	+ )->first();
	50	+ $this->assertNotEmpty($match);
	51	+ }
52	52
53		- /**
54		- * @group Helpers
55		- * @group RoundSimulator
56		- */
57		- public function testRoundSimulator()
58		- {
59		- $match = \App\Lib\DsManager\Models\Orm\Match::where(
60		- [
61		- 'simulated' => false
62		- ]
63		- )->whereNotNull(
64		- 'league_round_id'
65		- )->get()->random(1);
66		- $this->assertNotEmpty($match);
67		- $result = \App\Lib\DsManager\Helpers\MatchSimulator::simulateRound($match->league_round_id);
68		- $this->assertNotEmpty($result);
69		- $match = \App\Lib\DsManager\Models\Orm\Match::where(
70		- [
71		- 'id' => $match->id,
72		- 'simulated' => true
73		- ]
74		- )->first();
75		- $this->assertNotEmpty($match);
76		- $round = \App\Lib\DsManager\Models\Orm\LeagueRound::find($match->league_round_id);
77		- $this->assertNotEmpty($round);
78		- $this->assertTrue($round->simulated);
79		- }
	53	+ /**
	54	+ * @group Helpers
	55	+ * @group RoundSimulator
	56	+ */
	57	+ public function testRoundSimulator()
	58	+ {
	59	+ $match = \App\Lib\DsManager\Models\Orm\Match::where(
	60	+ [
	61	+ 'simulated' => false
	62	+ ]
	63	+ )->whereNotNull(
	64	+ 'league_round_id'
	65	+ )->get()->random(1);
	66	+ $this->assertNotEmpty($match);
	67	+ $result = \App\Lib\DsManager\Helpers\MatchSimulator::simulateRound($match->league_round_id);
	68	+ $this->assertNotEmpty($result);
	69	+ $match = \App\Lib\DsManager\Models\Orm\Match::where(
	70	+ [
	71	+ 'id' => $match->id,
	72	+ 'simulated' => true
	73	+ ]
	74	+ )->first();
	75	+ $this->assertNotEmpty($match);
	76	+ $round = \App\Lib\DsManager\Models\Orm\LeagueRound::find($match->league_round_id);
	77	+ $this->assertNotEmpty($round);
	78	+ $this->assertTrue($round->simulated);
	79	+ }
80	80
81	81	}

		@@ -5,20 +5,20 @@
		block discarded – undo
5	5
6	6	class CreateLeagueRoundsTable
7	7	{
8		- /**
9		- * Run the migrations.
10		- *
11		- * @return void
12		- */
13		- public function run()
14		- {
15		- Capsule::schema()->dropIfExists('league_rounds');
16		- Capsule::schema()->create('league_rounds', function (Blueprint $table) {
17		- $table->increments('id');
18		- $table->integer('league_id');
19		- $table->boolean('simulated')->default(false);
20		- $table->integer('day')->default(0);
21		- $table->timestamps();
22		- });
23		- }
	8	+ /**
	9	+ * Run the migrations.
	10	+ *
	11	+ * @return void
	12	+ */
	13	+ public function run()
	14	+ {
	15	+ Capsule::schema()->dropIfExists('league_rounds');
	16	+ Capsule::schema()->create('league_rounds', function (Blueprint $table) {
	17	+ $table->increments('id');
	18	+ $table->integer('league_id');
	19	+ $table->boolean('simulated')->default(false);
	20	+ $table->integer('day')->default(0);
	21	+ $table->timestamps();
	22	+ });
	23	+ }
24	24	}

		@@ -9,54 +9,54 @@
		block discarded – undo
9	9	class LeagueRound extends DsManagerOrm
10	10	{
11	11
12		- /**
13		- * @var string
14		- */
15		- protected $table = 'league_rounds';
16		-
17		- /**
18		- * @var array
19		- */
20		- protected $fillable = [
21		- 'league_id',
22		- 'day',
23		- 'simulated'
24		- ];
25		-
26		- /**
27		- * @var array
28		- */
29		- protected $casts = [
30		- 'simulated' => 'boolean'
31		- ];
32		-
33		- /**
34		- * @return \Illuminate\Database\Eloquent\Relations\HasOne
35		- */
36		- public function league()
37		- {
38		- return $this->belongsTo(League::class);
39		- }
40		-
41		- /**
42		- * @return \Illuminate\Database\Eloquent\Relations\HasMany
43		- */
44		- public function matches()
45		- {
46		- return $this->hasMany(Match::class);
47		- }
48		-
49		- /**
50		- * @param $query
51		- * @return mixed
52		- */
53		- public function scopeComplete($query)
54		- {
55		- return $query->with(
56		- 'league',
57		- 'matches',
58		- 'matches.homeTeam',
59		- 'matches.AwayTeam'
60		- );
61		- }
	12	+ /**
	13	+ * @var string
	14	+ */
	15	+ protected $table = 'league_rounds';
	16	+
	17	+ /**
	18	+ * @var array
	19	+ */
	20	+ protected $fillable = [
	21	+ 'league_id',
	22	+ 'day',
	23	+ 'simulated'
	24	+ ];
	25	+
	26	+ /**
	27	+ * @var array
	28	+ */
	29	+ protected $casts = [
	30	+ 'simulated' => 'boolean'
	31	+ ];
	32	+
	33	+ /**
	34	+ * @return \Illuminate\Database\Eloquent\Relations\HasOne
	35	+ */
	36	+ public function league()
	37	+ {
	38	+ return $this->belongsTo(League::class);
	39	+ }
	40	+
	41	+ /**
	42	+ * @return \Illuminate\Database\Eloquent\Relations\HasMany
	43	+ */
	44	+ public function matches()
	45	+ {
	46	+ return $this->hasMany(Match::class);
	47	+ }
	48	+
	49	+ /**
	50	+ * @param $query
	51	+ * @return mixed
	52	+ */
	53	+ public function scopeComplete($query)
	54	+ {
	55	+ return $query->with(
	56	+ 'league',
	57	+ 'matches',
	58	+ 'matches.homeTeam',
	59	+ 'matches.AwayTeam'
	60	+ );
	61	+ }
62	62	}
63	63	\ No newline at end of file

		@@ -15,129 +15,129 @@
		block discarded – undo
15	15	*/
16	16	class MatchSimulator
17	17	{
18		- /**
19		- * @param $roundId
20		- * @return string
21		- */
22		- public static function simulateRound($roundId)
23		- {
24		- $result = self::getCompleteRound($roundId);
25		- if (!empty($result)
26		- &&
27		- !$result->simulated
28		- ) {
29		- $matches = Match::where(
30		- [
31		- 'league_round_id' => $roundId
32		- ]
33		- )->get();
34		- foreach ($matches as $match) {
35		- self::simulateSimpleResult($match->id)->toArray();
36		- }
37		- LeagueRound::find($roundId)->update(['simulated' => true]);
38		- $result = self::getCompleteRound($roundId);
39		- }
40		- return $result;
41		- }
	18	+ /**
	19	+ * @param $roundId
	20	+ * @return string
	21	+ */
	22	+ public static function simulateRound($roundId)
	23	+ {
	24	+ $result = self::getCompleteRound($roundId);
	25	+ if (!empty($result)
	26	+ &&
	27	+ !$result->simulated
	28	+ ) {
	29	+ $matches = Match::where(
	30	+ [
	31	+ 'league_round_id' => $roundId
	32	+ ]
	33	+ )->get();
	34	+ foreach ($matches as $match) {
	35	+ self::simulateSimpleResult($match->id)->toArray();
	36	+ }
	37	+ LeagueRound::find($roundId)->update(['simulated' => true]);
	38	+ $result = self::getCompleteRound($roundId);
	39	+ }
	40	+ return $result;
	41	+ }
42	42
43		- /**
44		- * @param $matchId
45		- * @return mixed
46		- */
47		- public static function simulateCompleteResult($matchId)
48		- {
49		- $result = self::getCompleteResult($matchId);
50		- if (!empty($result)
51		- && !$result->simulated
52		- && self::simulate($matchId) === 1
53		- ) {
54		- $result = self::getCompleteResult($matchId);
55		- }
56		- return $result;
57		- }
	43	+ /**
	44	+ * @param $matchId
	45	+ * @return mixed
	46	+ */
	47	+ public static function simulateCompleteResult($matchId)
	48	+ {
	49	+ $result = self::getCompleteResult($matchId);
	50	+ if (!empty($result)
	51	+ && !$result->simulated
	52	+ && self::simulate($matchId) === 1
	53	+ ) {
	54	+ $result = self::getCompleteResult($matchId);
	55	+ }
	56	+ return $result;
	57	+ }
58	58
59		- /**
60		- * @param $matchId
61		- * @return mixed
62		- */
63		- public static function simulateSimpleResult($matchId)
64		- {
65		- $result = self::getSimpleResult($matchId);
66		- if (!empty($result)
67		- && !$result->simulated
68		- && self::simulate($matchId) === 1
69		- ) {
70		- $result = self::getSimpleResult($matchId);
71		- }
72		- return $result;
73		- }
	59	+ /**
	60	+ * @param $matchId
	61	+ * @return mixed
	62	+ */
	63	+ public static function simulateSimpleResult($matchId)
	64	+ {
	65	+ $result = self::getSimpleResult($matchId);
	66	+ if (!empty($result)
	67	+ && !$result->simulated
	68	+ && self::simulate($matchId) === 1
	69	+ ) {
	70	+ $result = self::getSimpleResult($matchId);
	71	+ }
	72	+ return $result;
	73	+ }
74	74
75		- /**
76		- * @param $matchId
77		- * @return mixed
78		- */
79		- private static function simulate($matchId)
80		- {
81		- $match = \App\Lib\DsManager\Models\Match::fromArray(
82		- MatchOrm::complete()
83		- ->where(
84		- [
85		- 'id' => $matchId
86		- ]
87		- )->first()->toArray()
88		- );
89		- $matchResult = $match->simulate()->toArray();
90		- $result = MatchResult::where(
91		- [
92		- 'id' => $matchId
93		- ]
94		- )->update(
95		- MatchResult::resolveAttributes(
96		- $matchResult,
97		- $matchId
98		- )
99		- );
100		- return $result;
101		- }
	75	+ /**
	76	+ * @param $matchId
	77	+ * @return mixed
	78	+ */
	79	+ private static function simulate($matchId)
	80	+ {
	81	+ $match = \App\Lib\DsManager\Models\Match::fromArray(
	82	+ MatchOrm::complete()
	83	+ ->where(
	84	+ [
	85	+ 'id' => $matchId
	86	+ ]
	87	+ )->first()->toArray()
	88	+ );
	89	+ $matchResult = $match->simulate()->toArray();
	90	+ $result = MatchResult::where(
	91	+ [
	92	+ 'id' => $matchId
	93	+ ]
	94	+ )->update(
	95	+ MatchResult::resolveAttributes(
	96	+ $matchResult,
	97	+ $matchId
	98	+ )
	99	+ );
	100	+ return $result;
	101	+ }
102	102
103	103
104		- /**
105		- * @param $matchId
106		- * @return MatchResult
107		- */
108		- private static function getCompleteResult($matchId)
109		- {
110		- return MatchResult::complete()->where(
111		- [
112		- 'id' => $matchId
113		- ]
114		- )->first();
115		- }
	104	+ /**
	105	+ * @param $matchId
	106	+ * @return MatchResult
	107	+ */
	108	+ private static function getCompleteResult($matchId)
	109	+ {
	110	+ return MatchResult::complete()->where(
	111	+ [
	112	+ 'id' => $matchId
	113	+ ]
	114	+ )->first();
	115	+ }
116	116
117		- /**
118		- * @param $matchId
119		- * @return MatchResult
120		- */
121		- private static function getSimpleResult($matchId)
122		- {
123		- return MatchResult::teams()->where(
124		- [
125		- 'id' => $matchId
126		- ]
127		- )->first();
128		- }
	117	+ /**
	118	+ * @param $matchId
	119	+ * @return MatchResult
	120	+ */
	121	+ private static function getSimpleResult($matchId)
	122	+ {
	123	+ return MatchResult::teams()->where(
	124	+ [
	125	+ 'id' => $matchId
	126	+ ]
	127	+ )->first();
	128	+ }
129	129
130		- /**
131		- * @param $roundId
132		- * @return mixed
133		- */
134		- private static function getCompleteRound($roundId)
135		- {
136		- return LeagueRound::complete()->where(
137		- [
138		- 'id' => $roundId
139		- ]
140		- )->first();
141		- }
	130	+ /**
	131	+ * @param $roundId
	132	+ * @return mixed
	133	+ */
	134	+ private static function getCompleteRound($roundId)
	135	+ {
	136	+ return LeagueRound::complete()->where(
	137	+ [
	138	+ 'id' => $roundId
	139	+ ]
	140	+ )->first();
	141	+ }
142	142
143	143	}
144	144	\ No newline at end of file

vikkio88 / dsManager-php

Push — master ( 5e9888...3ffa02 )

Status

Category

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

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

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

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

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

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

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