Heroyt / tournament-generator

src/classes/class_category.php

Braces +20 added lines, -9 removed lines

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

src/classes/class_generator.php

Braces +57 added lines, -19 removed lines

@@ -37,8 +37,11 @@ 
 
 
 	public function setType(/** @scrutinizer ignore-all */ string $type = R_R) {
-		if (in_array($type, groupTypes)) $this->type = $type;
-		else throw new \Exception('Unknown group type: '.$type);
+		if (in_array($type, groupTypes)) {
+			$this->type = $type;
+		} else {
+			throw new \Exception('Unknown group type: '.$type);
+		}
 		return $this;
 	}
 	public function getType() {
@@ -46,7 +49,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;
 	}
@@ -55,7 +60,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;
 	}
@@ -81,7 +88,9 @@ 
 					$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.' - 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.' - allow skip '.($this->allowSkip ? 'True' : 'False'));
+				}
 				break;
 			case COND_SPLIT:
 				$games = [];
@@ -96,19 +105,24 @@ 
 					while ($g > 0) {
 						foreach ($games as $key => $group) {
 							$this->group->addGame(array_shift($games[$key]));
-							if (count($games[$key]) === 0) unset($games[$key]);
+							if (count($games[$key]) === 0) {
+								unset($games[$key]);
+							}
 							$g--;
 						}
 					}
+				} else {
+					$this->group->addGame($this->r_rGames());
 				}
-				else $this->group->addGame($this->r_rGames());
 				break;
 		}
 		return $this->group->getGames();
 	}
 	public function r_rGames(array $teams = []) {
 		$games = [];
-		if (count($teams) === 0) $teams = $this->group->getTeams();
+		if (count($teams) === 0) {
+			$teams = $this->group->getTeams();
+		}
 		switch ($this->inGame) {
 			case 2:
 				$games = Generator::circle_genGames2($teams, $this->group);
@@ -149,7 +163,9 @@ 
 
 		$games = $this->group->getGames();
 
-		if (count($games) <= 4) return $games;
+		if (count($games) <= 4) {
+			return $games;
+		}
 
 		$this->games = [];
 
@@ -179,7 +195,9 @@ 
 					break;
 				}
 			}
-			if ($found) continue;
+			if ($found) {
+				continue;
+			}
 
 			// CYCLE 2
 			// ! TEAM WHICH PLAYED IN LAST TWO GAMES (NOT 6 or 7)
@@ -191,7 +209,9 @@ 
 					break;
 				}
 			}
-			if ($found) continue;
+			if ($found) {
+				continue;
+			}
 
 			// CYCLE 3
 			// NOT TEAM WHICH PLAYED IN LAST THREE GAMES (NOT 7)
@@ -204,7 +224,9 @@ 
 					break;
 				}
 			}
-			if ($found) continue;
+			if ($found) {
+				continue;
+			}
 
 			// CYCLE 4
 			// NOT TEAM WHICH PLAYED IN LAST THREE GAMES (NOT 7)
@@ -216,7 +238,9 @@ 
 					break;
 				}
 			}
-			if ($found) continue;
+			if ($found) {
+				continue;
+			}
 
 			// CYCLE 5
 			// TEAMS THAT DIDN'T PLAY IN LAST GAME WILL PLAY THIS GAME (< 4)
@@ -228,7 +252,9 @@ 
 					break;
 				}
 			}
-			if ($found) continue;
+			if ($found) {
+				continue;
+			}
 
 			// CYCLE 6
 			// FIRST AVAILABLE GAME
@@ -269,11 +295,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;
 
@@ -283,7 +315,10 @@ 
 	public static function circle_genGames2(array $teams = [], Group $group = null) {
 		$bracket = []; // ARRAY OF GAMES
 
-		if (count($teams) % 2 != 0) $teams[] = DUMMY_TEAM; // IF NOT EVEN NUMBER OF TEAMS, ADD DUMMY
+		if (count($teams) % 2 != 0) {
+			$teams[] = DUMMY_TEAM;
+		}
+		// IF NOT EVEN NUMBER OF TEAMS, ADD DUMMY
 
 		shuffle($teams); // SHUFFLE TEAMS FOR MORE RANDOMNESS
 
@@ -307,7 +342,10 @@ 
 			$reverse = array_reverse($teams);
 			$away = $reverse[$i];
 
-			if (($home == DUMMY_TEAM || $away == DUMMY_TEAM)) continue; // SKIP WHEN DUMMY_TEAM IS PRESENT
+			if (($home == DUMMY_TEAM || $away == DUMMY_TEAM)) {
+				continue;
+			}
+			// SKIP WHEN DUMMY_TEAM IS PRESENT
 
 			$bracket[] = new Game([$home, $away], $group);
 

src/classes/class_teamFilter.php

Braces +44 added lines, -21 removed lines

@@ -44,11 +44,19 @@ 
 	private $groups = [];
 
 	function __construct(string $what = 'points', string $how = '>', $val = 0, $groups = []){
-		if (in_array(strtolower($what), ['points', 'score', 'wins', 'draws', 'losses', 'second', 'third', 'team', 'notprogressed', 'progressed'])) $this->what = strtolower($what);
-		if (in_array($how, ['>', '<', '>=', '<=', '=', '!='])) $this->how = $how;
-		if ((gettype($val) === 'integer' && strtolower($what) !== 'team') || ($val instanceof Team && strtolower($what) === 'team')) $this->val = $val;
+		if (in_array(strtolower($what), ['points', 'score', 'wins', 'draws', 'losses', 'second', 'third', 'team', 'notprogressed', 'progressed'])) {
+			$this->what = strtolower($what);
+		}
+		if (in_array($how, ['>', '<', '>=', '<=', '=', '!='])) {
+			$this->how = $how;
+		}
+		if ((gettype($val) === 'integer' && strtolower($what) !== 'team') || ($val instanceof Team && strtolower($what) === 'team')) {
+			$this->val = $val;
+		}
 		foreach ($groups as $group) {
-			if ($group instanceof Group) $this->groups[] =  $group->id;
+			if ($group instanceof Group) {
+				$this->groups[] =  $group->id;
+			}
 		}
 	}
 	public function __toString() {
@@ -56,37 +64,54 @@ 
 	}
 
 	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') {
 			switch ($this->how) {
 				case '=':
-					if ($this->val === $team) return true;
+					if ($this->val === $team) {
+						return true;
+					}
 					break;
 				case '!=':
-					if ($this->val !== $team) return true;
+					if ($this->val !== $team) {
+						return true;
+					}
 					break;
 			}
 			return false;
-		}
-		elseif ($this->what == 'notprogressed') {
-			if ($from === null) throw new \Exception('Group $from was not defined.');
+		} elseif ($this->what == 'notprogressed') {
+			if ($from === null) {
+				throw new \Exception('Group $from was not defined.');
+			}
 			return !$from->isProgressed($team);
-		}
-		elseif ($this->what == 'progressed') {
-			if ($from === null) throw new \Exception('Group $from was not defined.');
+		} elseif ($this->what == 'progressed') {
+			if ($from === null) {
+				throw new \Exception('Group $from was not defined.');
+			}
 			return $from->isProgressed($team);
 		}
-		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.');
+		}
 		$comp = 0;
 		if (gettype($groupsId) === 'array' && count($groupsId) > 0) {
 			$sum = 0;
 			$max = null;
 			$min = null;
 			foreach ($groupsId as $id) {
-				if (!isset($team->groupResults[$id])) continue; // IF TEAM DIDN'T PLAY IN THAT GROUP -> SKIP
+				if (!isset($team->groupResults[$id])) {
+					continue;
+				}
+				// IF TEAM DIDN'T PLAY IN THAT GROUP -> SKIP
 				$sum += $team->groupResults[$id][$this->what];
-				if ($team->groupResults[$id][$this->what] > $max || $max === null) $max = $team->groupResults[$id][$this->what];
-				if ($team->groupResults[$id][$this->what] < $min || $min === null) $min = $team->groupResults[$id][$this->what];
+				if ($team->groupResults[$id][$this->what] > $max || $max === null) {
+					$max = $team->groupResults[$id][$this->what];
+				}
+				if ($team->groupResults[$id][$this->what] < $min || $min === null) {
+					$min = $team->groupResults[$id][$this->what];
+				}
 			}
 			switch (strtolower($operation)) {
 				case 'sum':
@@ -102,11 +127,9 @@ 
 					$comp = $min;
 					break;
 			}
-		}
-		elseif (gettype($groupsId) === 'string' && isset($team->groupResults[$groupsId])) {
+		} elseif (gettype($groupsId) === 'string' && isset($team->groupResults[$groupsId])) {
 			$comp = $team->groupResults[$groupsId][$this->what];
-		}
-		else {
+		} else {
 			throw new \Exception("Couldn't find group of id ".print_r($groupsId, true));
 		}
 

src/classes/class_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(){
@@ -74,7 +82,9 @@ 
 	}
 	public function getTeam(string $id) {
 		foreach ($this->teams as $team) {
-			if ($team->id === $id) return $team;
+			if ($team->id === $id) {
+				return $team;
+			}
 		}
 		return false;
 	}
@@ -85,13 +95,17 @@ 
 	* )
 	*/
 	public function setResults(array $results = []) {
-		if (count($this->results) === 0) $this->resetResults();
+		if (count($this->results) === 0) {
+			$this->resetResults();
+		}
 		arsort($results);
 		$inGame = /** @scrutinizer ignore-call */ $this->group->getInGame();
 		$i = 1;
 		foreach ($results as $id => $score) {
 			$team = $this->getTeam($id);
-			if ($team === false) throw new \Exception('Couldn\'t find team with id of "'.$id.'"');
+			if ($team === false) {
+				throw new \Exception('Couldn\'t find team with id of "'.$id.'"');
+			}
 			$this->results[$team->id] = ['score' => $score];
 			$team->sumScore += $score;
 			$prev = prev($results);
@@ -118,13 +132,11 @@ 
 			$this->drawIds[] = $team->id;
 			$team->addDraw($this->group->id);
 			$this->results[$team->id] += ['points' => $this->group->drawPoints, 'type' => 'draw'];
-		}
-		elseif ($i === 1) {
+		} elseif ($i === 1) {
 			$this->winId = $team->id;
 			$team->addWin($this->group->id);
 			$this->results[$team->id] += ['points' => $this->group->winPoints, 'type' => 'win'];
-		}
-		else {
+		} else {
 			$this->lossId = $team->id;
 			$team->addLoss($this->group->id);
 			$this->results[$team->id] += ['points' => $this->group->lostPoints, 'type' => 'loss'];
@@ -220,7 +232,9 @@ 
 	}
 
 	public function isPlayed() {
-		if (count($this->results) > 0) return true;
+		if (count($this->results) > 0) {
+			return true;
+		}
 		return false;
 	}
 }

src/classes/class_group.php

Braces +89 added lines, -47 removed lines

@@ -30,14 +30,18 @@ 
 		foreach ($settings as $key => $value) {
 			switch ($key) {
 				case 'name':
-					if (gettype($value) !== 'string') throw new \Exception('Expected string as group name '.gettype($value).' given');
+					if (gettype($value) !== 'string') {
+						throw new \Exception('Expected string as group name '.gettype($value).' given');
+					}
 					$this->name = $value;
 					break;
 				case 'type':
 					$this->generator->setType($value);
 					break;
 				case 'ordering':
-					if (!in_array($value, orderingTypes)) throw new \Exception('Unknown group ordering: '.$value);
+					if (!in_array($value, orderingTypes)) {
+						throw new \Exception('Unknown group ordering: '.$value);
+					}
 					$this->ordering = $value;
 					break;
 				case 'inGame':
@@ -45,7 +49,9 @@ 
 					break;
 				case 'maxSize':
 					$value = (int) $value;
-					if ($value > 1) $this->generator->setMaxSize($value);
+					if ($value > 1) {
+						$this->generator->setMaxSize($value);
+					}
 					break;
 				case 'order':
 					$this->order = (int) $value;
@@ -87,10 +93,11 @@ 
 					'second' => 0,
 					'third'  => 0
 				];
-			}
-			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,
@@ -102,16 +109,20 @@ 
 						'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;
 	}
 	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
 		foreach ($filters as $key => $filter) {
@@ -119,27 +130,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->id, 'sum', $this)) {
 						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');
 			}
 		}
@@ -161,18 +176,26 @@ 
 		return $t;
 	}
 	public function sortTeams($filters = [], $ordering = null) {
-		if (!isset($ordering)) $ordering = $this->ordering;
+		if (!isset($ordering)) {
+			$ordering = $this->ordering;
+		}
 		switch ($ordering) {
 			case POINTS:{
 				usort($this->teams, function($a, $b) {
-					if ($a->groupResults[$this->id]["points"] === $b->groupResults[$this->id]["points"] && $a->groupResults[$this->id]["score"] === $b->groupResults[$this->id]["score"]) return 0;
-					if ($a->groupResults[$this->id]["points"] === $b->groupResults[$this->id]["points"]) return ($a->groupResults[$this->id]["score"] > $b->groupResults[$this->id]["score"] ? -1 : 1);
+					if ($a->groupResults[$this->id]["points"] === $b->groupResults[$this->id]["points"] && $a->groupResults[$this->id]["score"] === $b->groupResults[$this->id]["score"]) {
+						return 0;
+					}
+					if ($a->groupResults[$this->id]["points"] === $b->groupResults[$this->id]["points"]) {
+						return ($a->groupResults[$this->id]["score"] > $b->groupResults[$this->id]["score"] ? -1 : 1);
+					}
 					return ($a->groupResults[$this->id]["points"] > $b->groupResults[$this->id]["points"] ? -1 : 1);
 				});
 				break;}
 			case SCORE:{
 				usort($this->teams, function($a, $b) {
-					if ($a->groupResults[$this->id]["score"] === $b->groupResults[$this->id]["score"]) return 0;
+					if ($a->groupResults[$this->id]["score"] === $b->groupResults[$this->id]["score"]) {
+						return 0;
+					}
 					return ($a->groupResults[$this->id]["score"] > $b->groupResults[$this->id]["score"] ? -1 : 1);
 				});
 				break;}
@@ -185,20 +208,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->id, 'sum', $this)) return false;
-			}
-			else {
+			} elseif ($value instanceof TeamFilter) {
+				if (!$value->validate($team, $this->id, 'sum', $this)) {
+					return false;
+				}
+			} else {
 				throw new \Exception('Filer ['.$key.'] is not an instance of TeamFilter class');
 			}
 		}
@@ -209,20 +236,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->id, 'sum', $this)) return true;
-			}
-			else {
+			} elseif ($value instanceof TeamFilter) {
+				if (!$value->validate($team, $this->id, 'sum', $this)) {
+					return true;
+				}
+			} else {
 				throw new \Exception('Filer ['.$key.'] is not an instance of TeamFilter class');
 			}
 		}
@@ -238,8 +269,11 @@ 
 	}
 
 	public function setOrdering(string $ordering = POINTS) {
-		if (in_array($ordering, orderingTypes)) $this->ordering = $ordering;
-		else throw new \Exception('Unknown group ordering: '.$ordering);
+		if (in_array($ordering, orderingTypes)) {
+			$this->ordering = $ordering;
+		} else {
+			throw new \Exception('Unknown group ordering: '.$ordering);
+		}
 		return $this;
 	}
 	public function getOrdering() {
@@ -272,16 +306,13 @@ 
 		foreach ($teams as $team) {
 			if ($team instanceOf Team) {
 				$this->progressed[] = $team->id;
-			}
-			elseif (gettype($team) === 'string' || gettype($team) === 'integer') {
+			} elseif (gettype($team) === 'string' || gettype($team) === 'integer') {
 				$this->progressed[] = $team;
-			}
-			elseif (gettype($team) === 'array') {
+			} elseif (gettype($team) === 'array') {
 				foreach ($team as $teamInner) {
 					if ($teamInner instanceOf Team) {
 						$this->progressed[] = $teamInner->id;
-					}
-					elseif (gettype($teamInner) === 'string' || gettype($teamInner) === 'integer') {
+					} elseif (gettype($teamInner) === 'string' || gettype($teamInner) === 'integer') {
 						$this->progressed[] = $teamInner;
 					}
 				}
@@ -314,8 +345,11 @@ 
 			}
 		}
 		foreach ($games as $game) {
-			if ($game instanceof Game) $this->games[] = $game;
-			else throw new \Exception('Trying to add game which is not instance of Game object.');
+			if ($game instanceof Game) {
+				$this->games[] = $game;
+			} else {
+				throw new \Exception('Trying to add game which is not instance of Game object.');
+			}
 		}
 		return $this;
 	}
@@ -323,7 +357,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;
 	}
@@ -338,7 +374,9 @@ 
 			$game->setResults($results);
 		}
 		$return = $this->sortTeams($filters);
-		if (!$reset) return $return;
+		if (!$reset) {
+			return $return;
+		}
 		foreach ($this->getGames() as $game) {
 			$game->resetResults();
 		}
@@ -346,13 +384,17 @@ 
 	}
 	public function resetGames() {
 		foreach ($this->getGames() as $game) {
-			if (isset($game)) $game->resetResults();
+			if (isset($game)) {
+				$game->resetResults();
+			}
 		}
 		return $this;
 	}
 	public function isPlayed(){
 		foreach ($this->games as $game) {
-			if ((isset($game) || !$this->getSkip()) && !$game->isPlayed()) return false;
+			if ((isset($game) || !$this->getSkip()) && !$game->isPlayed()) {
+				return false;
+			}
 		}
 		return true;
 	}

src/classes/class_progression.php

Braces +18 added lines, -7 removed lines

@@ -27,18 +27,26 @@ 
 
 	public function addFilter(...$filters) {
 		foreach ($filters as $filter) {
-			if (!$filter instanceof TeamFilter) throw new \Exception('Trying to add filter which is not an instance of TeamFilter.');
+			if (!$filter instanceof TeamFilter) {
+				throw new \Exception('Trying to add filter which is not an instance of TeamFilter.');
+			}
 			$this->filters[] = $filter;
 		}
 		return $this;
 	}
 
 	public function progress(bool $blank = false) {
-		if ($blank) $teams = $this->from->isPlayed() ? $this->from->sortTeams($this->filters) : $this->from->simulate($this->filters);
-		else $teams = $this->from->sortTeams($this->filters);
+		if ($blank) {
+			$teams = $this->from->isPlayed() ? $this->from->sortTeams($this->filters) : $this->from->simulate($this->filters);
+		} else {
+			$teams = $this->from->sortTeams($this->filters);
+		}
 
-		if (count($this->filters) === 0 || $this->len !== null || $this->start !== 0) $next = array_splice($teams, $this->start, ($this->len === null ? count($teams) : $this->len));
-		else $next = $teams;
+		if (count($this->filters) === 0 || $this->len !== null || $this->start !== 0) {
+			$next = array_splice($teams, $this->start, ($this->len === null ? count($teams) : $this->len));
+		} else {
+			$next = $teams;
+		}
 
 		$i = 1;
 
@@ -46,12 +54,15 @@ 
 			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/classes/class_round.php

Braces +32 added lines, -13 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;
 	}
@@ -78,7 +81,9 @@ 
 	}
 	public function isPlayed(){
 		foreach ($this->groups as $group) {
-			if (!$group->isPlayed()) return false;
+			if (!$group->isPlayed()) {
+				return false;
+			}
 		}
 		return true;
 	}
@@ -87,10 +92,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,
@@ -102,8 +108,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,14 +138,20 @@ 
 		switch ($ordering) {
 			case POINTS:{
 				uasort($this->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($this->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;}
@@ -148,7 +161,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') {
@@ -163,7 +178,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));
+					}
 				}
 			}
 		}
@@ -179,7 +196,9 @@ 
 
 	public function simulate() {
 		foreach ($this->groups as $group) {
-			if ($group->isPlayed()) continue;
+			if ($group->isPlayed()) {
+				continue;
+			}
 			$group->simulate([], false);
 		}
 		return $this;

src/classes/class_tournament.php

Braces +40 added lines, -20 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;
 	}
@@ -119,13 +125,15 @@ 
 		foreach ($teams as $team) {
 			if ($team instanceof Team)  {
 				$this->teams[] = $team;
-			}
-			elseif (gettype($team) === 'array') {
+			} elseif (gettype($team) === 'array') {
 				foreach ($team as $team2) {
-					if ($team2 instanceof Team) $this->teams[] = $team2;
+					if ($team2 instanceof Team) {
+						$this->teams[] = $team2;
+					}
 				}
+			} else {
+				throw new \Exception('Trying to add team which is not an instance of Team class');
 			}
-			else throw new \Exception('Trying to add team which is not an instance of Team class');
 		}
 		return $this;
 	}
@@ -170,18 +178,24 @@ 
 
 	public function splitTeams(...$wheres) {
 
-		if (count($wheres) === 0) $wheres = array_merge($this->getRounds(), $this->getCategories());
+		if (count($wheres) === 0) {
+			$wheres = array_merge($this->getRounds(), $this->getCategories());
+		}
 
 		foreach ($wheres as $key => $value) {
 			if (gettype($value) === 'array') {
 				unset($wheres[$key]);
 				foreach ($value as $key2 => $value2) {
-					if (!$value2 instanceof Round && !$value2 instanceof Category) throw new \Exception('Trying to split teams to another object, that is not instance of Category or Round.');
+					if (!$value2 instanceof Round && !$value2 instanceof Category) {
+						throw new \Exception('Trying to split teams to another object, that is not instance of Category or Round.');
+					}
 				}
 				$wheres = array_merge($wheres, $value);
 				continue;
 			}
-			if (!$value instanceof Round && !$value instanceof Category) throw new \Exception('Trying to split teams to another object, that is not instance of Category or Round.');
+			if (!$value instanceof Round && !$value instanceof Category) {
+				throw new \Exception('Trying to split teams to another object, that is not instance of Category or Round.');
+			}
 		}
 
 		$teams = $this->getTeams();
@@ -189,7 +203,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) {
@@ -204,8 +220,7 @@ 
 			foreach ($this->categories as $category) {
 				$games = array_merge($games, $category->genGamesSimulate());
 			}
-		}
-		elseif (count($this->rounds) > 0) {
+		} elseif (count($this->rounds) > 0) {
 			foreach ($this->rounds as $round) {
 				$games = array_merge($games, $round->genGames());
 				$round->simulate()->progress(true);
@@ -213,9 +228,12 @@ 
 			foreach ($this->rounds as $round) {
 				$round->resetGames();
 			}
+		} else {
+			throw new \Exception('There are no rounds or categories to simulate games from.');
+		}
+		if ($returnTime) {
+			return $this->getTournamentTime();
 		}
-		else throw new \Exception('There are no rounds or categories to simulate games from.');
-		if ($returnTime) return $this->getTournamentTime();
 		return $games;
 	}
 	public function genGamesSimulateReal(bool $returnTime = false) {
@@ -224,16 +242,18 @@ 
 			foreach ($this->categories as $category) {
 				$games = array_merge($games, $category->genGamesSimulate());
 			}
-		}
-		elseif (count($this->rounds) > 0) {
+		} elseif (count($this->rounds) > 0) {
 			foreach ($this->rounds as $round) {
 				$games = array_merge($games, $round->genGames());
 				$round->simulate();
 				$round->progress();
 			}
+		} else {
+			throw new \Exception('There are no rounds or categories to simulate games from.');
+		}
+		if ($returnTime) {
+			return $this->getTournamentTime();
 		}
-		else throw new \Exception('There are no rounds or categories to simulate games from.');
-		if ($returnTime) return $this->getTournamentTime();
 		return $games;
 	}
 

src/classes/class_team.php

Braces +51 added lines, -17 removed lines

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