Inspection of "added stats for Players and Teams" - vikkio88/dsManager-php - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 3a0efc...84f561 )

by Vincenzo

created 2016-09-07 17:58 UTC

Status

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

@@ -38,7 +38,7 @@
 block discarded – undo
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
      */
     public function coach()
     {

Please login to merge, or discard this patch.

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

@@ -8,132 +8,132 @@
 block discarded – undo
  */
 class Team extends DsManagerOrm
 {
-    /**
-     *
-     */
-    const PLAYED_LIMIT = 5;
-    /**
-     *
-     */
-    const FUTURE_LIMIT = 3;
-    /**
-     * @var string
-     */
-    protected $table = 'teams';
+	/**
+	 *
+	 */
+	const PLAYED_LIMIT = 5;
+	/**
+	 *
+	 */
+	const FUTURE_LIMIT = 3;
+	/**
+	 * @var string
+	 */
+	protected $table = 'teams';
 
-    /**
-     * @var array
-     */
-    protected $fillable = [
-        'name',
-        'nationality'
-    ];
+	/**
+	 * @var array
+	 */
+	protected $fillable = [
+		'name',
+		'nationality'
+	];
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function roster()
-    {
-        return $this->hasMany(Player::class);
-    }
+	/**
+	 * @return \Illuminate\Database\Eloquent\Relations\HasMany
+	 */
+	public function roster()
+	{
+		return $this->hasMany(Player::class);
+	}
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function coach()
-    {
-        return $this->hasOne(Coach::class);
-    }
+	/**
+	 * @return \Illuminate\Database\Eloquent\Relations\HasMany
+	 */
+	public function coach()
+	{
+		return $this->hasOne(Coach::class);
+	}
 
-    /**
-     * @return mixed
-     */
-    public function playedMatchesHome()
-    {
-        return $this->hasMany(
-            MatchResult::class,
-            'home_team_id'
-        )->where('simulated', true)
-            ->orderBy('updated_at', 'DESC')
-            ->limit(self::PLAYED_LIMIT);
-    }
+	/**
+	 * @return mixed
+	 */
+	public function playedMatchesHome()
+	{
+		return $this->hasMany(
+			MatchResult::class,
+			'home_team_id'
+		)->where('simulated', true)
+			->orderBy('updated_at', 'DESC')
+			->limit(self::PLAYED_LIMIT);
+	}
 
-    /**
-     * @return mixed
-     */
-    public function futureMatchesHome()
-    {
-        return $this->hasMany(
-            MatchResult::class,
-            'home_team_id'
-        )->where('simulated', false)
-            ->orderBy('updated_at', 'DESC')
-            ->limit(self::FUTURE_LIMIT);
-    }
+	/**
+	 * @return mixed
+	 */
+	public function futureMatchesHome()
+	{
+		return $this->hasMany(
+			MatchResult::class,
+			'home_team_id'
+		)->where('simulated', false)
+			->orderBy('updated_at', 'DESC')
+			->limit(self::FUTURE_LIMIT);
+	}
 
-    /**
-     * @return mixed
-     */
-    public function playedMatchesAway()
-    {
-        return $this->hasMany(
-            MatchResult::class,
-            'away_team_id'
-        )->where('simulated', true)
-            ->orderBy('updated_at', 'DESC')
-            ->limit(self::PLAYED_LIMIT);
-    }
+	/**
+	 * @return mixed
+	 */
+	public function playedMatchesAway()
+	{
+		return $this->hasMany(
+			MatchResult::class,
+			'away_team_id'
+		)->where('simulated', true)
+			->orderBy('updated_at', 'DESC')
+			->limit(self::PLAYED_LIMIT);
+	}
 
-    /**
-     * @return mixed
-     */
-    public function futureMatchesAway()
-    {
-        return $this->hasMany(
-            MatchResult::class,
-            'away_team_id'
-        )->where('simulated', false)
-            ->orderBy('updated_at', 'DESC')
-            ->limit(self::FUTURE_LIMIT);
-    }
+	/**
+	 * @return mixed
+	 */
+	public function futureMatchesAway()
+	{
+		return $this->hasMany(
+			MatchResult::class,
+			'away_team_id'
+		)->where('simulated', false)
+			->orderBy('updated_at', 'DESC')
+			->limit(self::FUTURE_LIMIT);
+	}
 
 
-    /**
-     * @param $query
-     * @return mixed
-     */
-    public function scopeComplete($query)
-    {
-        return $query->with(
-            'roster',
-            'coach',
-            'playedMatchesHome',
-            'playedMatchesHome.awayTeam',
-            'futureMatchesHome',
-            'futureMatchesHome.awayTeam',
-            'playedMatchesAway',
-            'playedMatchesAway.homeTeam',
-            'futureMatchesAway',
-            'futureMatchesAway.homeTeam'
-        );
-    }
+	/**
+	 * @param $query
+	 * @return mixed
+	 */
+	public function scopeComplete($query)
+	{
+		return $query->with(
+			'roster',
+			'coach',
+			'playedMatchesHome',
+			'playedMatchesHome.awayTeam',
+			'futureMatchesHome',
+			'futureMatchesHome.awayTeam',
+			'playedMatchesAway',
+			'playedMatchesAway.homeTeam',
+			'futureMatchesAway',
+			'futureMatchesAway.homeTeam'
+		);
+	}
 
-    /**
-     * @return array
-     */
-    public static function getBest()
-    {
-        $result = Match::selectRaw('winner_id as id, COUNT(*) as won')
-            ->whereNotNull('winner_id')->where('winner_id', '!=', 0)
-            ->orderByRaw('COUNT(*) DESC')->groupBy('winner_id')
-            ->take(20)->get()->keyBy('id')->toArray();
-        $teams = Team::whereIn('id', array_keys($result))->get()->toArray();
-        $result = array_map(function ($team) use ($result) {
-            $team['stats'] = $result[$team['id']];
-            return $team;
-        }, $teams);
+	/**
+	 * @return array
+	 */
+	public static function getBest()
+	{
+		$result = Match::selectRaw('winner_id as id, COUNT(*) as won')
+			->whereNotNull('winner_id')->where('winner_id', '!=', 0)
+			->orderByRaw('COUNT(*) DESC')->groupBy('winner_id')
+			->take(20)->get()->keyBy('id')->toArray();
+		$teams = Team::whereIn('id', array_keys($result))->get()->toArray();
+		$result = array_map(function ($team) use ($result) {
+			$team['stats'] = $result[$team['id']];
+			return $team;
+		}, $teams);
 
-        return $result;
-    }
+		return $result;
+	}
 
 }
\ No newline at end of file

Please login to merge, or discard this patch.

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

@@ -128,7 +128,7 @@
 block discarded – undo
             ->orderByRaw('COUNT(*) DESC')->groupBy('winner_id')
             ->take(20)->get()->keyBy('id')->toArray();
         $teams = Team::whereIn('id', array_keys($result))->get()->toArray();
-        $result = array_map(function ($team) use ($result) {
+        $result = array_map(function($team) use ($result) {
             $team['stats'] = $result[$team['id']];
             return $team;
         }, $teams);

Please login to merge, or discard this patch.

api/Lib/Helpers/Responder.php 1 patch

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

@@ -9,48 +9,48 @@
 block discarded – undo
  */
 class Responder
 {
-    /**
-     * @param $content
-     * @param $response
-     * @param array $headers
-     * @return mixed
-     */
-    public static function getJsonResponse($content, $response, $headers = [])
-    {
-        $headers['Content-Type'] = 'application/json';
-        return self::getResponse(
-            $headers,
-            $content,
-            $response
-        );
-    }
+	/**
+	 * @param $content
+	 * @param $response
+	 * @param array $headers
+	 * @return mixed
+	 */
+	public static function getJsonResponse($content, $response, $headers = [])
+	{
+		$headers['Content-Type'] = 'application/json';
+		return self::getResponse(
+			$headers,
+			$content,
+			$response
+		);
+	}
 
-    /**
-     * @param array $headers
-     * @param $content
-     * @param $response
-     * @return mixed
-     */
-    public static function getResponse($headers = [], $content, $response)
-    {
-        $body = $response->getBody();
-        $body->write($content);
-        $i = 0;
-        foreach ($headers as $header => $value) {
-            if ($i === 0) {
-                $response = $response->withHeader(
-                    $header,
-                    $value
-                );
-            } else {
-                $response = $response->withAddedHeader(
-                    $header,
-                    $value
-                );
-            }
-            $i++;
-        }
-        return $response->withBody($body);
-    }
+	/**
+	 * @param array $headers
+	 * @param $content
+	 * @param $response
+	 * @return mixed
+	 */
+	public static function getResponse($headers = [], $content, $response)
+	{
+		$body = $response->getBody();
+		$body->write($content);
+		$i = 0;
+		foreach ($headers as $header => $value) {
+			if ($i === 0) {
+				$response = $response->withHeader(
+					$header,
+					$value
+				);
+			} else {
+				$response = $response->withAddedHeader(
+					$header,
+					$value
+				);
+			}
+			$i++;
+		}
+		return $response->withBody($body);
+	}
 
 }
\ No newline at end of file

Please login to merge, or discard this patch.

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

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

@@ -9,104 +9,104 @@
 block discarded – undo
 class Player extends DsManagerOrm
 {
 
-    /**
-     * @var string
-     */
-    protected $table = 'players';
+	/**
+	 * @var string
+	 */
+	protected $table = 'players';
 
-    /**
-     * @var array
-     */
-    protected $fillable = [
-        'name',
-        'surname',
-        'age',
-        'nationality',
-        'skillAvg',
-        'wageReq',
-        'val',
-        'role',
-        'team_id'
-    ];
+	/**
+	 * @var array
+	 */
+	protected $fillable = [
+		'name',
+		'surname',
+		'age',
+		'nationality',
+		'skillAvg',
+		'wageReq',
+		'val',
+		'role',
+		'team_id'
+	];
 
-    /**
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-     */
-    public function team()
-    {
-        return $this->belongsTo(Team::class);
-    }
+	/**
+	 * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+	 */
+	public function team()
+	{
+		return $this->belongsTo(Team::class);
+	}
 
-    /**
-     * @return mixed
-     */
-    public function lastMatches()
-    {
-        return $this->hasMany(MatchPlayer::class)
-            ->orderBy('updated_at', 'DESC')
-            ->limit(5);
-    }
+	/**
+	 * @return mixed
+	 */
+	public function lastMatches()
+	{
+		return $this->hasMany(MatchPlayer::class)
+			->orderBy('updated_at', 'DESC')
+			->limit(5);
+	}
 
-    /**
-     * @return mixed
-     */
-    public function goals()
-    {
-        return $this->hasOne(MatchPlayer::class)
-            ->selectRaw('player_id, sum(goals) as count')
-            ->groupBy('player_id');
-    }
+	/**
+	 * @return mixed
+	 */
+	public function goals()
+	{
+		return $this->hasOne(MatchPlayer::class)
+			->selectRaw('player_id, sum(goals) as count')
+			->groupBy('player_id');
+	}
 
-    /**
-     * @return mixed
-     */
-    public function appearances()
-    {
-        return $this->hasOne(MatchPlayer::class)
-            ->selectRaw('player_id, count(match_id) as count')
-            ->groupBy('player_id');
-    }
+	/**
+	 * @return mixed
+	 */
+	public function appearances()
+	{
+		return $this->hasOne(MatchPlayer::class)
+			->selectRaw('player_id, count(match_id) as count')
+			->groupBy('player_id');
+	}
 
-    /**
-     * @return mixed
-     */
-    public function avg()
-    {
-        return $this->hasOne(MatchPlayer::class)
-            ->selectRaw('player_id, round(avg(vote),2) as avg')
-            ->groupBy('player_id');
-    }
+	/**
+	 * @return mixed
+	 */
+	public function avg()
+	{
+		return $this->hasOne(MatchPlayer::class)
+			->selectRaw('player_id, round(avg(vote),2) as avg')
+			->groupBy('player_id');
+	}
 
-    /**
-     * @param $query
-     * @return mixed
-     */
-    public function scopeStatistics($query)
-    {
-        return $query->with(
-            'goals',
-            'appearances',
-            'avg',
-            'lastMatches',
-            'team'
-        );
-    }
+	/**
+	 * @param $query
+	 * @return mixed
+	 */
+	public function scopeStatistics($query)
+	{
+		return $query->with(
+			'goals',
+			'appearances',
+			'avg',
+			'lastMatches',
+			'team'
+		);
+	}
 
-    /**
-     * @return array
-     */
-    public static function getBest()
-    {
-        $result = MatchPlayer::selectRaw(
-            'player_id, COUNT(*) as appearances ,AVG(vote) avg, SUM(goals) goals'
-        )->where('goals', '>', 0)
-            ->orderByRaw('SUM(goals) DESC,COUNT(*) DESC')
-            ->groupBy('player_id')->take(20)->get()->keyBy('player_id')->toArray();
-        $players = Player::whereIn('id', array_keys($result))->get()->toArray();
-        $result = array_map(function ($player) use ($result) {
-            $player['stats'] = $result[$player['id']];
-            return $player;
-        }, $players);
-        return $result;
-    }
+	/**
+	 * @return array
+	 */
+	public static function getBest()
+	{
+		$result = MatchPlayer::selectRaw(
+			'player_id, COUNT(*) as appearances ,AVG(vote) avg, SUM(goals) goals'
+		)->where('goals', '>', 0)
+			->orderByRaw('SUM(goals) DESC,COUNT(*) DESC')
+			->groupBy('player_id')->take(20)->get()->keyBy('player_id')->toArray();
+		$players = Player::whereIn('id', array_keys($result))->get()->toArray();
+		$result = array_map(function ($player) use ($result) {
+			$player['stats'] = $result[$player['id']];
+			return $player;
+		}, $players);
+		return $result;
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

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

@@ -103,7 +103,7 @@
 block discarded – undo
             ->orderByRaw('SUM(goals) DESC,COUNT(*) DESC')
             ->groupBy('player_id')->take(20)->get()->keyBy('player_id')->toArray();
         $players = Player::whereIn('id', array_keys($result))->get()->toArray();
-        $result = array_map(function ($player) use ($result) {
+        $result = array_map(function($player) use ($result) {
             $player['stats'] = $result[$player['id']];
             return $player;
         }, $players);

Please login to merge, or discard this patch.

		@@ -38,7 +38,7 @@
		block discarded – undo
38	38	}
39	39
40	40	/**
41		- * @return \Illuminate\Database\Eloquent\Relations\HasMany
	41	+ * @return \Illuminate\Database\Eloquent\Relations\HasOne
42	42	*/
43	43	public function coach()
44	44	{

		@@ -8,132 +8,132 @@
		block discarded – undo
8	8	*/
9	9	class Team extends DsManagerOrm
10	10	{
11		- /**
12		- *
13		- */
14		- const PLAYED_LIMIT = 5;
15		- /**
16		- *
17		- */
18		- const FUTURE_LIMIT = 3;
19		- /**
20		- * @var string
21		- */
22		- protected $table = 'teams';
	11	+ /**
	12	+ *
	13	+ */
	14	+ const PLAYED_LIMIT = 5;
	15	+ /**
	16	+ *
	17	+ */
	18	+ const FUTURE_LIMIT = 3;
	19	+ /**
	20	+ * @var string
	21	+ */
	22	+ protected $table = 'teams';
23	23
24		- /**
25		- * @var array
26		- */
27		- protected $fillable = [
28		- 'name',
29		- 'nationality'
30		- ];
	24	+ /**
	25	+ * @var array
	26	+ */
	27	+ protected $fillable = [
	28	+ 'name',
	29	+ 'nationality'
	30	+ ];
31	31
32		- /**
33		- * @return \Illuminate\Database\Eloquent\Relations\HasMany
34		- */
35		- public function roster()
36		- {
37		- return $this->hasMany(Player::class);
38		- }
	32	+ /**
	33	+ * @return \Illuminate\Database\Eloquent\Relations\HasMany
	34	+ */
	35	+ public function roster()
	36	+ {
	37	+ return $this->hasMany(Player::class);
	38	+ }
39	39
40		- /**
41		- * @return \Illuminate\Database\Eloquent\Relations\HasMany
42		- */
43		- public function coach()
44		- {
45		- return $this->hasOne(Coach::class);
46		- }
	40	+ /**
	41	+ * @return \Illuminate\Database\Eloquent\Relations\HasMany
	42	+ */
	43	+ public function coach()
	44	+ {
	45	+ return $this->hasOne(Coach::class);
	46	+ }
47	47
48		- /**
49		- * @return mixed
50		- */
51		- public function playedMatchesHome()
52		- {
53		- return $this->hasMany(
54		- MatchResult::class,
55		- 'home_team_id'
56		- )->where('simulated', true)
57		- ->orderBy('updated_at', 'DESC')
58		- ->limit(self::PLAYED_LIMIT);
59		- }
	48	+ /**
	49	+ * @return mixed
	50	+ */
	51	+ public function playedMatchesHome()
	52	+ {
	53	+ return $this->hasMany(
	54	+ MatchResult::class,
	55	+ 'home_team_id'
	56	+ )->where('simulated', true)
	57	+ ->orderBy('updated_at', 'DESC')
	58	+ ->limit(self::PLAYED_LIMIT);
	59	+ }
60	60
61		- /**
62		- * @return mixed
63		- */
64		- public function futureMatchesHome()
65		- {
66		- return $this->hasMany(
67		- MatchResult::class,
68		- 'home_team_id'
69		- )->where('simulated', false)
70		- ->orderBy('updated_at', 'DESC')
71		- ->limit(self::FUTURE_LIMIT);
72		- }
	61	+ /**
	62	+ * @return mixed
	63	+ */
	64	+ public function futureMatchesHome()
	65	+ {
	66	+ return $this->hasMany(
	67	+ MatchResult::class,
	68	+ 'home_team_id'
	69	+ )->where('simulated', false)
	70	+ ->orderBy('updated_at', 'DESC')
	71	+ ->limit(self::FUTURE_LIMIT);
	72	+ }
73	73
74		- /**
75		- * @return mixed
76		- */
77		- public function playedMatchesAway()
78		- {
79		- return $this->hasMany(
80		- MatchResult::class,
81		- 'away_team_id'
82		- )->where('simulated', true)
83		- ->orderBy('updated_at', 'DESC')
84		- ->limit(self::PLAYED_LIMIT);
85		- }
	74	+ /**
	75	+ * @return mixed
	76	+ */
	77	+ public function playedMatchesAway()
	78	+ {
	79	+ return $this->hasMany(
	80	+ MatchResult::class,
	81	+ 'away_team_id'
	82	+ )->where('simulated', true)
	83	+ ->orderBy('updated_at', 'DESC')
	84	+ ->limit(self::PLAYED_LIMIT);
	85	+ }
86	86
87		- /**
88		- * @return mixed
89		- */
90		- public function futureMatchesAway()
91		- {
92		- return $this->hasMany(
93		- MatchResult::class,
94		- 'away_team_id'
95		- )->where('simulated', false)
96		- ->orderBy('updated_at', 'DESC')
97		- ->limit(self::FUTURE_LIMIT);
98		- }
	87	+ /**
	88	+ * @return mixed
	89	+ */
	90	+ public function futureMatchesAway()
	91	+ {
	92	+ return $this->hasMany(
	93	+ MatchResult::class,
	94	+ 'away_team_id'
	95	+ )->where('simulated', false)
	96	+ ->orderBy('updated_at', 'DESC')
	97	+ ->limit(self::FUTURE_LIMIT);
	98	+ }
99	99
100	100
101		- /**
102		- * @param $query
103		- * @return mixed
104		- */
105		- public function scopeComplete($query)
106		- {
107		- return $query->with(
108		- 'roster',
109		- 'coach',
110		- 'playedMatchesHome',
111		- 'playedMatchesHome.awayTeam',
112		- 'futureMatchesHome',
113		- 'futureMatchesHome.awayTeam',
114		- 'playedMatchesAway',
115		- 'playedMatchesAway.homeTeam',
116		- 'futureMatchesAway',
117		- 'futureMatchesAway.homeTeam'
118		- );
119		- }
	101	+ /**
	102	+ * @param $query
	103	+ * @return mixed
	104	+ */
	105	+ public function scopeComplete($query)
	106	+ {
	107	+ return $query->with(
	108	+ 'roster',
	109	+ 'coach',
	110	+ 'playedMatchesHome',
	111	+ 'playedMatchesHome.awayTeam',
	112	+ 'futureMatchesHome',
	113	+ 'futureMatchesHome.awayTeam',
	114	+ 'playedMatchesAway',
	115	+ 'playedMatchesAway.homeTeam',
	116	+ 'futureMatchesAway',
	117	+ 'futureMatchesAway.homeTeam'
	118	+ );
	119	+ }
120	120
121		- /**
122		- * @return array
123		- */
124		- public static function getBest()
125		- {
126		- $result = Match::selectRaw('winner_id as id, COUNT(*) as won')
127		- ->whereNotNull('winner_id')->where('winner_id', '!=', 0)
128		- ->orderByRaw('COUNT(*) DESC')->groupBy('winner_id')
129		- ->take(20)->get()->keyBy('id')->toArray();
130		- $teams = Team::whereIn('id', array_keys($result))->get()->toArray();
131		- $result = array_map(function ($team) use ($result) {
132		- $team['stats'] = $result[$team['id']];
133		- return $team;
134		- }, $teams);
	121	+ /**
	122	+ * @return array
	123	+ */
	124	+ public static function getBest()
	125	+ {
	126	+ $result = Match::selectRaw('winner_id as id, COUNT(*) as won')
	127	+ ->whereNotNull('winner_id')->where('winner_id', '!=', 0)
	128	+ ->orderByRaw('COUNT(*) DESC')->groupBy('winner_id')
	129	+ ->take(20)->get()->keyBy('id')->toArray();
	130	+ $teams = Team::whereIn('id', array_keys($result))->get()->toArray();
	131	+ $result = array_map(function ($team) use ($result) {
	132	+ $team['stats'] = $result[$team['id']];
	133	+ return $team;
	134	+ }, $teams);
135	135
136		- return $result;
137		- }
	136	+ return $result;
	137	+ }
138	138
139	139	}
140	140	\ No newline at end of file

		@@ -128,7 +128,7 @@
		block discarded – undo
128	128	->orderByRaw('COUNT(*) DESC')->groupBy('winner_id')
129	129	->take(20)->get()->keyBy('id')->toArray();
130	130	$teams = Team::whereIn('id', array_keys($result))->get()->toArray();
131		- $result = array_map(function ($team) use ($result) {
	131	+ $result = array_map(function($team) use ($result) {
132	132	$team['stats'] = $result[$team['id']];
133	133	return $team;
134	134	}, $teams);

		@@ -9,48 +9,48 @@
		block discarded – undo
9	9	*/
10	10	class Responder
11	11	{
12		- /**
13		- * @param $content
14		- * @param $response
15		- * @param array $headers
16		- * @return mixed
17		- */
18		- public static function getJsonResponse($content, $response, $headers = [])
19		- {
20		- $headers['Content-Type'] = 'application/json';
21		- return self::getResponse(
22		- $headers,
23		- $content,
24		- $response
25		- );
26		- }
	12	+ /**
	13	+ * @param $content
	14	+ * @param $response
	15	+ * @param array $headers
	16	+ * @return mixed
	17	+ */
	18	+ public static function getJsonResponse($content, $response, $headers = [])
	19	+ {
	20	+ $headers['Content-Type'] = 'application/json';
	21	+ return self::getResponse(
	22	+ $headers,
	23	+ $content,
	24	+ $response
	25	+ );
	26	+ }
27	27
28		- /**
29		- * @param array $headers
30		- * @param $content
31		- * @param $response
32		- * @return mixed
33		- */
34		- public static function getResponse($headers = [], $content, $response)
35		- {
36		- $body = $response->getBody();
37		- $body->write($content);
38		- $i = 0;
39		- foreach ($headers as $header => $value) {
40		- if ($i === 0) {
41		- $response = $response->withHeader(
42		- $header,
43		- $value
44		- );
45		- } else {
46		- $response = $response->withAddedHeader(
47		- $header,
48		- $value
49		- );
50		- }
51		- $i++;
52		- }
53		- return $response->withBody($body);
54		- }
	28	+ /**
	29	+ * @param array $headers
	30	+ * @param $content
	31	+ * @param $response
	32	+ * @return mixed
	33	+ */
	34	+ public static function getResponse($headers = [], $content, $response)
	35	+ {
	36	+ $body = $response->getBody();
	37	+ $body->write($content);
	38	+ $i = 0;
	39	+ foreach ($headers as $header => $value) {
	40	+ if ($i === 0) {
	41	+ $response = $response->withHeader(
	42	+ $header,
	43	+ $value
	44	+ );
	45	+ } else {
	46	+ $response = $response->withAddedHeader(
	47	+ $header,
	48	+ $value
	49	+ );
	50	+ }
	51	+ $i++;
	52	+ }
	53	+ return $response->withBody($body);
	54	+ }
55	55
56	56	}
57	57	\ No newline at end of file

		@@ -9,104 +9,104 @@
		block discarded – undo
9	9	class Player extends DsManagerOrm
10	10	{
11	11
12		- /**
13		- * @var string
14		- */
15		- protected $table = 'players';
	12	+ /**
	13	+ * @var string
	14	+ */
	15	+ protected $table = 'players';
16	16
17		- /**
18		- * @var array
19		- */
20		- protected $fillable = [
21		- 'name',
22		- 'surname',
23		- 'age',
24		- 'nationality',
25		- 'skillAvg',
26		- 'wageReq',
27		- 'val',
28		- 'role',
29		- 'team_id'
30		- ];
	17	+ /**
	18	+ * @var array
	19	+ */
	20	+ protected $fillable = [
	21	+ 'name',
	22	+ 'surname',
	23	+ 'age',
	24	+ 'nationality',
	25	+ 'skillAvg',
	26	+ 'wageReq',
	27	+ 'val',
	28	+ 'role',
	29	+ 'team_id'
	30	+ ];
31	31
32		- /**
33		- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
34		- */
35		- public function team()
36		- {
37		- return $this->belongsTo(Team::class);
38		- }
	32	+ /**
	33	+ * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
	34	+ */
	35	+ public function team()
	36	+ {
	37	+ return $this->belongsTo(Team::class);
	38	+ }
39	39
40		- /**
41		- * @return mixed
42		- */
43		- public function lastMatches()
44		- {
45		- return $this->hasMany(MatchPlayer::class)
46		- ->orderBy('updated_at', 'DESC')
47		- ->limit(5);
48		- }
	40	+ /**
	41	+ * @return mixed
	42	+ */
	43	+ public function lastMatches()
	44	+ {
	45	+ return $this->hasMany(MatchPlayer::class)
	46	+ ->orderBy('updated_at', 'DESC')
	47	+ ->limit(5);
	48	+ }
49	49
50		- /**
51		- * @return mixed
52		- */
53		- public function goals()
54		- {
55		- return $this->hasOne(MatchPlayer::class)
56		- ->selectRaw('player_id, sum(goals) as count')
57		- ->groupBy('player_id');
58		- }
	50	+ /**
	51	+ * @return mixed
	52	+ */
	53	+ public function goals()
	54	+ {
	55	+ return $this->hasOne(MatchPlayer::class)
	56	+ ->selectRaw('player_id, sum(goals) as count')
	57	+ ->groupBy('player_id');
	58	+ }
59	59
60		- /**
61		- * @return mixed
62		- */
63		- public function appearances()
64		- {
65		- return $this->hasOne(MatchPlayer::class)
66		- ->selectRaw('player_id, count(match_id) as count')
67		- ->groupBy('player_id');
68		- }
	60	+ /**
	61	+ * @return mixed
	62	+ */
	63	+ public function appearances()
	64	+ {
	65	+ return $this->hasOne(MatchPlayer::class)
	66	+ ->selectRaw('player_id, count(match_id) as count')
	67	+ ->groupBy('player_id');
	68	+ }
69	69
70		- /**
71		- * @return mixed
72		- */
73		- public function avg()
74		- {
75		- return $this->hasOne(MatchPlayer::class)
76		- ->selectRaw('player_id, round(avg(vote),2) as avg')
77		- ->groupBy('player_id');
78		- }
	70	+ /**
	71	+ * @return mixed
	72	+ */
	73	+ public function avg()
	74	+ {
	75	+ return $this->hasOne(MatchPlayer::class)
	76	+ ->selectRaw('player_id, round(avg(vote),2) as avg')
	77	+ ->groupBy('player_id');
	78	+ }
79	79
80		- /**
81		- * @param $query
82		- * @return mixed
83		- */
84		- public function scopeStatistics($query)
85		- {
86		- return $query->with(
87		- 'goals',
88		- 'appearances',
89		- 'avg',
90		- 'lastMatches',
91		- 'team'
92		- );
93		- }
	80	+ /**
	81	+ * @param $query
	82	+ * @return mixed
	83	+ */
	84	+ public function scopeStatistics($query)
	85	+ {
	86	+ return $query->with(
	87	+ 'goals',
	88	+ 'appearances',
	89	+ 'avg',
	90	+ 'lastMatches',
	91	+ 'team'
	92	+ );
	93	+ }
94	94
95		- /**
96		- * @return array
97		- */
98		- public static function getBest()
99		- {
100		- $result = MatchPlayer::selectRaw(
101		- 'player_id, COUNT(*) as appearances ,AVG(vote) avg, SUM(goals) goals'
102		- )->where('goals', '>', 0)
103		- ->orderByRaw('SUM(goals) DESC,COUNT(*) DESC')
104		- ->groupBy('player_id')->take(20)->get()->keyBy('player_id')->toArray();
105		- $players = Player::whereIn('id', array_keys($result))->get()->toArray();
106		- $result = array_map(function ($player) use ($result) {
107		- $player['stats'] = $result[$player['id']];
108		- return $player;
109		- }, $players);
110		- return $result;
111		- }
	95	+ /**
	96	+ * @return array
	97	+ */
	98	+ public static function getBest()
	99	+ {
	100	+ $result = MatchPlayer::selectRaw(
	101	+ 'player_id, COUNT(*) as appearances ,AVG(vote) avg, SUM(goals) goals'
	102	+ )->where('goals', '>', 0)
	103	+ ->orderByRaw('SUM(goals) DESC,COUNT(*) DESC')
	104	+ ->groupBy('player_id')->take(20)->get()->keyBy('player_id')->toArray();
	105	+ $players = Player::whereIn('id', array_keys($result))->get()->toArray();
	106	+ $result = array_map(function ($player) use ($result) {
	107	+ $player['stats'] = $result[$player['id']];
	108	+ return $player;
	109	+ }, $players);
	110	+ return $result;
	111	+ }
112	112	}
113	113	\ No newline at end of file

		@@ -103,7 +103,7 @@
		block discarded – undo
103	103	->orderByRaw('SUM(goals) DESC,COUNT(*) DESC')
104	104	->groupBy('player_id')->take(20)->get()->keyBy('player_id')->toArray();
105	105	$players = Player::whereIn('id', array_keys($result))->get()->toArray();
106		- $result = array_map(function ($player) use ($result) {
	106	+ $result = array_map(function($player) use ($result) {
107	107	$player['stats'] = $result[$player['id']];
108	108	return $player;
109	109	}, $players);

vikkio88 / dsManager-php

Push — master ( 3a0efc...84f561 )

Status

Category

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

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

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

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

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

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