Heroyt / tournament-generator

src/TournamentGenerator/Filter.php

Spacing +2 added lines, -2 removed lines

@@ -12,12 +12,12 @@
 	private $filters = [];
 
 	function __construct(array $groups, array $filters) {
-		$this->groups = array_filter($groups, function($a) {return $a instanceof Group;});
+		$this->groups = array_filter($groups, function($a) {return $a instanceof Group; });
 		$this->filters = $filters;
 	}
 
 	private function getGroupsIds() {
-		return array_map(function($a){return $a->getId();}, $this->groups);
+		return array_map(function($a) {return $a->getId(); }, $this->groups);
 	}
 
 	/**

Braces +35 added lines, -16 removed lines

@@ -29,8 +29,7 @@ 
 			if (gettype($filter) === 'array') {
 				$this->filterMulti($teams, $filter, $key);
 				continue;
-			}
-			elseif ($filter instanceof TeamFilter) {
+			} elseif ($filter instanceof TeamFilter) {
 				$teams = array_filter($teams, function($team) use ($filter) {return $filter->validate($team, $this->getGroupsIds(), 'sum', $this->groups[0]); });
 				continue;
 			}
@@ -43,12 +42,18 @@ 
 		switch (strtolower($how)) {
 			case 'and':
 				foreach ($teams as $tkey => $team) {
-					if (!$this->filterAnd($team, $filters)) unset($teams[$tkey]); // IF FILTER IS NOT VALIDATED REMOVE TEAM FROM RETURN ARRAY
+					if (!$this->filterAnd($team, $filters)) {
+						unset($teams[$tkey]);
+					}
+					// IF FILTER IS NOT VALIDATED REMOVE TEAM FROM RETURN ARRAY
 				}
 				return true;
 			case 'or':
 				foreach ($teams as $tkey => $team) {
-					if (!$this->filterOr($team, $filters)) unset($teams[$tkey]); // IF FILTER IS NOT VALIDATED REMOVE TEAM FROM RETURN ARRAY
+					if (!$this->filterOr($team, $filters)) {
+						unset($teams[$tkey]);
+					}
+					// IF FILTER IS NOT VALIDATED REMOVE TEAM FROM RETURN ARRAY
 				}
 				return true;
 		}
@@ -58,21 +63,28 @@ 
 	private function filterAnd(Team $team, array $filters) {
 		foreach ($filters as $key => $value) {
 			if (is_array($value)) {
-				if (is_int($key)) $key = 'and';
+				if (is_int($key)) {
+					$key = 'and';
+				}
 				switch (strtolower($key)) {
 					case 'and':
-						if (!$this->filterAnd($team, $value)) return false;
+						if (!$this->filterAnd($team, $value)) {
+							return false;
+						}
 						break;
 					case 'or':
-						if (!$this->filterOr($team, $value)) return false;
+						if (!$this->filterOr($team, $value)) {
+							return false;
+						}
 						break;
 					default:
 						throw new \Exception('Unknown opperand type "'.$key.'". Expected "and" or "or".');
 				}
 				continue;
-			}
-			elseif ($value instanceof TeamFilter) {
-				if (!$value->validate($team, $this->getGroupsIds(), 'sum', $this->groups[0])) return false;
+			} elseif ($value instanceof TeamFilter) {
+				if (!$value->validate($team, $this->getGroupsIds(), 'sum', $this->groups[0])) {
+					return false;
+				}
 				continue;
 			}
 			throw new \Exception('Filter ['.$key.'] is not an instance of TeamFilter class');
@@ -81,22 +93,29 @@ 
 	}
 	private function filterOr(Team $team, array $filters) {
 		foreach ($filters as $key => $value) {
-			if (is_int($key)) $key = 'and';
+			if (is_int($key)) {
+				$key = 'and';
+			}
 			if (is_array($value)) {
 				switch (strtolower($key)) {
 					case 'and':
-						if ($this->filterAnd($team, $value)) return true;
+						if ($this->filterAnd($team, $value)) {
+							return true;
+						}
 						break;
 					case 'or':
-						if ($this->filterOr($team, $value)) return true;
+						if ($this->filterOr($team, $value)) {
+							return true;
+						}
 						break;
 					default:
 						throw new \Exception('Unknown opperand type "'.$key.'". Expected "and" or "or".');
 				}
 				continue;
-			}
-			elseif ($value instanceof TeamFilter) {
-				if ($value->validate($team, $this->getGroupsIds(), 'sum', $this->groups[0])) return true;
+			} elseif ($value instanceof TeamFilter) {
+				if ($value->validate($team, $this->getGroupsIds(), 'sum', $this->groups[0])) {
+					return true;
+				}
 				continue;
 			}
 			throw new \Exception('Filter ['.$key.'] is not an instance of TeamFilter class');

src/TournamentGenerator/Tournament.php

Braces +15 added lines, -5 removed lines

@@ -150,7 +150,9 @@ 
 		}
 		$teams = \array_unique($teams);
 		$this->teams = $teams;
-		if ($ordered) $teams = $this->sortTeams($ordering);
+		if ($ordered) {
+			$teams = $this->sortTeams($ordering);
+		}
 
 		// APPLY FILTERS
 		$filter = new Filter($this->getGroups(), $filters);
@@ -183,14 +185,18 @@ 
 
 	public function splitTeams(Round ...$wheres) {
 
-		if (count($wheres) === 0) $wheres = $this->getRounds();
+		if (count($wheres) === 0) {
+			$wheres = $this->getRounds();
+		}
 
 		$teams = $this->getTeams();
 		shuffle($teams);
 
 		while (count($teams) > 0) {
 			foreach ($wheres as $where) {
-				if (count($teams) > 0) $where->addTeam(array_shift($teams));
+				if (count($teams) > 0) {
+					$where->addTeam(array_shift($teams));
+				}
 			}
 		}
 		foreach ($wheres as $where) {
@@ -202,13 +208,17 @@ 
 	public function genGamesSimulate(bool $returnTime = false) {
 		$games = Utilis\Simulator::simulateTournament($this);
 
-		if ($returnTime) return $this->getTournamentTime();
+		if ($returnTime) {
+			return $this->getTournamentTime();
+		}
 		return $games;
 	}
 	public function genGamesSimulateReal(bool $returnTime = false) {
 		$games = Utilis\Simulator::simulateTournamentReal($this);
 
-		if ($returnTime) return $this->getTournamentTime();
+		if ($returnTime) {
+			return $this->getTournamentTime();
+		}
 		return $games;
 	}
 

Spacing +5 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
 
 	private $allowSkip = false;
 
-	function __construct(string $name = ''){
+	function __construct(string $name = '') {
 		$this->name = $name;
 	}
 	public function __toString() {
@@ -63,16 +63,16 @@ 
 	public function getCategoryWait() {
 		return $this->expectedCategoryWait;
 	}
-	public function getTournamentTime(){
+	public function getTournamentTime() {
 		$games = count($this->getGames());
 		return $games*$this->expectedPlay+($games-1)*$this->expectedGameWait+(count($this->getRounds())-1)*$this->expectedRoundWait+(count($this->getCategories())-1)*$this->expectedCategoryWait;
 	}
 
-	public function allowSkip(){
+	public function allowSkip() {
 		$this->allowSkip = true;
 		return $this;
 	}
-	public function disallowSkip(){
+	public function disallowSkip() {
 		$this->allowSkip = false;
 		return $this;
 	}
@@ -84,7 +84,7 @@ 
 		return $this->allowSkip;
 	}
 
-	public function addCategory(Category ...$categories){
+	public function addCategory(Category ...$categories) {
 		foreach ($categories as $category) {
 			$this->categories[] = $category;
 		}

src/TournamentGenerator/Utilis/Simulator.php

Braces +18 added lines, -6 removed lines

@@ -18,7 +18,9 @@ 
 			$game->setResults($results);
 		}
 		$return = $group->sortTeams(null, $filters);
-		if (!$reset) return $return;
+		if (!$reset) {
+			return $return;
+		}
 		foreach ($group->getGames() as $game) {
 			$game->resetResults();
 		}
@@ -27,14 +29,18 @@ 
 
 	public static function simulateRound(\TournamentGenerator\Round $round) {
 		foreach ($round->getGroups() as $group) {
-			if ($group->isPlayed()) continue;
+			if ($group->isPlayed()) {
+				continue;
+			}
 			$group->simulate([], false);
 		}
 		return true;
 	}
 
 	public static function simulateTournament(\TournamentGenerator\Tournament $tournament) {
-		if (count($tournament->getCategories()) === 0 && count($tournament->getRounds()) === 0) throw new \Exception('There are no rounds or categories to simulate games from.');
+		if (count($tournament->getCategories()) === 0 && count($tournament->getRounds()) === 0) {
+			throw new \Exception('There are no rounds or categories to simulate games from.');
+		}
 
 		$games = [];
 
@@ -51,7 +57,9 @@ 
 
 	public static function simulateTournamentReal(\TournamentGenerator\Tournament $tournament) {
 		$games = [];
-		if (count($tournament->getCategories()) === 0 && count($tournament->getRounds()) === 0) throw new \Exception('There are no rounds or categories to simulate games from.');
+		if (count($tournament->getCategories()) === 0 && count($tournament->getRounds()) === 0) {
+			throw new \Exception('There are no rounds or categories to simulate games from.');
+		}
 
 		foreach ($tournament->getRounds() as $round) {
 			$games = array_merge($games, $round->genGames());
@@ -62,7 +70,9 @@ 
 	}
 
 	public static function simulateCategory(\TournamentGenerator\Category $category) {
-		if (count($category->getRounds()) === 0) throw new \Exception('There are no rounds to simulate games from.');
+		if (count($category->getRounds()) === 0) {
+			throw new \Exception('There are no rounds to simulate games from.');
+		}
 
 		$games = [];
 
@@ -79,7 +89,9 @@ 
 
 	public static function simulateCategoryReal(\TournamentGenerator\Category $category) {
 		$games = [];
-		if (count($category->getRounds()) === 0) throw new \Exception('There are no rounds to simulate games from.');
+		if (count($category->getRounds()) === 0) {
+			throw new \Exception('There are no rounds to simulate games from.');
+		}
 
 		foreach ($category->getRounds() as $round) {
 			$games = array_merge($games, $round->genGames());

src/TournamentGenerator/Category.php

Spacing +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
 		$this->setId(isset($id) ? $id : uniqid());
 	}
 
-	public function addRound(Round ...$rounds){
+	public function addRound(Round ...$rounds) {
 		foreach ($rounds as $round) {
 			$this->rounds[] = $round;
 		}
@@ -28,7 +28,7 @@ 
 		$this->rounds[] = $r->setSkip($this->allowSkip);
 		return $r;
 	}
-	public function getRounds(){
+	public function getRounds() {
 		return $this->rounds;
 	}
 	public function getGroups() {
@@ -39,11 +39,11 @@ 
 		return $groups;
 	}
 
-	public function allowSkip(){
+	public function allowSkip() {
 		$this->allowSkip = true;
 		return $this;
 	}
-	public function disallowSkip(){
+	public function disallowSkip() {
 		$this->allowSkip = false;
 		return $this;
 	}

Braces +9 added lines, -3 removed lines

@@ -73,7 +73,9 @@ 
 		}
 		$teams = \array_unique($teams);
 		$this->teams = $teams;
-		if ($ordered) $teams = $this->sortTeams($ordering);
+		if ($ordered) {
+			$teams = $this->sortTeams($ordering);
+		}
 
 		// APPLY FILTERS
 		$filter = new Filter($this->getGroups(), $filters);
@@ -106,14 +108,18 @@ 
 
 	public function splitTeams(Round ...$wheres) {
 
-		if (count($wheres) === 0) $wheres = $this->getRounds();
+		if (count($wheres) === 0) {
+			$wheres = $this->getRounds();
+		}
 
 		$teams = $this->getTeams();
 		shuffle($teams);
 
 		while (count($teams) > 0) {
 			foreach ($wheres as $where) {
-				if (count($teams) > 0) $where->addTeam(array_shift($teams));
+				if (count($teams) > 0) {
+					$where->addTeam(array_shift($teams));
+				}
 			}
 		}
 		foreach ($wheres as $where) {

src/TournamentGenerator/Group.php

Braces +18 added lines, -6 removed lines

@@ -64,7 +64,9 @@ 
 	public function getTeams(bool $ordered = false, $ordering = \TournamentGenerator\Constants::POINTS, array $filters = []) {
 		$teams = $this->teams;
 
-		if ($ordered) return $this->sortTeams($ordering, $filters);
+		if ($ordered) {
+			return $this->sortTeams($ordering, $filters);
+		}
 
 		// APPLY FILTERS
 		$filter = new Filter([$this], $filters);
@@ -79,7 +81,9 @@ 
 		return $t;
 	}
 	public function sortTeams($ordering = null, array $filters = []) {
-		if (!isset($ordering)) $ordering = $this->ordering;
+		if (!isset($ordering)) {
+			$ordering = $this->ordering;
+		}
 		$this->teams = Utilis\Sorter\Teams::sortGroup($this->teams, $this, $ordering);
 		return $this->getTeams(false, null, $filters);
 	}
@@ -109,7 +113,9 @@ 
 	}
 
 	public function setOrdering(string $ordering = \TournamentGenerator\Constants::POINTS) {
-		if (!in_array($ordering, \TournamentGenerator\Constants::OrderingTypes)) throw new \Exception('Unknown group ordering: '.$ordering);
+		if (!in_array($ordering, \TournamentGenerator\Constants::OrderingTypes)) {
+			throw new \Exception('Unknown group ordering: '.$ordering);
+		}
 		$this->ordering = $ordering;
 		return $this;
 	}
@@ -174,7 +180,9 @@ 
 		return $this->games;
 	}
 	public function orderGames() {
-		if (count($this->games) <= 4) return $this->games;
+		if (count($this->games) <= 4) {
+			return $this->games;
+		}
 		$this->games = $this->generator->orderGames();
 		return $this->games;
 	}
@@ -189,9 +197,13 @@ 
 		return $this;
 	}
 	public function isPlayed(){
-		if (count($this->games) === 0) return false;
+		if (count($this->games) === 0) {
+			return false;
+		}
 		foreach ($this->games as $game) {
-			if (!$game->isPlayed()) return false;
+			if (!$game->isPlayed()) {
+				return false;
+			}
 		}
 		return true;
 	}

Spacing +10 added lines, -10 removed lines

@@ -28,11 +28,11 @@ 
 		$this->setId(isset($id) ? $id : uniqid());
 	}
 
-	public function allowSkip(){
+	public function allowSkip() {
 		$this->generator->allowSkip();
 		return $this;
 	}
-	public function disallowSkip(){
+	public function disallowSkip() {
 		$this->generator->disallowSkip();
 		return $this;
 	}
@@ -184,9 +184,9 @@ 
 		return $this;
 	}
 	public function addProgressed(...$teams) {
-		$this->progressed = array_merge($this->progressed, array_map(function ($a) {return $a->getId();}, array_filter($teams, function($a){return $a instanceof Team;})));
-		foreach (array_filter($teams, function($a){return is_array($a);}) as $team) {
-			$this->progressed = array_merge($this->progressed, array_map(function ($a) {return $a->getId();}, array_filter($team, function($a) {
+		$this->progressed = array_merge($this->progressed, array_map(function($a) {return $a->getId(); }, array_filter($teams, function($a) {return $a instanceof Team; })));
+		foreach (array_filter($teams, function($a) {return is_array($a); }) as $team) {
+			$this->progressed = array_merge($this->progressed, array_map(function($a) {return $a->getId(); }, array_filter($team, function($a) {
 				return ($a instanceof Team);
 			})));
 		}
@@ -206,11 +206,11 @@ 
 		$this->games[] = $g;
 		return $g;
 	}
-	public function addGame(...$games){
-		$this->games = array_merge($this->games, array_filter($games, function($a){ return ($a instanceof Game); }));
+	public function addGame(...$games) {
+		$this->games = array_merge($this->games, array_filter($games, function($a) { return ($a instanceof Game); }));
 
-		foreach (array_filter($games, function($a){return is_array($a);}) as $key => $game) {
-			$this->games = array_merge($this->games, array_filter($game, function($a){ return ($a instanceof Game); }));
+		foreach (array_filter($games, function($a) {return is_array($a); }) as $key => $game) {
+			$this->games = array_merge($this->games, array_filter($game, function($a) { return ($a instanceof Game); }));
 		}
 		return $this;
 	}
@@ -232,7 +232,7 @@ 
 		}
 		return $this;
 	}
-	public function isPlayed(){
+	public function isPlayed() {
 		if (count($this->games) === 0) return false;
 		foreach ($this->games as $game) {
 			if (!$game->isPlayed()) return false;

src/TournamentGenerator/Team.php

Indentation +14 added lines, -14 removed lines

@@ -14,20 +14,20 @@
 	private $sumScore = 0;
 
 	/**
-	* ARRAY WITH GROUPS AND IT'S RESULTS
-	* array (
-	* * groupId => array (
-	* * * "group"  => Group, # GROUP OBJECT
-	* * * "points" => int 0, # NUMBER OF POINTS AQUIRED
-	* * * "score"  => int 0, # SUM OF SCORE AQUIRED
-	* * * "wins"   => int 0, # NUMBER OF WINS
-	* * * "draws"  => int 0, # NUMBER OF DRAWS
-	* * * "losses" => int 0, # NUMBER OF LOSSES
-	* * * "second" => int 0, # NUMBER OF TIMES BEING SECOND (ONLY FOR INGAME OPTION OF 3 OR 4)
-	* * * "third"  => int 0  # NUMBER OF TIMES BEING THIRD  (ONLY FOR INGAME OPTION OF 4)
-	* * )
-	*)
-	*/
+	 * ARRAY WITH GROUPS AND IT'S RESULTS
+	 * array (
+	 * * groupId => array (
+	 * * * "group"  => Group, # GROUP OBJECT
+	 * * * "points" => int 0, # NUMBER OF POINTS AQUIRED
+	 * * * "score"  => int 0, # SUM OF SCORE AQUIRED
+	 * * * "wins"   => int 0, # NUMBER OF WINS
+	 * * * "draws"  => int 0, # NUMBER OF DRAWS
+	 * * * "losses" => int 0, # NUMBER OF LOSSES
+	 * * * "second" => int 0, # NUMBER OF TIMES BEING SECOND (ONLY FOR INGAME OPTION OF 3 OR 4)
+	 * * * "third"  => int 0  # NUMBER OF TIMES BEING THIRD  (ONLY FOR INGAME OPTION OF 4)
+	 * * )
+	 *)
+	 */
 	public $groupResults = [];
 
 	function __construct(string $name = 'team', $id = null) {

Spacing +10 added lines, -10 removed lines

@@ -104,14 +104,14 @@ 
 		return $this->sumScore;
 	}
 
-	public function addWin(string $groupId = ''){
+	public function addWin(string $groupId = '') {
 		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']->getWinPoints();
 		$this->sumPoints += $this->groupResults[$groupId]['group']->getWinPoints();
 		$this->groupResults[$groupId]['wins']++;
 		return $this;
 	}
-	public function removeWin(string $groupId = ''){
+	public function removeWin(string $groupId = '') {
 		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']->getWinPoints();
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->getWinPoints();
@@ -119,14 +119,14 @@ 
 		return $this;
 	}
 
-	public function addDraw(string $groupId = ''){
+	public function addDraw(string $groupId = '') {
 		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']->getDrawPoints();
 		$this->sumPoints += $this->groupResults[$groupId]['group']->getDrawPoints();
 		$this->groupResults[$groupId]['draws']++;
 		return $this;
 	}
-	public function removeDraw(string $groupId = ''){
+	public function removeDraw(string $groupId = '') {
 		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']->getDrawPoints();
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->getDrawPoints();
@@ -134,14 +134,14 @@ 
 		return $this;
 	}
 
-	public function addLoss(string $groupId = ''){
+	public function addLoss(string $groupId = '') {
 		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']->getLostPoints();
 		$this->sumPoints += $this->groupResults[$groupId]['group']->getLostPoints();
 		$this->groupResults[$groupId]['losses']++;
 		return $this;
 	}
-	public function removeLoss(string $groupId = ''){
+	public function removeLoss(string $groupId = '') {
 		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']->getLostPoints();
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->getLostPoints();
@@ -149,14 +149,14 @@ 
 		return $this;
 	}
 
-	public function addSecond(string $groupId = ''){
+	public function addSecond(string $groupId = '') {
 		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']->getSecondPoints();
 		$this->sumPoints += $this->groupResults[$groupId]['group']->getSecondPoints();
 		$this->groupResults[$groupId]['second']++;
 		return $this;
 	}
-	public function removeSecond(string $groupId = ''){
+	public function removeSecond(string $groupId = '') {
 		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']->getSecondPoints();
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->getSecondPoints();
@@ -164,14 +164,14 @@ 
 		return $this;
 	}
 
-	public function addThird(string $groupId = ''){
+	public function addThird(string $groupId = '') {
 		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']->getThirdPoints();
 		$this->sumPoints += $this->groupResults[$groupId]['group']->getThirdPoints();
 		$this->groupResults[$groupId]['third']++;
 		return $this;
 	}
-	public function removeThird(string $groupId = ''){
+	public function removeThird(string $groupId = '') {
 		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']->getThirdPoints();
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->getThirdPoints();

Braces +60 added lines, -20 removed lines

@@ -53,20 +53,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)) {
@@ -75,25 +81,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;
 	}
 
@@ -105,14 +121,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']->getWinPoints();
 		$this->sumPoints += $this->groupResults[$groupId]['group']->getWinPoints();
 		$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']->getWinPoints();
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->getWinPoints();
 		$this->groupResults[$groupId]['wins']--;
@@ -120,14 +140,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']->getDrawPoints();
 		$this->sumPoints += $this->groupResults[$groupId]['group']->getDrawPoints();
 		$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']->getDrawPoints();
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->getDrawPoints();
 		$this->groupResults[$groupId]['draws']--;
@@ -135,14 +159,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']->getLostPoints();
 		$this->sumPoints += $this->groupResults[$groupId]['group']->getLostPoints();
 		$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']->getLostPoints();
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->getLostPoints();
 		$this->groupResults[$groupId]['losses']--;
@@ -150,14 +178,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']->getSecondPoints();
 		$this->sumPoints += $this->groupResults[$groupId]['group']->getSecondPoints();
 		$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']->getSecondPoints();
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->getSecondPoints();
 		$this->groupResults[$groupId]['second']--;
@@ -165,14 +197,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']->getThirdPoints();
 		$this->sumPoints += $this->groupResults[$groupId]['group']->getThirdPoints();
 		$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']->getThirdPoints();
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->getThirdPoints();
 		$this->groupResults[$groupId]['third']--;
@@ -180,7 +216,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;
@@ -188,7 +226,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/Progression.php

Braces +18 added lines, -7 removed lines

@@ -38,12 +38,20 @@ 
 	}
 
 	public function progress(bool $blank = false) {
-		if ($this->progressed) return $this;
-		if ($blank) $teams = $this->from->isPlayed() ? $this->from->sortTeams(null, $this->filters) : $this->from->simulate($this->filters);
-		else $teams = $this->from->sortTeams(null, $this->filters);
+		if ($this->progressed) {
+			return $this;
+		}
+		if ($blank) {
+			$teams = $this->from->isPlayed() ? $this->from->sortTeams(null, $this->filters) : $this->from->simulate($this->filters);
+		} else {
+			$teams = $this->from->sortTeams(null, $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;
 
@@ -51,12 +59,15 @@ 
 			if ($blank) {
 				$this->to->addTeam(new BlankTeam($this.' - '.$i, $team, $this->from, $this));
 				$i++;
+			} else {
+				$team->addPoints($this->from->getProgressPoints());
 			}
-			else $team->addPoints($this->from->getProgressPoints());
 		}
 
 		$this->from->addProgressed($next);
-		if (!$blank) $this->to->addTeam($next);
+		if (!$blank) {
+			$this->to->addTeam($next);
+		}
 		$this->progressed = true;
 		return $this;
 	}