Heroyt / tournament-generator

src/TournamentGenerator/TeamFilter.php

Spacing +2 added lines, -2 removed lines

@@ -43,14 +43,14 @@
 
 	private $groups = [];
 
-	function __construct(string $what = 'points', string $how = '>', $val = 0, array $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.')');
 		$this->what = strtolower($what);
 		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).')');
 		$this->val = $val;
-		$this->groups = array_map(function($a) { return $a->getId(); }, array_filter($groups, function($a) {return ($a instanceof Group);}));
+		$this->groups = array_map(function($a) { return $a->getId(); }, array_filter($groups, function($a) {return ($a instanceof Group); }));
 	}
 	public function __toString() {
 		return 'Filter: '.$this->what.' '.($this->what !== 'notprogressed' && $this->what !== 'progressed' ? $this->how.' '.$this->val : '');

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);
 

src/TournamentGenerator/Group.php

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;
 	}
@@ -139,9 +139,9 @@ 
 		}
 	}
 	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);
 			})));
 		}
@@ -161,11 +161,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;
 	}
@@ -187,7 +187,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;

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;
 	}

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 +29 added lines, -14 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;
 		}
@@ -60,18 +65,23 @@ 
 			if (is_array($value)) {
 				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');
@@ -83,18 +93,23 @@ 
 			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/Progression.php

Braces +15 added lines, -6 removed lines

@@ -33,11 +33,17 @@ 
 	}
 
 	public function progress(bool $blank = false) {
-		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 ($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;
 
@@ -45,12 +51,15 @@ 
 			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;
 	}
 

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) {