Inspection of "Filter and preset fixes" - Heroyt/tournament-generator - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 597f0f...0dd9ad )

by Tomáš

created 2019-07-27 23:21 UTC

Status

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -12,7 +12,9 @@
 block discarded – undo
 
 	public function generate() {
 
-		if (count($this->getTeams()) === 0) throw new \Exception('Couldn\'t generate 2R2G tournament because there are no teams in the tournament.');
+		if (count($this->getTeams()) === 0) {
+			throw new \Exception('Couldn\'t generate 2R2G tournament because there are no teams in the tournament.');
+		}
 
 
 		$round1 = $this->round('Round 1');

Please login to merge, or discard this patch.

src/classes/class_category.php 1 patch

Braces +20 added lines, -9 removed lines patch added patch discarded remove patch

@@ -21,8 +21,11 @@  discard block
 block discarded – undo
 
 	public function addRound(Round ...$rounds){
 		foreach ($rounds as $round) {
-			if ($round instanceof Round) $this->rounds[] = $round;
-			else throw new \Exception('Trying to add round which is not an instance of Round class.');
+			if ($round instanceof Round) {
+				$this->rounds[] = $round;
+			} else {
+				throw new \Exception('Trying to add round which is not an instance of Round class.');
+			}
 		}
 		return $this;
 	}
@@ -55,13 +58,15 @@  discard block
 block discarded – undo
 		foreach ($teams as $team) {
 			if ($team instanceof Team)  {
 				$this->teams[] = $team;
-			}
-			elseif (gettype($team) === 'array') {
+			} elseif (gettype($team) === 'array') {
 				foreach ($team as $team2) {
-					if ($team2 instanceof Team) $this->teams[] = $team2;
+					if ($team2 instanceof Team) {
+						$this->teams[] = $team2;
+					}
 				}
+			} else {
+				throw new \Exception('Trying to add team which is not an instance of Team class');
 			}
-			else throw new \Exception('Trying to add team which is not an instance of Team class');
 		}
 		return $this;
 	}
@@ -71,7 +76,9 @@  discard block
 block discarded – undo
 		return $t;
 	}
 	public function getTeams() {
-		if (count($this->teams) > 0) return $this->teams;
+		if (count($this->teams) > 0) {
+			return $this->teams;
+		}
 		$teams = [];
 		foreach ($this->rounds as $round) {
 			$teams = array_merge($teams, $round->getTeams());
@@ -90,7 +97,9 @@  discard block
 block discarded – undo
 
 	public function splitTeams(...$rounds) {
 
-		if (count($rounds) === 0) $rounds = $this->getRounds();
+		if (count($rounds) === 0) {
+			$rounds = $this->getRounds();
+		}
 
 		$teams = $this->getTeams();
 		shuffle($teams);
@@ -110,7 +119,9 @@  discard block
 block discarded – undo
 
 	public function genGamesSimulate() {
 		$games = [];
-		if (count($this->rounds) <= 0) throw new \Exception('There are no rounds to simulate games from.');
+		if (count($this->rounds) <= 0) {
+			throw new \Exception('There are no rounds to simulate games from.');
+		}
 		foreach ($this->rounds as $round) {
 			$games = array_merge($games, $round->genGames());
 			$round->simulate()->progress(true)->resetGames();

Please login to merge, or discard this patch.

src/classes/class_game.php 1 patch

Braces +26 added lines, -12 removed lines patch added patch discarded remove patch

@@ -33,11 +33,15 @@  discard block
 block discarded – undo
 		$this->teams = $teams;
 		foreach ($this->teams as $team) {
 			foreach ($this->teams as $team2) {
-				if ($team === $team2) continue;
+				if ($team === $team2) {
+					continue;
+				}
 				$team->addGameWith($team2, $group);
 			}
 		}
-		if (count($error) > 0) throw new \Exception('Trying to add teams ('.count($error).') that are not instance of Team class'.PHP_EOL.print_r($error, true));
+		if (count($error) > 0) {
+			throw new \Exception('Trying to add teams ('.count($error).') that are not instance of Team class'.PHP_EOL.print_r($error, true));
+		}
 	}
 
 	public function getGroup() {
@@ -56,14 +60,18 @@  discard block
 block discarded – undo
 			$team->addGame($this);
 
 			foreach ($this->teams as $team2) {
-				if ($team === $team2) continue;
+				if ($team === $team2) {
+					continue;
+				}
 				if ($team instanceof Team) {
 					$team->addGameWith($team2, $this->group);
 					$team2->addGameWith($team, $this->group);
 				}
 			}
 		}
-		if (count($error) > 0) throw new \Exception('Trying to add teams ('.count($error).') that are not instance of Team class'.PHP_EOL.print_r($error, true));
+		if (count($error) > 0) {
+			throw new \Exception('Trying to add teams ('.count($error).') that are not instance of Team class'.PHP_EOL.print_r($error, true));
+		}
 		return $this;
 	}
 	public function getTeams(){
@@ -74,7 +82,9 @@  discard block
 block discarded – undo
 	}
 	public function getTeam(string $id) {
 		foreach ($this->teams as $team) {
-			if ($team->id === $id) return $team;
+			if ($team->id === $id) {
+				return $team;
+			}
 		}
 		return false;
 	}
@@ -85,13 +95,17 @@  discard block
 block discarded – undo
 	* )
 	*/
 	public function setResults(array $results = []) {
-		if (count($this->results) === 0) $this->resetResults();
+		if (count($this->results) === 0) {
+			$this->resetResults();
+		}
 		arsort($results);
 		$inGame = /** @scrutinizer ignore-call */ $this->group->getInGame();
 		$i = 1;
 		foreach ($results as $id => $score) {
 			$team = $this->getTeam($id);
-			if ($team === false) throw new \Exception('Couldn\'t find team with id of "'.$id.'"');
+			if ($team === false) {
+				throw new \Exception('Couldn\'t find team with id of "'.$id.'"');
+			}
 			$this->results[$team->id] = ['score' => $score];
 			$team->sumScore += $score;
 			$prev = prev($results);
@@ -118,13 +132,11 @@  discard block
 block discarded – undo
 			$this->drawIds[] = $team->id;
 			$team->addDraw($this->group->id);
 			$this->results[$team->id] += ['points' => $this->group->drawPoints, 'type' => 'draw'];
-		}
-		elseif ($i === 1) {
+		} elseif ($i === 1) {
 			$this->winId = $team->id;
 			$team->addWin($this->group->id);
 			$this->results[$team->id] += ['points' => $this->group->winPoints, 'type' => 'win'];
-		}
-		else {
+		} else {
 			$this->lossId = $team->id;
 			$team->addLoss($this->group->id);
 			$this->results[$team->id] += ['points' => $this->group->lostPoints, 'type' => 'loss'];
@@ -220,7 +232,9 @@  discard block
 block discarded – undo
 	}
 
 	public function isPlayed() {
-		if (count($this->results) > 0) return true;
+		if (count($this->results) > 0) {
+			return true;
+		}
 		return false;
 	}
 }

Please login to merge, or discard this patch.

src/classes/class_progression.php 1 patch

Braces +18 added lines, -7 removed lines patch added patch discarded remove patch

@@ -27,18 +27,26 @@  discard block
 block discarded – undo
 
 	public function addFilter(...$filters) {
 		foreach ($filters as $filter) {
-			if (!$filter instanceof TeamFilter) throw new \Exception('Trying to add filter which is not an instance of TeamFilter.');
+			if (!$filter instanceof TeamFilter) {
+				throw new \Exception('Trying to add filter which is not an instance of TeamFilter.');
+			}
 			$this->filters[] = $filter;
 		}
 		return $this;
 	}
 
 	public function progress(bool $blank = false) {
-		if ($blank) $teams = $this->from->isPlayed() ? $this->from->sortTeams($this->filters) : $this->from->simulate($this->filters);
-		else $teams = $this->from->sortTeams($this->filters);
+		if ($blank) {
+			$teams = $this->from->isPlayed() ? $this->from->sortTeams($this->filters) : $this->from->simulate($this->filters);
+		} else {
+			$teams = $this->from->sortTeams($this->filters);
+		}
 
-		if (count($this->filters) === 0 || $this->len !== null || $this->start !== 0) $next = array_splice($teams, $this->start, ($this->len === null ? count($teams) : $this->len));
-		else $next = $teams;
+		if (count($this->filters) === 0 || $this->len !== null || $this->start !== 0) {
+			$next = array_splice($teams, $this->start, ($this->len === null ? count($teams) : $this->len));
+		} else {
+			$next = $teams;
+		}
 
 		$i = 1;
 
@@ -46,12 +54,15 @@  discard block
 block discarded – undo
 			if ($blank) {
 				$this->to->addTeam(new BlankTeam($this.' - '.$i, $team));
 				$i++;
+			} else {
+				$team->sumPoints += $this->from->progressPoints;
 			}
-			else $team->sumPoints += $this->from->progressPoints;
 		}
 
 		$this->from->addProgressed($next);
-		if (!$blank) $this->to->addTeam($next);
+		if (!$blank) {
+			$this->to->addTeam($next);
+		}
 		return $this;
 	}
 

Please login to merge, or discard this patch.

src/classes/class_team.php 1 patch

Braces +51 added lines, -17 removed lines patch added patch discarded remove patch

@@ -44,104 +44,138 @@
 block discarded – undo
 	}
 
 	public function addGameWith(Team $team, Group $group) {
-		if (!isset($this->gamesWith[$group->id][$team->id])) $this->gamesWith[$group->id][$team->id] = 0;
+		if (!isset($this->gamesWith[$group->id][$team->id])) {
+			$this->gamesWith[$group->id][$team->id] = 0;
+		}
 		$this->gamesWith[$group->id][$team->id]++;
 		return $this;
 	}
 	public function addGroup(Group $group) {
-		if (!isset($this->games[$group->id])) $this->games[$group->id] = [];
+		if (!isset($this->games[$group->id])) {
+			$this->games[$group->id] = [];
+		}
 		return $this;
 	}
 	public function addGame(Game $game) {
 		$group = $game->getGroup();
-		if (!isset($this->games[$group->id])) $this->games[$group->id] = [];
+		if (!isset($this->games[$group->id])) {
+			$this->games[$group->id] = [];
+		}
 		$this->games[$group->id][] = $game;
 		return $this;
 	}
 
 	public function addWin(string $groupId = ''){
-		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		if (!isset($this->groupResults[$groupId])) {
+			throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		}
 		$this->groupResults[$groupId]['points'] += $this->groupResults[$groupId]['group']->winPoints;
 		$this->sumPoints += $this->groupResults[$groupId]['group']->winPoints;
 		$this->groupResults[$groupId]['wins']++;
 		return $this;
 	}
 	public function removeWin(string $groupId = ''){
-		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		if (!isset($this->groupResults[$groupId])) {
+			throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		}
 		$this->groupResults[$groupId]['points'] -= $this->groupResults[$groupId]['group']->winPoints;
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->winPoints;
 		$this->groupResults[$groupId]['wins']--;
 		return $this;
 	}
 	public function addDraw(string $groupId = ''){
-		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		if (!isset($this->groupResults[$groupId])) {
+			throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		}
 		$this->groupResults[$groupId]['points'] += $this->groupResults[$groupId]['group']->drawPoints;
 		$this->sumPoints += $this->groupResults[$groupId]['group']->drawPoints;
 		$this->groupResults[$groupId]['draws']++;
 		return $this;
 	}
 	public function removeDraw(string $groupId = ''){
-		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		if (!isset($this->groupResults[$groupId])) {
+			throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		}
 		$this->groupResults[$groupId]['points'] -= $this->groupResults[$groupId]['group']->drawPointsPoints;
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->drawPoints;
 		$this->groupResults[$groupId]['draws']--;
 		return $this;
 	}
 	public function addLoss(string $groupId = ''){
-		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		if (!isset($this->groupResults[$groupId])) {
+			throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		}
 		$this->groupResults[$groupId]['points'] += $this->groupResults[$groupId]['group']->lostPoints;
 		$this->sumPoints += $this->groupResults[$groupId]['group']->lostPoints;
 		$this->groupResults[$groupId]['losses']++;
 		return $this;
 	}
 	public function removeLoss(string $groupId = ''){
-		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		if (!isset($this->groupResults[$groupId])) {
+			throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		}
 		$this->groupResults[$groupId]['points'] -= $this->groupResults[$groupId]['group']->lostPoints;
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->lostPoints;
 		$this->groupResults[$groupId]['losses']--;
 		return $this;
 	}
 	public function addSecond(string $groupId = ''){
-		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		if (!isset($this->groupResults[$groupId])) {
+			throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		}
 		$this->groupResults[$groupId]['points'] += $this->groupResults[$groupId]['group']->secondPoints;
 		$this->sumPoints += $this->groupResults[$groupId]['group']->secondPoints;
 		$this->groupResults[$groupId]['second']++;
 		return $this;
 	}
 	public function removeSecond(string $groupId = ''){
-		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		if (!isset($this->groupResults[$groupId])) {
+			throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		}
 		$this->groupResults[$groupId]['points'] -= $this->groupResults[$groupId]['group']->secondPoints;
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->secondPoints;
 		$this->groupResults[$groupId]['second']--;
 		return $this;
 	}
 	public function addThird(string $groupId = ''){
-		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		if (!isset($this->groupResults[$groupId])) {
+			throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		}
 		$this->groupResults[$groupId]['points'] += $this->groupResults[$groupId]['group']->thirdPoints;
 		$this->sumPoints += $this->groupResults[$groupId]['group']->thirdPoints;
 		$this->groupResults[$groupId]['third']++;
 		return $this;
 	}
 	public function removeThird(string $groupId = ''){
-		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		if (!isset($this->groupResults[$groupId])) {
+			throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
+		}
 		$this->groupResults[$groupId]['points'] -= $this->groupResults[$groupId]['group']->thirdPoints;
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->thirdPoints;
 		$this->groupResults[$groupId]['third']--;
 		return $this;
 	}
 	public function sumPoints(array $groupIds = []) {
-		if (count($groupIds) === 0) return $this->sumPoints;
+		if (count($groupIds) === 0) {
+			return $this->sumPoints;
+		}
 		$sum = 0;
 		foreach ($groupIds as $gid) {
-			if (isset($this->groupResults[$gid])) $sum += $this->groupResults[$gid]['points'];
+			if (isset($this->groupResults[$gid])) {
+				$sum += $this->groupResults[$gid]['points'];
+			}
 		}
 		return $sum;
 	}
 	public function sumScore(array $groupIds = []) {
-		if (count($groupIds) === 0) return $this->sumScore;
+		if (count($groupIds) === 0) {
+			return $this->sumScore;
+		}
 		$sum = 0;
 		foreach ($groupIds as $gid) {
-			if (isset($this->groupResults[$gid])) $sum += $this->groupResults[$gid]['score'];
+			if (isset($this->groupResults[$gid])) {
+				$sum += $this->groupResults[$gid]['score'];
+			}
 		}
 		return $sum;
 	}

Please login to merge, or discard this patch.

src/classes/class_sorter_games.php 1 patch

Braces +27 added lines, -9 removed lines patch added patch discarded remove patch

@@ -36,7 +36,9 @@  discard block
 block discarded – undo
 
 		$games = $this->group->getGames();
 
-		if (count($games) <= 4) return $games;
+		if (count($games) <= 4) {
+			return $games;
+		}
 
 		$this->games = [];
 
@@ -48,24 +50,34 @@  discard block
 block discarded – undo
 		while (count($games) > 0) {
 			// CYCLE 1
 			// TEAM WHICH DIDN'T PLAY IN LAST GAME (< 4)
-			if ($this->cycle1($games, $teams)) continue;
+			if ($this->cycle1($games, $teams)) {
+				continue;
+			}
 
 			// CYCLE 2
 			// NOT TEAM WHICH PLAYED IN LAST TWO GAMES (NOT 6 or 7)
-			if ($this->cycle2($games, $teams)) continue;
+			if ($this->cycle2($games, $teams)) {
+				continue;
+			}
 
 			// CYCLE 3
 			// NOT TEAM WHICH PLAYED IN LAST THREE GAMES (NOT 7)
 			// TEAMS THAT DIDN'T PLAY IN LAST GAME WILL PLAY THIS GAME (< 4)
-			if ($this->cycle3($games, $teams)) continue;
+			if ($this->cycle3($games, $teams)) {
+				continue;
+			}
 
 			// CYCLE 4
 			// NOT TEAM WHICH PLAYED IN LAST THREE GAMES (NOT 7)
-			if ($this->cycle4($games, $teams)) continue;
+			if ($this->cycle4($games, $teams)) {
+				continue;
+			}
 
 			// CYCLE 5
 			// TEAMS THAT DIDN'T PLAY IN LAST GAME WILL PLAY THIS GAME (< 4)
-			if ($this->cycle5($games, $teams)) continue;
+			if ($this->cycle5($games, $teams)) {
+				continue;
+			}
 
 			// CYCLE 6
 			// FIRST AVAILABLE GAME
@@ -174,11 +186,17 @@  discard block
 block discarded – undo
 		$requiredTeams = array_filter($teams, function($a) use ($required) { return in_array($a, $required); });
 
 		foreach ($game->getTeamsIds() as $tid) {
-			if (in_array($teams[$tid], $checkVals)) return false;
-			if (isset($requiredTeams[$tid])) unset($requiredTeams[$tid]);
+			if (in_array($teams[$tid], $checkVals)) {
+				return false;
+			}
+			if (isset($requiredTeams[$tid])) {
+				unset($requiredTeams[$tid]);
+			}
 		}
 
-		if (count($requiredTeams) > 0) return false;
+		if (count($requiredTeams) > 0) {
+			return false;
+		}
 
 		return true;
 

Please login to merge, or discard this patch.

src/classes/class_generator.php 1 patch

Braces +30 added lines, -10 removed lines patch added patch discarded remove patch

@@ -36,8 +36,11 @@  discard block
 block discarded – undo
 
 
 	public function setType(/** @scrutinizer ignore-all */ string $type = \R_R) {
-		if (in_array($type, \groupTypes)) $this->type = $type;
-		else throw new \Exception('Unknown group type: '.$type);
+		if (in_array($type, \groupTypes)) {
+			$this->type = $type;
+		} else {
+			throw new \Exception('Unknown group type: '.$type);
+		}
 		return $this;
 	}
 	public function getType() {
@@ -45,7 +48,9 @@  discard block
 block discarded – undo
 	}
 
 	public function setInGame(int $inGame) {
-		if ($inGame < 2 ||  $inGame > 4) throw new \Exception('Expected 2,3 or 4 as inGame '.$inGame.' given');
+		if ($inGame < 2 ||  $inGame > 4) {
+			throw new \Exception('Expected 2,3 or 4 as inGame '.$inGame.' given');
+		}
 		$this->inGame = $inGame;
 		return $this;
 	}
@@ -54,7 +59,9 @@  discard block
 block discarded – undo
 	}
 
 	public function setMaxSize(int $maxSize) {
-		if ($maxSize < 2) throw new \Exception('Max group size has to be at least 2, '.$maxSize.' given');
+		if ($maxSize < 2) {
+			throw new \Exception('Max group size has to be at least 2, '.$maxSize.' given');
+		}
 		$this->maxSize = $maxSize;
 		return $this;
 	}
@@ -80,7 +87,9 @@  discard block
 block discarded – undo
 					$this->group->game($tInGame);
 				}
 
-				if (count($discard) > 0 && !$this->allowSkip) throw new \Exception('Couldn\'t make games with all teams. Expected k*'.$this->inGame.' teams '.$count.' teams given - discarting '.count($discard).' teams ('.implode(', ', $discard).') in group '.$this->group.' - allow skip '.($this->allowSkip ? 'True' : 'False'));
+				if (count($discard) > 0 && !$this->allowSkip) {
+					throw new \Exception('Couldn\'t make games with all teams. Expected k*'.$this->inGame.' teams '.$count.' teams given - discarting '.count($discard).' teams ('.implode(', ', $discard).') in group '.$this->group.' - allow skip '.($this->allowSkip ? 'True' : 'False'));
+				}
 				break;
 			case \COND_SPLIT:
 				$games = [];
@@ -95,19 +104,24 @@  discard block
 block discarded – undo
 					while ($g > 0) {
 						foreach ($games as $key => $group) {
 							$this->group->addGame(array_shift($games[$key]));
-							if (count($games[$key]) === 0) unset($games[$key]);
+							if (count($games[$key]) === 0) {
+								unset($games[$key]);
+							}
 							$g--;
 						}
 					}
+				} else {
+					$this->group->addGame($this->r_rGames());
 				}
-				else $this->group->addGame($this->r_rGames());
 				break;
 		}
 		return $this->group->getGames();
 	}
 	public function r_rGames(array $teams = []) {
 		$games = [];
-		if (count($teams) === 0) $teams = $this->group->getTeams();
+		if (count($teams) === 0) {
+			$teams = $this->group->getTeams();
+		}
 		switch ($this->inGame) {
 			case 2:
 				$games = Generator::circle_genGames2($teams, $this->group);
@@ -154,7 +168,10 @@  discard block
 block discarded – undo
 	public static function circle_genGames2(array $teams = [], \tournamentGenerator\Group $group) {
 		$bracket = []; // ARRAY OF GAMES
 
-		if (count($teams) % 2 != 0) $teams[] = \DUMMY_TEAM; // IF NOT EVEN NUMBER OF TEAMS, ADD DUMMY
+		if (count($teams) % 2 != 0) {
+			$teams[] = \DUMMY_TEAM;
+		}
+		// IF NOT EVEN NUMBER OF TEAMS, ADD DUMMY
 
 		shuffle($teams); // SHUFFLE TEAMS FOR MORE RANDOMNESS
 
@@ -178,7 +195,10 @@  discard block
 block discarded – undo
 			$reverse = array_reverse($teams);
 			$away = $reverse[$i];
 
-			if (($home == \DUMMY_TEAM || $away == \DUMMY_TEAM)) continue; // SKIP WHEN DUMMY_TEAM IS PRESENT
+			if (($home == \DUMMY_TEAM || $away == \DUMMY_TEAM)) {
+				continue;
+			}
+			// SKIP WHEN DUMMY_TEAM IS PRESENT
 
 			$bracket[] = new \TournamentGenerator\Game([$home, $away], $group);
 

Please login to merge, or discard this patch.

src/classes/class_sorter_teams.php 1 patch

Braces +24 added lines, -8 removed lines patch added patch discarded remove patch

@@ -9,19 +9,27 @@  discard block
 block discarded – undo
 {
 
 	public static function sortGroup(array &$teams, \TournamentGenerator\Group $group, string $ordering = POINTS) {
-		if (!in_array($ordering, orderingTypes)) throw new \Exception('Unknown ordering type `'.$ordering.'`');
+		if (!in_array($ordering, orderingTypes)) {
+			throw new \Exception('Unknown ordering type `'.$ordering.'`');
+		}
 
 		switch ($ordering) {
 			case \POINTS:{
 				uasort($teams, function($a, $b) use ($group) {
-					if ($a->groupResults[$group->id]["points"] === $b->groupResults[$group->id]["points"] && $a->groupResults[$group->id]["score"] === $b->groupResults[$group->id]["score"]) return 0;
-					if ($a->groupResults[$group->id]["points"] === $b->groupResults[$group->id]["points"]) return ($a->groupResults[$group->id]["score"] > $b->groupResults[$group->id]["score"] ? -1 : 1);
+					if ($a->groupResults[$group->id]["points"] === $b->groupResults[$group->id]["points"] && $a->groupResults[$group->id]["score"] === $b->groupResults[$group->id]["score"]) {
+						return 0;
+					}
+					if ($a->groupResults[$group->id]["points"] === $b->groupResults[$group->id]["points"]) {
+						return ($a->groupResults[$group->id]["score"] > $b->groupResults[$group->id]["score"] ? -1 : 1);
+					}
 					return ($a->groupResults[$group->id]["points"] > $b->groupResults[$group->id]["points"] ? -1 : 1);
 				});
 				break;}
 			case \SCORE:{
 				uasort($teams, function($a, $b) use ($group) {
-					if ($a->groupResults[$group->id]["score"] === $b->groupResults[$group->id]["score"]) return 0;
+					if ($a->groupResults[$group->id]["score"] === $b->groupResults[$group->id]["score"]) {
+						return 0;
+					}
 					return ($a->groupResults[$group->id]["score"] > $b->groupResults[$group->id]["score"] ? -1 : 1);
 				});
 				break;}
@@ -30,21 +38,29 @@  discard block
 block discarded – undo
 		return $teams;
 	}
 	public static function sortRound(array &$teams, \TournamentGenerator\Round $round, string $ordering = POINTS) {
-		if (!in_array($ordering, orderingTypes)) throw new \Exception('Unknown ordering type `'.$ordering.'`');
+		if (!in_array($ordering, orderingTypes)) {
+			throw new \Exception('Unknown ordering type `'.$ordering.'`');
+		}
 
 		$groupsIds = $round->getGroupsIds();
 
 		switch ($ordering) {
 			case \POINTS:{
 				uasort($teams, function($a, $b) use ($groupsIds) {
-					if ($a->sumPoints($groupsIds) === $b->sumPoints($groupsIds) && $a->sumScore($groupsIds) === $b->sumScore($groupsIds)) return 0;
-					if ($a->sumPoints($groupsIds) === $b->sumPoints($groupsIds)) return ($a->sumScore($groupsIds) > $b->sumScore($groupsIds) ? -1 : 1);
+					if ($a->sumPoints($groupsIds) === $b->sumPoints($groupsIds) && $a->sumScore($groupsIds) === $b->sumScore($groupsIds)) {
+						return 0;
+					}
+					if ($a->sumPoints($groupsIds) === $b->sumPoints($groupsIds)) {
+						return ($a->sumScore($groupsIds) > $b->sumScore($groupsIds) ? -1 : 1);
+					}
 					return ($a->sumPoints($groupsIds) > $b->sumPoints($groupsIds) ? -1 : 1);
 				});
 				break;}
 			case \SCORE:{
 				uasort($teams, function($a, $b) use ($groupsIds) {
-					if ($a->sumScore($groupsIds) === $b->sumScore($groupsIds)) return 0;
+					if ($a->sumScore($groupsIds) === $b->sumScore($groupsIds)) {
+						return 0;
+					}
 					return ($a->sumScore($groupsIds) > $b->sumScore($groupsIds) ? -1 : 1);
 				});
 				break;}

Please login to merge, or discard this patch.

src/classes/class_round.php 1 patch

Braces +20 added lines, -9 removed lines patch added patch discarded remove patch

@@ -25,8 +25,11 @@  discard block
 block discarded – undo
 
 	public function addGroup(Group ...$groups){
 		foreach ($groups as $group) {
-			if ($group instanceof Group) $this->groups[] = $group;
-			else throw new \Exception('Trying to add group which is not an instance of Group class.');
+			if ($group instanceof Group) {
+				$this->groups[] = $group;
+			} else {
+				throw new \Exception('Trying to add group which is not an instance of Group class.');
+			}
 		}
 		return $this;
 	}
@@ -77,7 +80,9 @@  discard block
 block discarded – undo
 	}
 	public function isPlayed(){
 		foreach ($this->groups as $group) {
-			if (!$group->isPlayed()) return false;
+			if (!$group->isPlayed()) {
+				return false;
+			}
 		}
 		return true;
 	}
@@ -86,10 +91,11 @@  discard block
 block discarded – undo
 		foreach ($teams as $team) {
 			if ($team instanceof Team)  {
 				$this->teams[] = $team;
-			}
-			elseif (gettype($team) === 'array') {
+			} elseif (gettype($team) === 'array') {
 				foreach ($team as $team2) {
-					if ($team2 instanceof Team) $this->teams[] = $team2;
+					if ($team2 instanceof Team) {
+						$this->teams[] = $team2;
+					}
 					$team2->groupResults[$this->id] = [
 						'group' => $this,
 						'points' => 0,
@@ -101,8 +107,9 @@  discard block
 block discarded – undo
 						'third'  => 0
 					];
 				}
+			} else {
+				throw new \Exception('Trying to add team which is not an instance of Team class');
 			}
-			else throw new \Exception('Trying to add team which is not an instance of Team class');
 		}
 		return $this;
 	}
@@ -131,7 +138,9 @@  discard block
 block discarded – undo
 
 	public function splitTeams(...$groups) {
 
-		if (count($groups) === 0) $groups = $this->getGroups();
+		if (count($groups) === 0) {
+			$groups = $this->getGroups();
+		}
 
 		foreach ($groups as $key => $value) {
 			if (gettype($value) === 'array') {
@@ -146,7 +155,9 @@  discard block
 block discarded – undo
 		while (count($teams) > 0) {
 			foreach ($groups as $group) {
 				if ($group instanceof Group) {
-					if (count($teams) > 0) $group->addTeam(array_shift($teams));
+					if (count($teams) > 0) {
+						$group->addTeam(array_shift($teams));
+					}
 				}
 			}
 		}

Please login to merge, or discard this patch.

		@@ -12,7 +12,9 @@
		block discarded – undo
12	12
13	13	public function generate() {
14	14
15		- if (count($this->getTeams()) === 0) throw new \Exception('Couldn\'t generate 2R2G tournament because there are no teams in the tournament.');
	15	+ if (count($this->getTeams()) === 0) {
	16	+ throw new \Exception('Couldn\'t generate 2R2G tournament because there are no teams in the tournament.');
	17	+ }
16	18
17	19
18	20	$round1 = $this->round('Round 1');

		@@ -21,8 +21,11 @@ discard block
		block discarded – undo
21	21
22	22	public function addRound(Round ...$rounds){
23	23	foreach ($rounds as $round) {
24		- if ($round instanceof Round) $this->rounds[] = $round;
25		- else throw new \Exception('Trying to add round which is not an instance of Round class.');
	24	+ if ($round instanceof Round) {
	25	+ $this->rounds[] = $round;
	26	+ } else {
	27	+ throw new \Exception('Trying to add round which is not an instance of Round class.');
	28	+ }
26	29	}
27	30	return $this;
28	31	}
		@@ -55,13 +58,15 @@ discard block
		block discarded – undo
55	58	foreach ($teams as $team) {
56	59	if ($team instanceof Team) {
57	60	$this->teams[] = $team;
58		- }
59		- elseif (gettype($team) === 'array') {
	61	+ } elseif (gettype($team) === 'array') {
60	62	foreach ($team as $team2) {
61		- if ($team2 instanceof Team) $this->teams[] = $team2;
	63	+ if ($team2 instanceof Team) {
	64	+ $this->teams[] = $team2;
	65	+ }
62	66	}
	67	+ } else {
	68	+ throw new \Exception('Trying to add team which is not an instance of Team class');
63	69	}
64		- else throw new \Exception('Trying to add team which is not an instance of Team class');
65	70	}
66	71	return $this;
67	72	}
		@@ -71,7 +76,9 @@ discard block
		block discarded – undo
71	76	return $t;
72	77	}
73	78	public function getTeams() {
74		- if (count($this->teams) > 0) return $this->teams;
	79	+ if (count($this->teams) > 0) {
	80	+ return $this->teams;
	81	+ }
75	82	$teams = [];
76	83	foreach ($this->rounds as $round) {
77	84	$teams = array_merge($teams, $round->getTeams());
		@@ -90,7 +97,9 @@ discard block
		block discarded – undo
90	97
91	98	public function splitTeams(...$rounds) {
92	99
93		- if (count($rounds) === 0) $rounds = $this->getRounds();
	100	+ if (count($rounds) === 0) {
	101	+ $rounds = $this->getRounds();
	102	+ }
94	103
95	104	$teams = $this->getTeams();
96	105	shuffle($teams);
		@@ -110,7 +119,9 @@ discard block
		block discarded – undo
110	119
111	120	public function genGamesSimulate() {
112	121	$games = [];
113		- if (count($this->rounds) <= 0) throw new \Exception('There are no rounds to simulate games from.');
	122	+ if (count($this->rounds) <= 0) {
	123	+ throw new \Exception('There are no rounds to simulate games from.');
	124	+ }
114	125	foreach ($this->rounds as $round) {
115	126	$games = array_merge($games, $round->genGames());
116	127	$round->simulate()->progress(true)->resetGames();

		@@ -33,11 +33,15 @@ discard block
		block discarded – undo
33	33	$this->teams = $teams;
34	34	foreach ($this->teams as $team) {
35	35	foreach ($this->teams as $team2) {
36		- if ($team === $team2) continue;
	36	+ if ($team === $team2) {
	37	+ continue;
	38	+ }
37	39	$team->addGameWith($team2, $group);
38	40	}
39	41	}
40		- if (count($error) > 0) throw new \Exception('Trying to add teams ('.count($error).') that are not instance of Team class'.PHP_EOL.print_r($error, true));
	42	+ if (count($error) > 0) {
	43	+ throw new \Exception('Trying to add teams ('.count($error).') that are not instance of Team class'.PHP_EOL.print_r($error, true));
	44	+ }
41	45	}
42	46
43	47	public function getGroup() {
		@@ -56,14 +60,18 @@ discard block
		block discarded – undo
56	60	$team->addGame($this);
57	61
58	62	foreach ($this->teams as $team2) {
59		- if ($team === $team2) continue;
	63	+ if ($team === $team2) {
	64	+ continue;
	65	+ }
60	66	if ($team instanceof Team) {
61	67	$team->addGameWith($team2, $this->group);
62	68	$team2->addGameWith($team, $this->group);
63	69	}
64	70	}
65	71	}
66		- if (count($error) > 0) throw new \Exception('Trying to add teams ('.count($error).') that are not instance of Team class'.PHP_EOL.print_r($error, true));
	72	+ if (count($error) > 0) {
	73	+ throw new \Exception('Trying to add teams ('.count($error).') that are not instance of Team class'.PHP_EOL.print_r($error, true));
	74	+ }
67	75	return $this;
68	76	}
69	77	public function getTeams(){
		@@ -74,7 +82,9 @@ discard block
		block discarded – undo
74	82	}
75	83	public function getTeam(string $id) {
76	84	foreach ($this->teams as $team) {
77		- if ($team->id === $id) return $team;
	85	+ if ($team->id === $id) {
	86	+ return $team;
	87	+ }
78	88	}
79	89	return false;
80	90	}
		@@ -85,13 +95,17 @@ discard block
		block discarded – undo
85	95	* )
86	96	*/
87	97	public function setResults(array $results = []) {
88		- if (count($this->results) === 0) $this->resetResults();
	98	+ if (count($this->results) === 0) {
	99	+ $this->resetResults();
	100	+ }
89	101	arsort($results);
90	102	$inGame = /** @scrutinizer ignore-call */ $this->group->getInGame();
91	103	$i = 1;
92	104	foreach ($results as $id => $score) {
93	105	$team = $this->getTeam($id);
94		- if ($team === false) throw new \Exception('Couldn\'t find team with id of "'.$id.'"');
	106	+ if ($team === false) {
	107	+ throw new \Exception('Couldn\'t find team with id of "'.$id.'"');
	108	+ }
95	109	$this->results[$team->id] = ['score' => $score];
96	110	$team->sumScore += $score;
97	111	$prev = prev($results);
		@@ -118,13 +132,11 @@ discard block
		block discarded – undo
118	132	$this->drawIds[] = $team->id;
119	133	$team->addDraw($this->group->id);
120	134	$this->results[$team->id] += ['points' => $this->group->drawPoints, 'type' => 'draw'];
121		- }
122		- elseif ($i === 1) {
	135	+ } elseif ($i === 1) {
123	136	$this->winId = $team->id;
124	137	$team->addWin($this->group->id);
125	138	$this->results[$team->id] += ['points' => $this->group->winPoints, 'type' => 'win'];
126		- }
127		- else {
	139	+ } else {
128	140	$this->lossId = $team->id;
129	141	$team->addLoss($this->group->id);
130	142	$this->results[$team->id] += ['points' => $this->group->lostPoints, 'type' => 'loss'];
		@@ -220,7 +232,9 @@ discard block
		block discarded – undo
220	232	}
221	233
222	234	public function isPlayed() {
223		- if (count($this->results) > 0) return true;
	235	+ if (count($this->results) > 0) {
	236	+ return true;
	237	+ }
224	238	return false;
225	239	}
226	240	}

		@@ -27,18 +27,26 @@ discard block
		block discarded – undo
27	27
28	28	public function addFilter(...$filters) {
29	29	foreach ($filters as $filter) {
30		- if (!$filter instanceof TeamFilter) throw new \Exception('Trying to add filter which is not an instance of TeamFilter.');
	30	+ if (!$filter instanceof TeamFilter) {
	31	+ throw new \Exception('Trying to add filter which is not an instance of TeamFilter.');
	32	+ }
31	33	$this->filters[] = $filter;
32	34	}
33	35	return $this;
34	36	}
35	37
36	38	public function progress(bool $blank = false) {
37		- if ($blank) $teams = $this->from->isPlayed() ? $this->from->sortTeams($this->filters) : $this->from->simulate($this->filters);
38		- else $teams = $this->from->sortTeams($this->filters);
	39	+ if ($blank) {
	40	+ $teams = $this->from->isPlayed() ? $this->from->sortTeams($this->filters) : $this->from->simulate($this->filters);
	41	+ } else {
	42	+ $teams = $this->from->sortTeams($this->filters);
	43	+ }
39	44
40		- if (count($this->filters) === 0 \|\| $this->len !== null \|\| $this->start !== 0) $next = array_splice($teams, $this->start, ($this->len === null ? count($teams) : $this->len));
41		- else $next = $teams;
	45	+ if (count($this->filters) === 0 \|\| $this->len !== null \|\| $this->start !== 0) {
	46	+ $next = array_splice($teams, $this->start, ($this->len === null ? count($teams) : $this->len));
	47	+ } else {
	48	+ $next = $teams;
	49	+ }
42	50
43	51	$i = 1;
44	52
		@@ -46,12 +54,15 @@ discard block
		block discarded – undo
46	54	if ($blank) {
47	55	$this->to->addTeam(new BlankTeam($this.' - '.$i, $team));
48	56	$i++;
	57	+ } else {
	58	+ $team->sumPoints += $this->from->progressPoints;
49	59	}
50		- else $team->sumPoints += $this->from->progressPoints;
51	60	}
52	61
53	62	$this->from->addProgressed($next);
54		- if (!$blank) $this->to->addTeam($next);
	63	+ if (!$blank) {
	64	+ $this->to->addTeam($next);
	65	+ }
55	66	return $this;
56	67	}
57	68

		@@ -44,104 +44,138 @@
		block discarded – undo
44	44	}
45	45
46	46	public function addGameWith(Team $team, Group $group) {
47		- if (!isset($this->gamesWith[$group->id][$team->id])) $this->gamesWith[$group->id][$team->id] = 0;
	47	+ if (!isset($this->gamesWith[$group->id][$team->id])) {
	48	+ $this->gamesWith[$group->id][$team->id] = 0;
	49	+ }
48	50	$this->gamesWith[$group->id][$team->id]++;
49	51	return $this;
50	52	}
51	53	public function addGroup(Group $group) {
52		- if (!isset($this->games[$group->id])) $this->games[$group->id] = [];
	54	+ if (!isset($this->games[$group->id])) {
	55	+ $this->games[$group->id] = [];
	56	+ }
53	57	return $this;
54	58	}
55	59	public function addGame(Game $game) {
56	60	$group = $game->getGroup();
57		- if (!isset($this->games[$group->id])) $this->games[$group->id] = [];
	61	+ if (!isset($this->games[$group->id])) {
	62	+ $this->games[$group->id] = [];
	63	+ }
58	64	$this->games[$group->id][] = $game;
59	65	return $this;
60	66	}
61	67
62	68	public function addWin(string $groupId = ''){
63		- if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	69	+ if (!isset($this->groupResults[$groupId])) {
	70	+ throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	71	+ }
64	72	$this->groupResults[$groupId]['points'] += $this->groupResults[$groupId]['group']->winPoints;
65	73	$this->sumPoints += $this->groupResults[$groupId]['group']->winPoints;
66	74	$this->groupResults[$groupId]['wins']++;
67	75	return $this;
68	76	}
69	77	public function removeWin(string $groupId = ''){
70		- if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	78	+ if (!isset($this->groupResults[$groupId])) {
	79	+ throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	80	+ }
71	81	$this->groupResults[$groupId]['points'] -= $this->groupResults[$groupId]['group']->winPoints;
72	82	$this->sumPoints -= $this->groupResults[$groupId]['group']->winPoints;
73	83	$this->groupResults[$groupId]['wins']--;
74	84	return $this;
75	85	}
76	86	public function addDraw(string $groupId = ''){
77		- if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	87	+ if (!isset($this->groupResults[$groupId])) {
	88	+ throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	89	+ }
78	90	$this->groupResults[$groupId]['points'] += $this->groupResults[$groupId]['group']->drawPoints;
79	91	$this->sumPoints += $this->groupResults[$groupId]['group']->drawPoints;
80	92	$this->groupResults[$groupId]['draws']++;
81	93	return $this;
82	94	}
83	95	public function removeDraw(string $groupId = ''){
84		- if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	96	+ if (!isset($this->groupResults[$groupId])) {
	97	+ throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	98	+ }
85	99	$this->groupResults[$groupId]['points'] -= $this->groupResults[$groupId]['group']->drawPointsPoints;
86	100	$this->sumPoints -= $this->groupResults[$groupId]['group']->drawPoints;
87	101	$this->groupResults[$groupId]['draws']--;
88	102	return $this;
89	103	}
90	104	public function addLoss(string $groupId = ''){
91		- if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	105	+ if (!isset($this->groupResults[$groupId])) {
	106	+ throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	107	+ }
92	108	$this->groupResults[$groupId]['points'] += $this->groupResults[$groupId]['group']->lostPoints;
93	109	$this->sumPoints += $this->groupResults[$groupId]['group']->lostPoints;
94	110	$this->groupResults[$groupId]['losses']++;
95	111	return $this;
96	112	}
97	113	public function removeLoss(string $groupId = ''){
98		- if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	114	+ if (!isset($this->groupResults[$groupId])) {
	115	+ throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	116	+ }
99	117	$this->groupResults[$groupId]['points'] -= $this->groupResults[$groupId]['group']->lostPoints;
100	118	$this->sumPoints -= $this->groupResults[$groupId]['group']->lostPoints;
101	119	$this->groupResults[$groupId]['losses']--;
102	120	return $this;
103	121	}
104	122	public function addSecond(string $groupId = ''){
105		- if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	123	+ if (!isset($this->groupResults[$groupId])) {
	124	+ throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	125	+ }
106	126	$this->groupResults[$groupId]['points'] += $this->groupResults[$groupId]['group']->secondPoints;
107	127	$this->sumPoints += $this->groupResults[$groupId]['group']->secondPoints;
108	128	$this->groupResults[$groupId]['second']++;
109	129	return $this;
110	130	}
111	131	public function removeSecond(string $groupId = ''){
112		- if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	132	+ if (!isset($this->groupResults[$groupId])) {
	133	+ throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	134	+ }
113	135	$this->groupResults[$groupId]['points'] -= $this->groupResults[$groupId]['group']->secondPoints;
114	136	$this->sumPoints -= $this->groupResults[$groupId]['group']->secondPoints;
115	137	$this->groupResults[$groupId]['second']--;
116	138	return $this;
117	139	}
118	140	public function addThird(string $groupId = ''){
119		- if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	141	+ if (!isset($this->groupResults[$groupId])) {
	142	+ throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	143	+ }
120	144	$this->groupResults[$groupId]['points'] += $this->groupResults[$groupId]['group']->thirdPoints;
121	145	$this->sumPoints += $this->groupResults[$groupId]['group']->thirdPoints;
122	146	$this->groupResults[$groupId]['third']++;
123	147	return $this;
124	148	}
125	149	public function removeThird(string $groupId = ''){
126		- if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	150	+ if (!isset($this->groupResults[$groupId])) {
	151	+ throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
	152	+ }
127	153	$this->groupResults[$groupId]['points'] -= $this->groupResults[$groupId]['group']->thirdPoints;
128	154	$this->sumPoints -= $this->groupResults[$groupId]['group']->thirdPoints;
129	155	$this->groupResults[$groupId]['third']--;
130	156	return $this;
131	157	}
132	158	public function sumPoints(array $groupIds = []) {
133		- if (count($groupIds) === 0) return $this->sumPoints;
	159	+ if (count($groupIds) === 0) {
	160	+ return $this->sumPoints;
	161	+ }
134	162	$sum = 0;
135	163	foreach ($groupIds as $gid) {
136		- if (isset($this->groupResults[$gid])) $sum += $this->groupResults[$gid]['points'];
	164	+ if (isset($this->groupResults[$gid])) {
	165	+ $sum += $this->groupResults[$gid]['points'];
	166	+ }
137	167	}
138	168	return $sum;
139	169	}
140	170	public function sumScore(array $groupIds = []) {
141		- if (count($groupIds) === 0) return $this->sumScore;
	171	+ if (count($groupIds) === 0) {
	172	+ return $this->sumScore;
	173	+ }
142	174	$sum = 0;
143	175	foreach ($groupIds as $gid) {
144		- if (isset($this->groupResults[$gid])) $sum += $this->groupResults[$gid]['score'];
	176	+ if (isset($this->groupResults[$gid])) {
	177	+ $sum += $this->groupResults[$gid]['score'];
	178	+ }
145	179	}
146	180	return $sum;
147	181	}

		@@ -36,7 +36,9 @@ discard block
		block discarded – undo
36	36
37	37	$games = $this->group->getGames();
38	38
39		- if (count($games) <= 4) return $games;
	39	+ if (count($games) <= 4) {
	40	+ return $games;
	41	+ }
40	42
41	43	$this->games = [];
42	44
		@@ -48,24 +50,34 @@ discard block
		block discarded – undo
48	50	while (count($games) > 0) {
49	51	// CYCLE 1
50	52	// TEAM WHICH DIDN'T PLAY IN LAST GAME (< 4)
51		- if ($this->cycle1($games, $teams)) continue;
	53	+ if ($this->cycle1($games, $teams)) {
	54	+ continue;
	55	+ }
52	56
53	57	// CYCLE 2
54	58	// NOT TEAM WHICH PLAYED IN LAST TWO GAMES (NOT 6 or 7)
55		- if ($this->cycle2($games, $teams)) continue;
	59	+ if ($this->cycle2($games, $teams)) {
	60	+ continue;
	61	+ }
56	62
57	63	// CYCLE 3
58	64	// NOT TEAM WHICH PLAYED IN LAST THREE GAMES (NOT 7)
59	65	// TEAMS THAT DIDN'T PLAY IN LAST GAME WILL PLAY THIS GAME (< 4)
60		- if ($this->cycle3($games, $teams)) continue;
	66	+ if ($this->cycle3($games, $teams)) {
	67	+ continue;
	68	+ }
61	69
62	70	// CYCLE 4
63	71	// NOT TEAM WHICH PLAYED IN LAST THREE GAMES (NOT 7)
64		- if ($this->cycle4($games, $teams)) continue;
	72	+ if ($this->cycle4($games, $teams)) {
	73	+ continue;
	74	+ }
65	75
66	76	// CYCLE 5
67	77	// TEAMS THAT DIDN'T PLAY IN LAST GAME WILL PLAY THIS GAME (< 4)
68		- if ($this->cycle5($games, $teams)) continue;
	78	+ if ($this->cycle5($games, $teams)) {
	79	+ continue;
	80	+ }
69	81
70	82	// CYCLE 6
71	83	// FIRST AVAILABLE GAME
		@@ -174,11 +186,17 @@ discard block
		block discarded – undo
174	186	$requiredTeams = array_filter($teams, function($a) use ($required) { return in_array($a, $required); });
175	187
176	188	foreach ($game->getTeamsIds() as $tid) {
177		- if (in_array($teams[$tid], $checkVals)) return false;
178		- if (isset($requiredTeams[$tid])) unset($requiredTeams[$tid]);
	189	+ if (in_array($teams[$tid], $checkVals)) {
	190	+ return false;
	191	+ }
	192	+ if (isset($requiredTeams[$tid])) {
	193	+ unset($requiredTeams[$tid]);
	194	+ }
179	195	}
180	196
181		- if (count($requiredTeams) > 0) return false;
	197	+ if (count($requiredTeams) > 0) {
	198	+ return false;
	199	+ }
182	200
183	201	return true;
184	202

		@@ -36,8 +36,11 @@ discard block
		block discarded – undo
36	36
37	37
38	38	public function setType(/** @scrutinizer ignore-all */ string $type = \R_R) {
39		- if (in_array($type, \groupTypes)) $this->type = $type;
40		- else throw new \Exception('Unknown group type: '.$type);
	39	+ if (in_array($type, \groupTypes)) {
	40	+ $this->type = $type;
	41	+ } else {
	42	+ throw new \Exception('Unknown group type: '.$type);
	43	+ }
41	44	return $this;
42	45	}
43	46	public function getType() {
		@@ -45,7 +48,9 @@ discard block
		block discarded – undo
45	48	}
46	49
47	50	public function setInGame(int $inGame) {
48		- if ($inGame < 2 \|\| $inGame > 4) throw new \Exception('Expected 2,3 or 4 as inGame '.$inGame.' given');
	51	+ if ($inGame < 2 \|\| $inGame > 4) {
	52	+ throw new \Exception('Expected 2,3 or 4 as inGame '.$inGame.' given');
	53	+ }
49	54	$this->inGame = $inGame;
50	55	return $this;
51	56	}
		@@ -54,7 +59,9 @@ discard block
		block discarded – undo
54	59	}
55	60
56	61	public function setMaxSize(int $maxSize) {
57		- if ($maxSize < 2) throw new \Exception('Max group size has to be at least 2, '.$maxSize.' given');
	62	+ if ($maxSize < 2) {
	63	+ throw new \Exception('Max group size has to be at least 2, '.$maxSize.' given');
	64	+ }
58	65	$this->maxSize = $maxSize;
59	66	return $this;
60	67	}
		@@ -80,7 +87,9 @@ discard block
		block discarded – undo
80	87	$this->group->game($tInGame);
81	88	}
82	89
83		- if (count($discard) > 0 && !$this->allowSkip) throw new \Exception('Couldn\'t make games with all teams. Expected k*'.$this->inGame.' teams '.$count.' teams given - discarting '.count($discard).' teams ('.implode(', ', $discard).') in group '.$this->group.' - allow skip '.($this->allowSkip ? 'True' : 'False'));
	90	+ if (count($discard) > 0 && !$this->allowSkip) {
	91	+ throw new \Exception('Couldn\'t make games with all teams. Expected k*'.$this->inGame.' teams '.$count.' teams given - discarting '.count($discard).' teams ('.implode(', ', $discard).') in group '.$this->group.' - allow skip '.($this->allowSkip ? 'True' : 'False'));
	92	+ }
84	93	break;
85	94	case \COND_SPLIT:
86	95	$games = [];
		@@ -95,19 +104,24 @@ discard block
		block discarded – undo
95	104	while ($g > 0) {
96	105	foreach ($games as $key => $group) {
97	106	$this->group->addGame(array_shift($games[$key]));
98		- if (count($games[$key]) === 0) unset($games[$key]);
	107	+ if (count($games[$key]) === 0) {
	108	+ unset($games[$key]);
	109	+ }
99	110	$g--;
100	111	}
101	112	}
	113	+ } else {
	114	+ $this->group->addGame($this->r_rGames());
102	115	}
103		- else $this->group->addGame($this->r_rGames());
104	116	break;
105	117	}
106	118	return $this->group->getGames();
107	119	}
108	120	public function r_rGames(array $teams = []) {
109	121	$games = [];
110		- if (count($teams) === 0) $teams = $this->group->getTeams();
	122	+ if (count($teams) === 0) {
	123	+ $teams = $this->group->getTeams();
	124	+ }
111	125	switch ($this->inGame) {
112	126	case 2:
113	127	$games = Generator::circle_genGames2($teams, $this->group);
		@@ -154,7 +168,10 @@ discard block
		block discarded – undo
154	168	public static function circle_genGames2(array $teams = [], \tournamentGenerator\Group $group) {
155	169	$bracket = []; // ARRAY OF GAMES
156	170
157		- if (count($teams) % 2 != 0) $teams[] = \DUMMY_TEAM; // IF NOT EVEN NUMBER OF TEAMS, ADD DUMMY
	171	+ if (count($teams) % 2 != 0) {
	172	+ $teams[] = \DUMMY_TEAM;
	173	+ }
	174	+ // IF NOT EVEN NUMBER OF TEAMS, ADD DUMMY
158	175
159	176	shuffle($teams); // SHUFFLE TEAMS FOR MORE RANDOMNESS
160	177
		@@ -178,7 +195,10 @@ discard block
		block discarded – undo
178	195	$reverse = array_reverse($teams);
179	196	$away = $reverse[$i];
180	197
181		- if (($home == \DUMMY_TEAM \|\| $away == \DUMMY_TEAM)) continue; // SKIP WHEN DUMMY_TEAM IS PRESENT
	198	+ if (($home == \DUMMY_TEAM \|\| $away == \DUMMY_TEAM)) {
	199	+ continue;
	200	+ }
	201	+ // SKIP WHEN DUMMY_TEAM IS PRESENT
182	202
183	203	$bracket[] = new \TournamentGenerator\Game([$home, $away], $group);
184	204

		@@ -9,19 +9,27 @@ discard block
		block discarded – undo
9	9	{
10	10
11	11	public static function sortGroup(array &$teams, \TournamentGenerator\Group $group, string $ordering = POINTS) {
12		- if (!in_array($ordering, orderingTypes)) throw new \Exception('Unknown ordering type `'.$ordering.'`');
	12	+ if (!in_array($ordering, orderingTypes)) {
	13	+ throw new \Exception('Unknown ordering type `'.$ordering.'`');
	14	+ }
13	15
14	16	switch ($ordering) {
15	17	case \POINTS:{
16	18	uasort($teams, function($a, $b) use ($group) {
17		- if ($a->groupResults[$group->id]["points"] === $b->groupResults[$group->id]["points"] && $a->groupResults[$group->id]["score"] === $b->groupResults[$group->id]["score"]) return 0;
18		- if ($a->groupResults[$group->id]["points"] === $b->groupResults[$group->id]["points"]) return ($a->groupResults[$group->id]["score"] > $b->groupResults[$group->id]["score"] ? -1 : 1);
	19	+ if ($a->groupResults[$group->id]["points"] === $b->groupResults[$group->id]["points"] && $a->groupResults[$group->id]["score"] === $b->groupResults[$group->id]["score"]) {
	20	+ return 0;
	21	+ }
	22	+ if ($a->groupResults[$group->id]["points"] === $b->groupResults[$group->id]["points"]) {
	23	+ return ($a->groupResults[$group->id]["score"] > $b->groupResults[$group->id]["score"] ? -1 : 1);
	24	+ }
19	25	return ($a->groupResults[$group->id]["points"] > $b->groupResults[$group->id]["points"] ? -1 : 1);
20	26	});
21	27	break;}
22	28	case \SCORE:{
23	29	uasort($teams, function($a, $b) use ($group) {
24		- if ($a->groupResults[$group->id]["score"] === $b->groupResults[$group->id]["score"]) return 0;
	30	+ if ($a->groupResults[$group->id]["score"] === $b->groupResults[$group->id]["score"]) {
	31	+ return 0;
	32	+ }
25	33	return ($a->groupResults[$group->id]["score"] > $b->groupResults[$group->id]["score"] ? -1 : 1);
26	34	});
27	35	break;}
		@@ -30,21 +38,29 @@ discard block
		block discarded – undo
30	38	return $teams;
31	39	}
32	40	public static function sortRound(array &$teams, \TournamentGenerator\Round $round, string $ordering = POINTS) {
33		- if (!in_array($ordering, orderingTypes)) throw new \Exception('Unknown ordering type `'.$ordering.'`');
	41	+ if (!in_array($ordering, orderingTypes)) {
	42	+ throw new \Exception('Unknown ordering type `'.$ordering.'`');
	43	+ }
34	44
35	45	$groupsIds = $round->getGroupsIds();
36	46
37	47	switch ($ordering) {
38	48	case \POINTS:{
39	49	uasort($teams, function($a, $b) use ($groupsIds) {
40		- if ($a->sumPoints($groupsIds) === $b->sumPoints($groupsIds) && $a->sumScore($groupsIds) === $b->sumScore($groupsIds)) return 0;
41		- if ($a->sumPoints($groupsIds) === $b->sumPoints($groupsIds)) return ($a->sumScore($groupsIds) > $b->sumScore($groupsIds) ? -1 : 1);
	50	+ if ($a->sumPoints($groupsIds) === $b->sumPoints($groupsIds) && $a->sumScore($groupsIds) === $b->sumScore($groupsIds)) {
	51	+ return 0;
	52	+ }
	53	+ if ($a->sumPoints($groupsIds) === $b->sumPoints($groupsIds)) {
	54	+ return ($a->sumScore($groupsIds) > $b->sumScore($groupsIds) ? -1 : 1);
	55	+ }
42	56	return ($a->sumPoints($groupsIds) > $b->sumPoints($groupsIds) ? -1 : 1);
43	57	});
44	58	break;}
45	59	case \SCORE:{
46	60	uasort($teams, function($a, $b) use ($groupsIds) {
47		- if ($a->sumScore($groupsIds) === $b->sumScore($groupsIds)) return 0;
	61	+ if ($a->sumScore($groupsIds) === $b->sumScore($groupsIds)) {
	62	+ return 0;
	63	+ }
48	64	return ($a->sumScore($groupsIds) > $b->sumScore($groupsIds) ? -1 : 1);
49	65	});
50	66	break;}

		@@ -25,8 +25,11 @@ discard block
		block discarded – undo
25	25
26	26	public function addGroup(Group ...$groups){
27	27	foreach ($groups as $group) {
28		- if ($group instanceof Group) $this->groups[] = $group;
29		- else throw new \Exception('Trying to add group which is not an instance of Group class.');
	28	+ if ($group instanceof Group) {
	29	+ $this->groups[] = $group;
	30	+ } else {
	31	+ throw new \Exception('Trying to add group which is not an instance of Group class.');
	32	+ }
30	33	}
31	34	return $this;
32	35	}
		@@ -77,7 +80,9 @@ discard block
		block discarded – undo
77	80	}
78	81	public function isPlayed(){
79	82	foreach ($this->groups as $group) {
80		- if (!$group->isPlayed()) return false;
	83	+ if (!$group->isPlayed()) {
	84	+ return false;
	85	+ }
81	86	}
82	87	return true;
83	88	}
		@@ -86,10 +91,11 @@ discard block
		block discarded – undo
86	91	foreach ($teams as $team) {
87	92	if ($team instanceof Team) {
88	93	$this->teams[] = $team;
89		- }
90		- elseif (gettype($team) === 'array') {
	94	+ } elseif (gettype($team) === 'array') {
91	95	foreach ($team as $team2) {
92		- if ($team2 instanceof Team) $this->teams[] = $team2;
	96	+ if ($team2 instanceof Team) {
	97	+ $this->teams[] = $team2;
	98	+ }
93	99	$team2->groupResults[$this->id] = [
94	100	'group' => $this,
95	101	'points' => 0,
		@@ -101,8 +107,9 @@ discard block
		block discarded – undo
101	107	'third' => 0
102	108	];
103	109	}
	110	+ } else {
	111	+ throw new \Exception('Trying to add team which is not an instance of Team class');
104	112	}
105		- else throw new \Exception('Trying to add team which is not an instance of Team class');
106	113	}
107	114	return $this;
108	115	}
		@@ -131,7 +138,9 @@ discard block
		block discarded – undo
131	138
132	139	public function splitTeams(...$groups) {
133	140
134		- if (count($groups) === 0) $groups = $this->getGroups();
	141	+ if (count($groups) === 0) {
	142	+ $groups = $this->getGroups();
	143	+ }
135	144
136	145	foreach ($groups as $key => $value) {
137	146	if (gettype($value) === 'array') {
		@@ -146,7 +155,9 @@ discard block
		block discarded – undo
146	155	while (count($teams) > 0) {
147	156	foreach ($groups as $group) {
148	157	if ($group instanceof Group) {
149		- if (count($teams) > 0) $group->addTeam(array_shift($teams));
	158	+ if (count($teams) > 0) {
	159	+ $group->addTeam(array_shift($teams));
	160	+ }
150	161	}
151	162	}
152	163	}

Heroyt / tournament-generator

Push — master ( 597f0f...0dd9ad )

Status

Category

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Braces +20 added lines, -9 removed lines patch added patch discarded remove patch

Braces +26 added lines, -12 removed lines patch added patch discarded remove patch

Braces +18 added lines, -7 removed lines patch added patch discarded remove patch

Braces +51 added lines, -17 removed lines patch added patch discarded remove patch

Braces +27 added lines, -9 removed lines patch added patch discarded remove patch

Braces +30 added lines, -10 removed lines patch added patch discarded remove patch

Braces +24 added lines, -8 removed lines patch added patch discarded remove patch

Braces +20 added lines, -9 removed lines patch added patch discarded remove patch