Heroyt / tournament-generator

src/classes/class_sorter_teams.php

Spacing +4 added lines, -4 removed lines

@@ -18,13 +18,13 @@ 
 					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;}
+				break; }
 			case \SCORE:{
 				uasort($teams, function($a, $b) use ($group) {
 					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;}
+				break; }
 		}
 
 		return $teams;
@@ -41,13 +41,13 @@ 
 					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;}
+				break; }
 			case \SCORE:{
 				uasort($teams, function($a, $b) use ($groupsIds) {
 					if ($a->sumScore($groupsIds) === $b->sumScore($groupsIds)) return 0;
 					return ($a->sumScore($groupsIds) > $b->sumScore($groupsIds) ? -1 : 1);
 				});
-				break;}
+				break; }
 		}
 
 		return $teams;

Braces +24 added lines, -8 removed lines

@@ -9,19 +9,27 @@ 
 {
 
 	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 @@ 
 		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;}

src/classes/class_round.php

Spacing +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
 		return $this->name;
 	}
 
-	public function addGroup(Group ...$groups){
+	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.');
@@ -35,7 +35,7 @@ 
 		$this->groups[] = $g->setSkip($this->allowSkip);
 		return $g;
 	}
-	public function getGroups(){
+	public function getGroups() {
 		$this->orderGroups();
 		return $this->groups;
 	}
@@ -44,16 +44,16 @@ 
 		return array_map(function($a) { return $a->id; }, $this->groups);
 	}
 	public function orderGroups() {
-		usort($this->groups, function($a, $b){
-			return $a->order - $b->order;
+		usort($this->groups, function($a, $b) {
+			return $a->order-$b->order;
 		});
 	}
 
-	public function allowSkip(){
+	public function allowSkip() {
 		$this->allowSkip = true;
 		return $this;
 	}
-	public function disallowSkip(){
+	public function disallowSkip() {
 		$this->allowSkip = false;
 		return $this;
 	}
@@ -65,7 +65,7 @@ 
 		return $this->allowSkip;
 	}
 
-	public function genGames(){
+	public function genGames() {
 		foreach ($this->groups as $group) {
 			$group->genGames();
 			$this->games = array_merge($this->games, $group->orderGames());
@@ -75,7 +75,7 @@ 
 	public function getGames() {
 		return $this->games;
 	}
-	public function isPlayed(){
+	public function isPlayed() {
 		foreach ($this->groups as $group) {
 			if (!$group->isPlayed()) return false;
 		}
@@ -84,7 +84,7 @@ 
 
 	public function addTeam(...$teams) {
 		foreach ($teams as $team) {
-			if ($team instanceof Team)  {
+			if ($team instanceof Team) {
 				$this->teams[] = $team;
 			}
 			elseif (gettype($team) === 'array') {
@@ -153,7 +153,7 @@ 
 		return $this;
 	}
 
-	public function progress(bool $blank = false){
+	public function progress(bool $blank = false) {
 		foreach ($this->groups as $group) {
 			$group->progress($blank);
 		}

Braces +20 added lines, -9 removed lines

@@ -25,8 +25,11 @@ 
 
 	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 @@ 
 	}
 	public function isPlayed(){
 		foreach ($this->groups as $group) {
-			if (!$group->isPlayed()) return false;
+			if (!$group->isPlayed()) {
+				return false;
+			}
 		}
 		return true;
 	}
@@ -86,10 +91,11 @@ 
 		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 @@ 
 						'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 @@ 
 
 	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 @@ 
 		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));
+					}
 				}
 			}
 		}

src/classes/class_tournament.php

Spacing +6 added lines, -6 removed lines

@@ -20,7 +20,7 @@ 
 
 	private $allowSkip = false;
 
-	function __construct(string $name = ''){
+	function __construct(string $name = '') {
 		$this->name = $name;
 	}
 	public function __toString() {
@@ -55,16 +55,16 @@ 
 	public function getCategoryWait() {
 		return $this->expectedCategoryWait;
 	}
-	public function getTournamentTime(){
+	public function getTournamentTime() {
 		$games = count($this->getGames());
 		return $games*$this->expectedPlay+$games*$this->expectedGameWait+count($this->getRounds())*$this->expectedRoundWait+count($this->getCategories())*$this->expectedCategoryWait;
 	}
 
-	public function allowSkip(){
+	public function allowSkip() {
 		$this->allowSkip = true;
 		return $this;
 	}
-	public function disallowSkip(){
+	public function disallowSkip() {
 		$this->allowSkip = false;
 		return $this;
 	}
@@ -76,7 +76,7 @@ 
 		return $this->allowSkip;
 	}
 
-	public function addCategory(Category ...$categories){
+	public function addCategory(Category ...$categories) {
 		foreach ($categories as $category) {
 			if ($category instanceof Category) $this->categories[] = $category;
 			else throw new \Exception('Trying to add category which is not an instance of the Category class.');
@@ -117,7 +117,7 @@ 
 
 	public function addTeam(...$teams) {
 		foreach ($teams as $team) {
-			if ($team instanceof Team)  {
+			if ($team instanceof Team) {
 				$this->teams[] = $team;
 				continue;
 			}

Braces +26 added lines, -11 removed lines

@@ -78,8 +78,11 @@ 
 
 	public function addCategory(Category ...$categories){
 		foreach ($categories as $category) {
-			if ($category instanceof Category) $this->categories[] = $category;
-			else throw new \Exception('Trying to add category which is not an instance of the Category class.');
+			if ($category instanceof Category) {
+				$this->categories[] = $category;
+			} else {
+				throw new \Exception('Trying to add category which is not an instance of the Category class.');
+			}
 		}
 		return $this;
 	}
@@ -94,8 +97,11 @@ 
 
 	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 the Round class.');
+			if ($round instanceof Round) {
+				$this->rounds[] = $round;
+			} else {
+				throw new \Exception('Trying to add round which is not an instance of the Round class.');
+			}
 		}
 		return $this;
 	}
@@ -120,8 +126,7 @@ 
 			if ($team instanceof Team)  {
 				$this->teams[] = $team;
 				continue;
-			}
-			elseif (gettype($team) === 'array') {
+			} elseif (gettype($team) === 'array') {
 				$teams = array_merge($teams, array_filter($team, function($a) {
 					return ($a instanceof Team);
 				}));
@@ -147,7 +152,9 @@ 
 			}
 			$this->teams = $teams;
 		}
-		if ($ordered) $this->sortTeams($ordering);
+		if ($ordered) {
+			$this->sortTeams($ordering);
+		}
 		return $this->teams;
 	}
 	public function sortTeams($ordering = \POINTS) {
@@ -170,7 +177,9 @@ 
 
 	public function splitTeams(Round ...$wheres) {
 
-		if (count($wheres) === 0) $wheres = $this->getRounds();
+		if (count($wheres) === 0) {
+			$wheres = $this->getRounds();
+		}
 
 		foreach ($wheres as $key => $value) {
 			if (gettype($value) === 'array') {
@@ -185,7 +194,9 @@ 
 
 		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) {
@@ -197,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;
 	}
 

src/classes/class_filter.php

Braces +32 added lines, -20 removed lines

@@ -26,27 +26,31 @@ 
 				switch (strtolower($key)) {
 					case 'and':
 						foreach ($teams as $tkey => $team) {
-							if (!$this->filterAnd($team, $filter)) unset($teams[$tkey]); // IF FILTER IS NOT VALIDATED REMOVE TEAM FROM RETURN ARRAY
+							if (!$this->filterAnd($team, $filter)) {
+								unset($teams[$tkey]);
+							}
+							// IF FILTER IS NOT VALIDATED REMOVE TEAM FROM RETURN ARRAY
 						}
 						break;
 					case 'or':
 						foreach ($teams as $tkey => $team) {
-							if (!$this->filterOr($team, $filter)) unset($teams[$tkey]); // IF FILTER IS NOT VALIDATED REMOVE TEAM FROM RETURN ARRAY
+							if (!$this->filterOr($team, $filter)) {
+								unset($teams[$tkey]);
+							}
+							// IF FILTER IS NOT VALIDATED REMOVE TEAM FROM RETURN ARRAY
 						}
 						break;
 					default:
 						throw new \Exception('Unknown opperand type "'.$key.'". Expected "and" or "or".');
 						break;
 				}
-			}
-			elseif ($filter instanceof TeamFilter) {
+			} elseif ($filter instanceof TeamFilter) {
 				foreach ($teams as $tkey => $team) {
 					if (!$filter->validate($team, $this->group->id, 'sum', $this->group)) {
 						unset($teams[$tkey]); // IF FILTER IS NOT VALIDATED REMOVE TEAM FROM RETURN ARRAY
 					}
 				}
-			}
-			else {
+			} else {
 				throw new \Exception('Filer ['.$key.'] is not an instance of TeamFilter class');
 			}
 		}
@@ -58,20 +62,24 @@ 
 			if (gettype($value) === 'array') {
 				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".');
 						break;
 				}
-			}
-			elseif ($value instanceof TeamFilter) {
-				if (!$value->validate($team, $this->group->id, 'sum', $this->group)) return false;
-			}
-			else {
+			} elseif ($value instanceof TeamFilter) {
+				if (!$value->validate($team, $this->group->id, 'sum', $this->group)) {
+					return false;
+				}
+			} else {
 				throw new \Exception('Filer ['.$key.'] is not an instance of TeamFilter class');
 			}
 		}
@@ -82,20 +90,24 @@ 
 			if (gettype($value) === 'array') {
 				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".');
 						break;
 				}
-			}
-			elseif ($value instanceof TeamFilter) {
-				if (!$value->validate($team, $this->group->id, 'sum', $this->group)) return true;
-			}
-			else {
+			} elseif ($value instanceof TeamFilter) {
+				if (!$value->validate($team, $this->group->id, 'sum', $this->group)) {
+					return true;
+				}
+			} else {
 				throw new \Exception('Filer ['.$key.'] is not an instance of TeamFilter class');
 			}
 		}

src/classes/class_simulator.php

Braces +12 added lines, -4 removed lines

@@ -18,7 +18,9 @@ 
 			$game->setResults($results);
 		}
 		$return = $group->sortTeams($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 = [];
 
@@ -55,7 +61,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->getCategories() as $category) {
 			$games = array_merge($games, $category->genGamesSimulate());

src/classes/class_group.php

Spacing +5 added lines, -5 removed lines

@@ -54,11 +54,11 @@ 
 		return 'Group '.$this->name;
 	}
 
-	public function allowSkip(){
+	public function allowSkip() {
 		$this->generator->allowSkip();
 		return $this;
 	}
-	public function disallowSkip(){
+	public function disallowSkip() {
 		$this->generator->disallowSkip();
 		return $this;
 	}
@@ -194,11 +194,11 @@ 
 		$this->games[] = $g;
 		return $g;
 	}
-	public function addGame(...$games){
+	public function addGame(...$games) {
 		foreach ($games as $key => $game) {
 			if (gettype($game) === 'array') {
 				unset($games[$key]);
-				$games = array_merge($games, array_filter($game, function($a){ return ($a instanceof Game); }));
+				$games = array_merge($games, array_filter($game, function($a) { return ($a instanceof Game); }));
 				continue;
 			}
 			if (!$game instanceof Game) throw new \Exception('Trying to add game which is not instance of Game object.');
@@ -224,7 +224,7 @@ 
 		}
 		return $this;
 	}
-	public function isPlayed(){
+	public function isPlayed() {
 		foreach ($this->games as $game) {
 			if (!$game->isPlayed()) return false;
 		}

Braces +23 added lines, -9 removed lines

@@ -99,8 +99,11 @@ 
 	public function getTeams($filters = []) {
 		$teams = $this->teams;
 
-		if (gettype($filters) !== 'array' && $filters instanceof TeamFilter) $filters = [$filters];
-		elseif (gettype($filters) !== 'array') $filters = [];
+		if (gettype($filters) !== 'array' && $filters instanceof TeamFilter) {
+			$filters = [$filters];
+		} elseif (gettype($filters) !== 'array') {
+			$filters = [];
+		}
 
 		// APPLY FILTERS
 		$filter = new Filter($this, $filters);
@@ -125,7 +128,9 @@ 
 		return $t;
 	}
 	public function sortTeams($filters = [], $ordering = null) {
-		if (!isset($ordering)) $ordering = $this->ordering;
+		if (!isset($ordering)) {
+			$ordering = $this->ordering;
+		}
 		Utilis\Sorter\Teams::sortGroup($this->teams, $this, $ordering);
 		return $this->getTeams($filters);
 	}
@@ -139,7 +144,9 @@ 
 	}
 
 	public function setOrdering(string $ordering = \POINTS) {
-		if (!in_array($ordering, orderingTypes)) throw new \Exception('Unknown group ordering: '.$ordering);
+		if (!in_array($ordering, orderingTypes)) {
+			throw new \Exception('Unknown group ordering: '.$ordering);
+		}
 		$this->ordering = $ordering;
 		return $this;
 	}
@@ -171,8 +178,9 @@ 
 	}
 	public function addProgressed(...$teams) {
 		foreach ($teams as $team) {
-			if ($team instanceOf Team) $this->progressed[] = $team->id;
-			elseif (gettype($team) === 'array') {
+			if ($team instanceOf Team) {
+				$this->progressed[] = $team->id;
+			} elseif (gettype($team) === 'array') {
 				$this->progressed = array_merge($this->progressed, array_filter($team, function($a) {
 					return ($a instanceof Team);
 				}));
@@ -201,7 +209,9 @@ 
 				$games = array_merge($games, array_filter($game, function($a){ return ($a instanceof Game); }));
 				continue;
 			}
-			if (!$game instanceof Game) throw new \Exception('Trying to add game which is not instance of Game object.');
+			if (!$game instanceof Game) {
+				throw new \Exception('Trying to add game which is not instance of Game object.');
+			}
 			$this->games[] = $game;
 		}
 		return $this;
@@ -210,7 +220,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;
 	}
@@ -226,7 +238,9 @@ 
 	}
 	public function isPlayed(){
 		foreach ($this->games as $game) {
-			if (!$game->isPlayed()) return false;
+			if (!$game->isPlayed()) {
+				return false;
+			}
 		}
 		return true;
 	}