Heroyt / tournament-generator

src/TournamentGenerator/Utilis/Sorter/Games.php

Braces +27 added lines, -9 removed lines

@@ -36,7 +36,9 @@ 
 
 		$games = $this->group->getGames();
 
-		if (count($games) <= 4) return $games;
+		if (count($games) <= 4) {
+			return $games;
+		}
 
 		$this->games = [];
 
@@ -48,24 +50,34 @@ 
 		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 @@ 
 		$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;
 

src/TournamentGenerator/Utilis/Generator.php

Braces +37 added lines, -12 removed lines

@@ -36,8 +36,11 @@ 
 
 
 	public function setType(/** @scrutinizer ignore-all */ string $type = \TournamentGenerator\Constants::ROUND_ROBIN) {
-		if (in_array($type, \TournamentGenerator\Constants::GroupTypes)) $this->type = $type;
-		else throw new \Exception('Unknown group type: '.$type);
+		if (in_array($type, \TournamentGenerator\Constants::GroupTypes)) {
+			$this->type = $type;
+		} else {
+			throw new \Exception('Unknown group type: '.$type);
+		}
 		return $this;
 	}
 	public function getType() {
@@ -45,7 +48,9 @@ 
 	}
 
 	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 @@ 
 	}
 
 	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;
 	}
@@ -78,7 +85,9 @@ 
 	}
 	private 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);
@@ -98,7 +107,9 @@ 
 			$lockedTeam = array_shift($teamsB);
 			$gamesTemp = Generator::circle_genGames2($teamsB, $this->group);
 			foreach ($gamesTemp as $game) {
-				if (isset($lockedTeam1)) $game->addTeam($lockedTeam1);
+				if (isset($lockedTeam1)) {
+					$game->addTeam($lockedTeam1);
+				}
 				$game->addTeam($lockedTeam);
 			}
 			$games = array_merge($games, $gamesTemp);
@@ -116,7 +127,9 @@ 
 		return $games;
 	}
 	private function two_twoGames(array $teams = []) {
-		if (count($teams) === 0) $teams = $this->group->getTeams();
+		if (count($teams) === 0) {
+			$teams = $this->group->getTeams();
+		}
 		$discard = [];
 		shuffle($teams);
 		$count = count($teams);
@@ -128,13 +141,17 @@ 
 			$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'));
+		}
 
 		return $this;
 	}
 	private function cond_splitGames(array $teams = []) {
 		$games = [];
-		if (count($teams) === 0) $teams = $this->group->getTeams();
+		if (count($teams) === 0) {
+			$teams = $this->group->getTeams();
+		}
 
 		if (count($teams) > $this->maxSize) {
 			$groups = array_chunk($teams, /** @scrutinizer ignore-type */ ceil(count($teams)/ceil(count($teams)/$this->maxSize))); // SPLIT TEAMS INTO GROUP OF MAXIMUM SIZE OF $this->maxSize
@@ -144,7 +161,9 @@ 
 			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--;
 				}
 			}
@@ -165,7 +184,10 @@ 
 	public static function circle_genGames2(array $teams = [], \tournamentGenerator\Group $group) {
 		$bracket = []; // ARRAY OF GAMES
 
-		if (count($teams) % 2 != 0) $teams[] = \TournamentGenerator\Constants::DUMMY_TEAM; // IF NOT EVEN NUMBER OF TEAMS, ADD DUMMY
+		if (count($teams) % 2 != 0) {
+			$teams[] = \TournamentGenerator\Constants::DUMMY_TEAM;
+		}
+		// IF NOT EVEN NUMBER OF TEAMS, ADD DUMMY
 
 		shuffle($teams); // SHUFFLE TEAMS FOR MORE RANDOMNESS
 
@@ -189,7 +211,10 @@ 
 			$reverse = array_reverse($teams);
 			$away = $reverse[$i];
 
-			if (($home == \TournamentGenerator\Constants::DUMMY_TEAM || $away == \TournamentGenerator\Constants::DUMMY_TEAM)) continue; // SKIP WHEN DUMMY_TEAM IS PRESENT
+			if (($home == \TournamentGenerator\Constants::DUMMY_TEAM || $away == \TournamentGenerator\Constants::DUMMY_TEAM)) {
+				continue;
+			}
+			// SKIP WHEN DUMMY_TEAM IS PRESENT
 
 			$bracket[] = new \TournamentGenerator\Game([$home, $away], $group);
 

src/TournamentGenerator/Preset/R2G.php

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
 
 	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');

src/TournamentGenerator/Preset/DoubleElimination.php

Braces +18 added lines, -10 removed lines

@@ -13,7 +13,9 @@ 
 
 		$countTeams = count($this->getTeams());
 
-		if ($countTeams < 3) throw new \Exception('Double elimination is possible for minimum of 3 teams - '.$countTeams.' teams given.');
+		if ($countTeams < 3) {
+			throw new \Exception('Double elimination is possible for minimum of 3 teams - '.$countTeams.' teams given.');
+		}
 
 
 		// CALCULATE BYES
@@ -131,15 +133,19 @@ 
 				if ($r === 2) { // FIRST LOSING ROUND
 					$previousGroups[2*($g-1)]->progression($group, 1, 1); // PROGRESS FROM STARTING GROUP
 					$previousGroups[(2*($g-1))+1]->progression($group, 1, 1); // PROGREESS FROM STARTING GROUP
-				}
-				elseif ($losingGroupTeamsCount >= 2) {
+				} elseif ($losingGroupTeamsCount >= 2) {
 					$previousLosingGroups[$g-1]->progression($group, 0, 1); // PROGRESS FROM LOSING GROUP BEFORE
-					if (isset(array_reverse($previousGroups)[$g-1])) array_reverse($previousGroups)[$g-1]->progression($group, 1, 1); // PROGREESS FROM WINNING GROUP BEFORE
-					else $previousLosingGroups[$g]->progression($group, 0, 1); // PROGRESS OTHER TEAM FROM LOSING GROUP BEEFORE
+					if (isset(array_reverse($previousGroups)[$g-1])) {
+						array_reverse($previousGroups)[$g-1]->progression($group, 1, 1);
+					}
+					// PROGREESS FROM WINNING GROUP BEFORE
+					else {
+						$previousLosingGroups[$g]->progression($group, 0, 1);
+					}
+					// PROGRESS OTHER TEAM FROM LOSING GROUP BEEFORE
 				}
 			}
-		}
-		else { // IF THE NUMBER OF TEAMS IS NOT A POWER OF 2, GENERATE GROUPS WITH BYES
+		} else { // IF THE NUMBER OF TEAMS IS NOT A POWER OF 2, GENERATE GROUPS WITH BYES
 			// LOOK FOR THE CLOSEST LOWER POWER OF 2
 			$losingByes = $losingGroupTeamsCount-bindec(str_pad(1, strlen(decbin($losingGroupTeamsCount)), 0, STR_PAD_RIGHT));
 			$n = (floor(count($previousLosingGroups)/2)+$losingByes);
@@ -163,10 +169,12 @@ 
 				if (in_array($g, $byesGroupsNums) && isset($previousGroups[$byesProgressed])) { // EMPTY GROUP FROM BYE
 					$previousGroups[$byesProgressed]->progression($group, 1, 1); // PROGRESS FROM WINNING GROUP BEFORE
 					$byesProgressed++;
-				}
-				else {
+				} else {
 					$previousLosingGroups[$lastGroup]->progression($group, 0, 1); // PROGRESS FROM LOSING GROUP BEFORE
-					if (isset($previousLosingGroups[$lastGroup + 1])) $previousLosingGroups[$lastGroup + 1]->progression($group, 0, 1); // PROGREESS FROM LOSING GROUP BEFORE
+					if (isset($previousLosingGroups[$lastGroup + 1])) {
+						$previousLosingGroups[$lastGroup + 1]->progression($group, 0, 1);
+					}
+					// PROGREESS FROM LOSING GROUP BEFORE
 					$lastGroup += 2;
 				}
 			}

src/TournamentGenerator/Utilis/Sorter/Teams.php

Braces +15 added lines, -5 removed lines

@@ -32,7 +32,9 @@ 
 	* @return array Sorted array of teams
 	*/
 	public static function sortGroup(array &$teams, \TournamentGenerator\Group $group, string $ordering = \TournamentGenerator\Constants::POINTS) {
-		if (!in_array($ordering, \TournamentGenerator\Constants::OrderingTypes)) throw new \Exception('Unknown ordering type `'.$ordering.'`');
+		if (!in_array($ordering, \TournamentGenerator\Constants::OrderingTypes)) {
+			throw new \Exception('Unknown ordering type `'.$ordering.'`');
+		}
 
 		self::$ids = [$group->getId()];
 
@@ -58,7 +60,9 @@ 
 	* @return array Sorted array of teams
 	*/
 	public static function sortRound(array &$teams, \TournamentGenerator\Round $round, string $ordering = \TournamentGenerator\Constants::POINTS) {
-		if (!in_array($ordering, \TournamentGenerator\Constants::OrderingTypes)) throw new \Exception('Unknown ordering type `'.$ordering.'`');
+		if (!in_array($ordering, \TournamentGenerator\Constants::OrderingTypes)) {
+			throw new \Exception('Unknown ordering type `'.$ordering.'`');
+		}
 
 		self::$ids = $round->getGroupsIds();
 
@@ -79,8 +83,12 @@ 
 	*/
 	private static function sortTeamsByPoints($a, $b) {
 		$groupsIds = self::$ids;
-		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);
 	}
 	/**
@@ -88,7 +96,9 @@ 
 	*/
 	private static function sortTeamsByScore($a, $b) {
 		$groupsIds = self::$ids;
-		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);
 	}
 

src/TournamentGenerator/Game.php

Braces +26 added lines, -12 removed lines

@@ -33,11 +33,15 @@ 
 		$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 @@ 
 			$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(){
@@ -83,14 +91,20 @@ 
 	* )
 	*/
 	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) {
-			if (!is_numeric($score)) throw new \TypeError('Score passed to TournamentGenerator\Game::setResults() must be of the type numeric, '.gettype($score).' given');
+			if (!is_numeric($score)) {
+				throw new \TypeError('Score passed to TournamentGenerator\Game::setResults() must be of the type numeric, '.gettype($score).' given');
+			}
 			$team = $this->getTeam($id);
-			if (!$team instanceof Team) throw new \Exception('Couldn\'t find team with id of "'.$id.'"');
+			if (!$team instanceof Team) {
+				throw new \Exception('Couldn\'t find team with id of "'.$id.'"');
+			}
 			$this->results[$team->getId()] = ['score' => $score];
 			$team->addScore($score);
 			switch ($inGame) {
@@ -114,13 +128,11 @@ 
 			$this->drawIds[] = $team->getId();
 			$team->addDraw($this->group->getId());
 			$this->results[$team->getId()] += ['points' => $this->group->drawPoints, 'type' => 'draw'];
-		}
-		elseif ($i === 1) {
+		} elseif ($i === 1) {
 			$this->winId = $team->getId();
 			$team->addWin($this->group->getId());
 			$this->results[$team->getId()] += ['points' => $this->group->winPoints, 'type' => 'win'];
-		}
-		else {
+		} else {
 			$this->lossId = $team->getId();
 			$team->addLoss($this->group->getId());
 			$this->results[$team->getId()] += ['points' => $this->group->lostPoints, 'type' => 'loss'];
@@ -220,7 +232,9 @@ 
 	}
 
 	public function isPlayed() {
-		if (count($this->results) > 0) return true;
+		if (count($this->results) > 0) {
+			return true;
+		}
 		return false;
 	}
 }

src/TournamentGenerator/Team.php

Braces +60 added lines, -20 removed lines

@@ -75,20 +75,26 @@ 
 	}
 	public function getGroupResults($groupId = null) {
 		if (isset($groupId)) {
-			if (!isset($this->groupResults[$groupId])) throw new \Exception('Trying to get unexisting group results ('.$groupId.')');
+			if (!isset($this->groupResults[$groupId])) {
+				throw new \Exception('Trying to get unexisting group results ('.$groupId.')');
+			}
 			return $this->groupResults[$groupId];
 		}
 		return $this->groupResults;
 	}
 
 	public function addGameWith(Team $team, Group $group) {
-		if (!isset($this->gamesWith[$group->getId()][$team->getId()])) $this->gamesWith[$group->getId()][$team->getId()] = 0;
+		if (!isset($this->gamesWith[$group->getId()][$team->getId()])) {
+			$this->gamesWith[$group->getId()][$team->getId()] = 0;
+		}
 		$this->gamesWith[$group->getId()][$team->getId()]++;
 		return $this;
 	}
 	public function getGameWith(Team $team = null, Group $group = null) {
 		if (isset($group)) {
-			if (isset($team)) return $this->gamesWith[$group->getId()][$team->getId()];
+			if (isset($team)) {
+				return $this->gamesWith[$group->getId()][$team->getId()];
+			}
 			return $this->gamesWith[$group->getId()];
 		}
 		if (isset($team)) {
@@ -97,25 +103,35 @@ 
 				$filter = array_filter($games, function($key) use ($team){
 					return $key === $team->getId();
 				}, ARRAY_FILTER_USE_KEY);
-				if (count($filter) > 0) $return[$id] = $filter;
+				if (count($filter) > 0) {
+					$return[$id] = $filter;
+				}
 			}
 			return $return;
 		}
 		return $this->gamesWith;
 	}
 	public function addGroup(Group $group) {
-		if (!isset($this->games[$group->getId()])) $this->games[$group->getId()] = [];
+		if (!isset($this->games[$group->getId()])) {
+			$this->games[$group->getId()] = [];
+		}
 		return $this;
 	}
 	public function addGame(Game $game) {
 		$group = $game->getGroup();
-		if (!isset($this->games[$group->getId()])) $this->games[$group->getId()] = [];
+		if (!isset($this->games[$group->getId()])) {
+			$this->games[$group->getId()] = [];
+		}
 		$this->games[$group->getId()][] = $game;
 		return $this;
 	}
 	public function getGames(Group $group = null, $groupId = null) {
-		if (isset($group) && isset($this->games[$group->getId()])) return $this->games[$group->getId()];
-		if (isset($groupId) && isset($this->games[$groupId])) return $this->games[$groupId];
+		if (isset($group) && isset($this->games[$group->getId()])) {
+			return $this->games[$group->getId()];
+		}
+		if (isset($groupId) && isset($this->games[$groupId])) {
+			return $this->games[$groupId];
+		}
 		return $this->games;
 	}
 
@@ -127,14 +143,18 @@ 
 	}
 
 	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']--;
@@ -142,14 +162,18 @@ 
 	}
 
 	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']->drawPoints;
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->drawPoints;
 		$this->groupResults[$groupId]['draws']--;
@@ -157,14 +181,18 @@ 
 	}
 
 	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']--;
@@ -172,14 +200,18 @@ 
 	}
 
 	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']--;
@@ -187,14 +219,18 @@ 
 	}
 
 	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']--;
@@ -202,7 +238,9 @@ 
 	}
 
 	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) {
 			$sum += $this->groupResults[$gid]['points'] ?? 0;
@@ -210,7 +248,9 @@ 
 		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) {
 			$sum += $this->groupResults[$gid]['score'] ?? 0;

src/TournamentGenerator/Utilis/FilterComparator.php

Braces +15 added lines, -5 removed lines

@@ -52,7 +52,9 @@ 
 	private static function calcSum(\TournamentGenerator\Team $team, array $groupsId) {
 		$sum = 0;
 		foreach ($groupsId as $id) {
-			if (isset($team->groupResults[$id])) $sum += $team->groupResults[$id][self::$what];
+			if (isset($team->groupResults[$id])) {
+				$sum += $team->groupResults[$id][self::$what];
+			}
 		}
 		return $sum;
 	}
@@ -62,12 +64,16 @@ 
 			$games = $team->getGames(null, reset($groupsId));
 			foreach ($games as $game) {
 				$results = $game->getResults()[$team->getId()];
-				if (($results[self::$what] > $max || $max === null)) $max = $results[self::$what];
+				if (($results[self::$what] > $max || $max === null)) {
+					$max = $results[self::$what];
+				}
 			}
 			return $max;
 		}
 		foreach ($groupsId as $id) {
-			if (isset($team->groupResults[$id]) && ($team->groupResults[$id][self::$what] > $max || $max === null)) $max = $team->groupResults[$id][self::$what];
+			if (isset($team->groupResults[$id]) && ($team->groupResults[$id][self::$what] > $max || $max === null)) {
+				$max = $team->groupResults[$id][self::$what];
+			}
 		}
 		return $max;
 	}
@@ -77,12 +83,16 @@ 
 			$games = $team->getGames(null, reset($groupsId));
 			foreach ($games as $game) {
 				$results = $game->getResults()[$team->getId()];
-				if (($results[self::$what] < $min || $min === null)) $min = $results[self::$what];
+				if (($results[self::$what] < $min || $min === null)) {
+					$min = $results[self::$what];
+				}
 			}
 			return $min;
 		}
 		foreach ($groupsId as $id) {
-			if (isset($team->groupResults[$id]) && ($team->groupResults[$id][self::$what] < $min || $min === null)) $min = $team->groupResults[$id][self::$what];
+			if (isset($team->groupResults[$id]) && ($team->groupResults[$id][self::$what] < $min || $min === null)) {
+				$min = $team->groupResults[$id][self::$what];
+			}
 		}
 		return $min;
 	}

src/TournamentGenerator/TeamFilter.php

Braces +25 added lines, -9 removed lines

@@ -44,11 +44,17 @@ 
 	private $groups = [];
 
 	function __construct(string $what = 'points', string $how = '>', $val = 0, array $groups = []){
-		if (!in_array(strtolower($what), ['points', 'score', 'wins', 'draws', 'losses', 'second', 'third', 'team', 'notprogressed', 'progressed'])) throw new \Exception('Trying to filter unexisting type ('.$what.')');
+		if (!in_array(strtolower($what), ['points', 'score', 'wins', 'draws', 'losses', 'second', 'third', 'team', 'notprogressed', 'progressed'])) {
+			throw new \Exception('Trying to filter unexisting type ('.$what.')');
+		}
 		$this->what = strtolower($what);
-		if (!in_array($how, ['>', '<', '>=', '<=', '=', '!='])) throw new \Exception('Trying to filter with unexisting operator ('.$how.')');
+		if (!in_array($how, ['>', '<', '>=', '<=', '=', '!='])) {
+			throw new \Exception('Trying to filter with unexisting operator ('.$how.')');
+		}
 		$this->how = $how;
-		if (!(gettype($val) === 'integer' && strtolower($what) !== 'team') && !($val instanceof Team && strtolower($what) === 'team')) throw new \Exception('Unsupported filter value type ('.gettype($val).')');
+		if (!(gettype($val) === 'integer' && strtolower($what) !== 'team') && !($val instanceof Team && strtolower($what) === 'team')) {
+			throw new \Exception('Unsupported filter value type ('.gettype($val).')');
+		}
 		$this->val = $val;
 		$this->groups = array_map(function($a) { return $a->getId(); }, array_filter($groups, function($a) {return ($a instanceof Group);}));
 	}
@@ -57,11 +63,17 @@ 
 	}
 
 	public function validate(Team $team, $groupsId, string $operation = 'sum', Group $from = null) {
-		if (count($this->groups) > 0) $groupsId = array_unique(array_merge($this->groups, (gettype($groupsId) === 'array' ? $groupsId : [$groupsId])), SORT_REGULAR);
+		if (count($this->groups) > 0) {
+			$groupsId = array_unique(array_merge($this->groups, (gettype($groupsId) === 'array' ? $groupsId : [$groupsId])), SORT_REGULAR);
+		}
 
-		if ($this->what == 'team') return ($this->how === '!=' ? !$this->validateTeam($team) : $this->validateTeam($team));
-		elseif ($this->what == 'notprogressed') return !$this->validateProgressed($team, $from);
-		elseif ($this->what == 'progressed') return $this->validateProgressed($team, $from);
+		if ($this->what == 'team') {
+			return ($this->how === '!=' ? !$this->validateTeam($team) : $this->validateTeam($team));
+		} elseif ($this->what == 'notprogressed') {
+			return !$this->validateProgressed($team, $from);
+		} elseif ($this->what == 'progressed') {
+			return $this->validateProgressed($team, $from);
+		}
 
 		return $this->validateCalc($team, $groupsId, $operation);
 	}
@@ -70,11 +82,15 @@ 
 		return $this->val === $team;
 	}
 	private function validateProgressed(Team $team, Group $from = null) {
-		if ($from === null) throw new \Exception('Group $from was not defined.');
+		if ($from === null) {
+			throw new \Exception('Group $from was not defined.');
+		}
 		return $from->isProgressed($team);
 	}
 	private function validateCalc(Team $team, array $groupsId, string $operation = 'sum') {
-		if (gettype($groupsId) === 'array' && !in_array(strtolower($operation), ['sum', 'avg', 'max', 'min'])) throw new \Exception('Unknown operation of '.$operation.'. Only "sum", "avg", "min", "max" possible.');
+		if (gettype($groupsId) === 'array' && !in_array(strtolower($operation), ['sum', 'avg', 'max', 'min'])) {
+			throw new \Exception('Unknown operation of '.$operation.'. Only "sum", "avg", "min", "max" possible.');
+		}
 
 		return Utilis\FilterComparator::compare($operation, $this->val, $this->how, $this->what, $team, $groupsId);