Heroyt / tournament-generator

src/TournamentGenerator/TeamFilter.php

Spacing +2 added lines, -2 removed lines

@@ -43,11 +43,11 @@
 
 	private $groups = [];
 
-	function __construct(string $what = 'points', string $how = '>', $val = 0, $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;
-		$this->groups = array_map(function($a) { return $a->id; }, array_filter($groups, function($a) {return ($a instanceof Group);}));
+		$this->groups = array_map(function($a) { return $a->id; }, 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 +37 added lines, -13 removed lines

@@ -44,9 +44,15 @@ 
 	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;
+		}
 		$this->groups = array_map(function($a) { return $a->id; }, array_filter($groups, function($a) {return ($a instanceof Group);}));
 	}
 	public function __toString() {
@@ -54,11 +60,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);
 	}
@@ -67,13 +79,19 @@ 
 		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, $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.');
+		}
 		$comp = 0;
-		if (gettype($groupsId) === 'string') $groupsId = [$groupsId];
+		if (gettype($groupsId) === 'string') {
+			$groupsId = [$groupsId];
+		}
 		switch (strtolower($operation)) {
 			case 'sum': $comp = $this->calcSum($team, $groupsId); break;
 			case 'avg': $comp = $this->calcSum($team, $groupsId)/count($groupsId); break;
@@ -95,21 +113,27 @@ 
 	private function calcSum(Team $team, $groupsId) {
 		$sum = 0;
 		foreach ($groupsId as $id) {
-			if (isset($team->groupResults[$id])) $sum += $team->groupResults[$id][$this->what];
+			if (isset($team->groupResults[$id])) {
+				$sum += $team->groupResults[$id][$this->what];
+			}
 		}
 		return $sum;
 	}
 	private function calcMax(Team $team, $groupsId) {
 		$max = null;
 		foreach ($groupsId as $id) {
-			if (isset($team->groupResults[$id]) && ($team->groupResults[$id][$this->what] > $max || $max === null)) $max = $team->groupResults[$id][$this->what];
+			if (isset($team->groupResults[$id]) && ($team->groupResults[$id][$this->what] > $max || $max === null)) {
+				$max = $team->groupResults[$id][$this->what];
+			}
 		}
 		return $max;
 	}
 	private function calcMin(Team $team, $groupsId) {
 		$min = null;
 		foreach ($groupsId as $id) {
-			if (isset($team->groupResults[$id]) && ($team->groupResults[$id][$this->what] < $min || $min === null)) $min = $team->groupResults[$id][$this->what];
+			if (isset($team->groupResults[$id]) && ($team->groupResults[$id][$this->what] < $min || $min === null)) {
+				$min = $team->groupResults[$id][$this->what];
+			}
 		}
 		return $min;
 	}

src/TournamentGenerator/Utilis/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/TournamentGenerator/Utilis/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 \TournamentGenerator\Constants::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 \TournamentGenerator\Constants::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 = \TournamentGenerator\Constants::POINTS) {
-		if (!in_array($ordering, \TournamentGenerator\Constants::OrderingTypes)) throw new \Exception('Unknown ordering type `'.$ordering.'`');
+		if (!in_array($ordering, \TournamentGenerator\Constants::OrderingTypes)) {
+			throw new \Exception('Unknown ordering type `'.$ordering.'`');
+		}
 
 		switch ($ordering) {
 			case \TournamentGenerator\Constants::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 \TournamentGenerator\Constants::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 = \TournamentGenerator\Constants::POINTS) {
-		if (!in_array($ordering, \TournamentGenerator\Constants::OrderingTypes)) throw new \Exception('Unknown ordering type `'.$ordering.'`');
+		if (!in_array($ordering, \TournamentGenerator\Constants::OrderingTypes)) {
+			throw new \Exception('Unknown ordering type `'.$ordering.'`');
+		}
 
 		$groupsIds = $round->getGroupsIds();
 
 		switch ($ordering) {
 			case \TournamentGenerator\Constants::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 \TournamentGenerator\Constants::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/TournamentGenerator/Utilis/Sorter/Games.php

Spacing +10 added lines, -10 removed lines

@@ -69,7 +69,7 @@ 
 
 			// CYCLE 6
 			// FIRST AVAILABLE GAME
-			$this->moveCalculatedGames(array_shift($games),$teams);
+			$this->moveCalculatedGames(array_shift($games), $teams);
 		}
 
 		return $this->games;
@@ -79,8 +79,8 @@ 
 	private function cycle1(array &$games, array &$teams) {
 		$found = false;
 		foreach ($games as $key => $game) {
-			if ($this->orderCheckTeamsVal($game, $teams, [4,5,6,7])) {
-				$this->moveCalculatedGames($game,$teams);
+			if ($this->orderCheckTeamsVal($game, $teams, [4, 5, 6, 7])) {
+				$this->moveCalculatedGames($game, $teams);
 				unset($games[$key]);
 				$found = true;
 				break;
@@ -92,8 +92,8 @@ 
 	private function cycle2(array &$games, array &$teams) {
 		$found = false;
 		foreach ($games as $key => $game) {
-			if ($this->orderCheckTeamsVal($game, $teams, [6,7])) {
-				$this->moveCalculatedGames($game,$teams);
+			if ($this->orderCheckTeamsVal($game, $teams, [6, 7])) {
+				$this->moveCalculatedGames($game, $teams);
 				unset($games[$key]);
 				$found = true;
 				break;
@@ -106,8 +106,8 @@ 
 	private function cycle3(array &$games, array &$teams) {
 		$found = false;
 		foreach ($games as $key => $game) {
-			if ($this->orderCheckTeamsVal($game, $teams, [7], [1,2,3])) {
-				$this->moveCalculatedGames($game,$teams);
+			if ($this->orderCheckTeamsVal($game, $teams, [7], [1, 2, 3])) {
+				$this->moveCalculatedGames($game, $teams);
 				unset($games[$key]);
 				$found = true;
 				break;
@@ -120,7 +120,7 @@ 
 		$found = false;
 		foreach ($games as $key => $game) {
 			if ($this->orderCheckTeamsVal($game, $teams, [7])) {
-				$this->moveCalculatedGames($game,$teams);
+				$this->moveCalculatedGames($game, $teams);
 				unset($games[$key]);
 				$found = true;
 				break;
@@ -132,8 +132,8 @@ 
 	private function cycle5(array &$games, array &$teams) {
 		$found = false;
 		foreach ($games as $key => $game) {
-			if ($this->orderCheckTeamsVal($game, $teams, [], [1,2,3])) {
-				$this->moveCalculatedGames($game,$teams);
+			if ($this->orderCheckTeamsVal($game, $teams, [], [1, 2, 3])) {
+				$this->moveCalculatedGames($game, $teams);
 				unset($games[$key]);
 				$found = true;
 				break;

Braces +27 added lines, -9 removed lines

@@ -36,7 +36,9 @@ 
 
 		$games = $this->group->getGames();
 
-		if (count($games) <= 4) return $games;
+		if (count($games) <= 4) {
+			return $games;
+		}
 
 		$this->games = [];
 
@@ -48,24 +50,34 @@ 
 		while (count($games) > 0) {
 			// CYCLE 1
 			// TEAM WHICH DIDN'T PLAY IN LAST GAME (< 4)
-			if ($this->cycle1($games, $teams)) continue;
+			if ($this->cycle1($games, $teams)) {
+				continue;
+			}
 
 			// CYCLE 2
 			// NOT TEAM WHICH PLAYED IN LAST TWO GAMES (NOT 6 or 7)
-			if ($this->cycle2($games, $teams)) continue;
+			if ($this->cycle2($games, $teams)) {
+				continue;
+			}
 
 			// CYCLE 3
 			// NOT TEAM WHICH PLAYED IN LAST THREE GAMES (NOT 7)
 			// TEAMS THAT DIDN'T PLAY IN LAST GAME WILL PLAY THIS GAME (< 4)
-			if ($this->cycle3($games, $teams)) continue;
+			if ($this->cycle3($games, $teams)) {
+				continue;
+			}
 
 			// CYCLE 4
 			// NOT TEAM WHICH PLAYED IN LAST THREE GAMES (NOT 7)
-			if ($this->cycle4($games, $teams)) continue;
+			if ($this->cycle4($games, $teams)) {
+				continue;
+			}
 
 			// CYCLE 5
 			// TEAMS THAT DIDN'T PLAY IN LAST GAME WILL PLAY THIS GAME (< 4)
-			if ($this->cycle5($games, $teams)) continue;
+			if ($this->cycle5($games, $teams)) {
+				continue;
+			}
 
 			// CYCLE 6
 			// FIRST AVAILABLE GAME
@@ -174,11 +186,17 @@ 
 		$requiredTeams = array_filter($teams, function($a) use ($required) { return in_array($a, $required); });
 
 		foreach ($game->getTeamsIds() as $tid) {
-			if (in_array($teams[$tid], $checkVals)) return false;
-			if (isset($requiredTeams[$tid])) unset($requiredTeams[$tid]);
+			if (in_array($teams[$tid], $checkVals)) {
+				return false;
+			}
+			if (isset($requiredTeams[$tid])) {
+				unset($requiredTeams[$tid]);
+			}
 		}
 
-		if (count($requiredTeams) > 0) return false;
+		if (count($requiredTeams) > 0) {
+			return false;
+		}
 
 		return true;
 

src/TournamentGenerator/Utilis/Generator.php

Spacing +8 added lines, -8 removed lines

@@ -18,11 +18,11 @@ 
 		$this->group = $group;
 	}
 
-	public function allowSkip(){
+	public function allowSkip() {
 		$this->allowSkip = true;
 		return $this;
 	}
-	public function disallowSkip(){
+	public function disallowSkip() {
 		$this->allowSkip = false;
 		return $this;
 	}
@@ -45,7 +45,7 @@ 
 	}
 
 	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;
 	}
@@ -120,11 +120,11 @@ 
 		$discard = [];
 		shuffle($teams);
 		$count = count($teams);
-		while (count($teams) % $this->inGame !== 0) { $discard[] = array_shift($teams); }
+		while (count($teams)%$this->inGame !== 0) { $discard[] = array_shift($teams); }
 
 		while (count($teams) > 0) {
 			$tInGame = [];
-			for ($i=0; $i < $this->inGame; $i++) { $tInGame[] = array_shift($teams); }
+			for ($i = 0; $i < $this->inGame; $i++) { $tInGame[] = array_shift($teams); }
 			$this->group->game($tInGame);
 		}
 
@@ -165,11 +165,11 @@ 
 	public static function circle_genGames2(array $teams = [], \tournamentGenerator\Group $group) {
 		$bracket = []; // ARRAY OF GAMES
 
-		if (count($teams) % 2 != 0) $teams[] = \TournamentGenerator\Constants::DUMMY_TEAM; // IF NOT EVEN NUMBER OF TEAMS, ADD DUMMY
+		if (count($teams)%2 != 0) $teams[] = \TournamentGenerator\Constants::DUMMY_TEAM; // IF NOT EVEN NUMBER OF TEAMS, ADD DUMMY
 
 		shuffle($teams); // SHUFFLE TEAMS FOR MORE RANDOMNESS
 
-		for ($i=0; $i < count($teams)-1; $i++) {
+		for ($i = 0; $i < count($teams)-1; $i++) {
 			$bracket = array_merge($bracket, Generator::circle_saveBracket($teams, $group)); // SAVE CURRENT ROUND
 
 			$teams = Generator::circle_rotateBracket($teams); // ROTATE TEAMS IN BRACKET
@@ -183,7 +183,7 @@ 
 
 		$bracket = [];
 
-		for ($i=0; $i < count($teams)/2; $i++) { // GO THROUGH HALF OF THE TEAMS
+		for ($i = 0; $i < count($teams)/2; $i++) { // GO THROUGH HALF OF THE TEAMS
 
 			$home = $teams[$i];
 			$reverse = array_reverse($teams);

Braces +37 added lines, -12 removed lines

@@ -36,8 +36,11 @@ 
 
 
 	public function setType(/** @scrutinizer ignore-all */ string $type = \TournamentGenerator\Constants::ROUND_ROBIN) {
-		if (in_array($type, \TournamentGenerator\Constants::GroupTypes)) $this->type = $type;
-		else throw new \Exception('Unknown group type: '.$type);
+		if (in_array($type, \TournamentGenerator\Constants::GroupTypes)) {
+			$this->type = $type;
+		} else {
+			throw new \Exception('Unknown group type: '.$type);
+		}
 		return $this;
 	}
 	public function getType() {
@@ -45,7 +48,9 @@ 
 	}
 
 	public function setInGame(int $inGame) {
-		if ($inGame < 2 ||  $inGame > 4) throw new \Exception('Expected 2,3 or 4 as inGame '.$inGame.' given');
+		if ($inGame < 2 ||  $inGame > 4) {
+			throw new \Exception('Expected 2,3 or 4 as inGame '.$inGame.' given');
+		}
 		$this->inGame = $inGame;
 		return $this;
 	}
@@ -54,7 +59,9 @@ 
 	}
 
 	public function setMaxSize(int $maxSize) {
-		if ($maxSize < 2) throw new \Exception('Max group size has to be at least 2, '.$maxSize.' given');
+		if ($maxSize < 2) {
+			throw new \Exception('Max group size has to be at least 2, '.$maxSize.' given');
+		}
 		$this->maxSize = $maxSize;
 		return $this;
 	}
@@ -78,7 +85,9 @@ 
 	}
 	private function r_rGames(array $teams = []) {
 		$games = [];
-		if (count($teams) === 0) $teams = $this->group->getTeams();
+		if (count($teams) === 0) {
+			$teams = $this->group->getTeams();
+		}
 		switch ($this->inGame) {
 			case 2:
 				$games = Generator::circle_genGames2($teams, $this->group);
@@ -98,7 +107,9 @@ 
 			$lockedTeam = array_shift($teamsB);
 			$gamesTemp = Generator::circle_genGames2($teamsB, $this->group);
 			foreach ($gamesTemp as $game) {
-				if (isset($lockedTeam1)) $game->addTeam($lockedTeam1);
+				if (isset($lockedTeam1)) {
+					$game->addTeam($lockedTeam1);
+				}
 				$game->addTeam($lockedTeam);
 			}
 			$games = array_merge($games, $gamesTemp);
@@ -116,7 +127,9 @@ 
 		return $games;
 	}
 	private function two_twoGames(array $teams = []) {
-		if (count($teams) === 0) $teams = $this->group->getTeams();
+		if (count($teams) === 0) {
+			$teams = $this->group->getTeams();
+		}
 		$discard = [];
 		shuffle($teams);
 		$count = count($teams);
@@ -128,13 +141,17 @@ 
 			$this->group->game($tInGame);
 		}
 
-		if (count($discard) > 0 && !$this->allowSkip) throw new \Exception('Couldn\'t make games with all teams. Expected k*'.$this->inGame.' teams '.$count.' teams given - discarting '.count($discard).' teams ('.implode(', ', $discard).') in group '.$this->group.' - allow skip '.($this->allowSkip ? 'True' : 'False'));
+		if (count($discard) > 0 && !$this->allowSkip) {
+			throw new \Exception('Couldn\'t make games with all teams. Expected k*'.$this->inGame.' teams '.$count.' teams given - discarting '.count($discard).' teams ('.implode(', ', $discard).') in group '.$this->group.' - allow skip '.($this->allowSkip ? 'True' : 'False'));
+		}
 
 		return $this;
 	}
 	private function cond_splitGames(array $teams = []) {
 		$games = [];
-		if (count($teams) === 0) $teams = $this->group->getTeams();
+		if (count($teams) === 0) {
+			$teams = $this->group->getTeams();
+		}
 
 		if (count($teams) > $this->maxSize) {
 			$groups = array_chunk($teams, /** @scrutinizer ignore-type */ ceil(count($teams)/ceil(count($teams)/$this->maxSize))); // SPLIT TEAMS INTO GROUP OF MAXIMUM SIZE OF $this->maxSize
@@ -144,7 +161,9 @@ 
 			while ($g > 0) {
 				foreach ($games as $key => $group) {
 					$this->group->addGame(array_shift($games[$key]));
-					if (count($games[$key]) === 0) unset($games[$key]);
+					if (count($games[$key]) === 0) {
+						unset($games[$key]);
+					}
 					$g--;
 				}
 			}
@@ -165,7 +184,10 @@ 
 	public static function circle_genGames2(array $teams = [], \tournamentGenerator\Group $group) {
 		$bracket = []; // ARRAY OF GAMES
 
-		if (count($teams) % 2 != 0) $teams[] = \TournamentGenerator\Constants::DUMMY_TEAM; // IF NOT EVEN NUMBER OF TEAMS, ADD DUMMY
+		if (count($teams) % 2 != 0) {
+			$teams[] = \TournamentGenerator\Constants::DUMMY_TEAM;
+		}
+		// IF NOT EVEN NUMBER OF TEAMS, ADD DUMMY
 
 		shuffle($teams); // SHUFFLE TEAMS FOR MORE RANDOMNESS
 
@@ -189,7 +211,10 @@ 
 			$reverse = array_reverse($teams);
 			$away = $reverse[$i];
 
-			if (($home == \TournamentGenerator\Constants::DUMMY_TEAM || $away == \TournamentGenerator\Constants::DUMMY_TEAM)) continue; // SKIP WHEN DUMMY_TEAM IS PRESENT
+			if (($home == \TournamentGenerator\Constants::DUMMY_TEAM || $away == \TournamentGenerator\Constants::DUMMY_TEAM)) {
+				continue;
+			}
+			// SKIP WHEN DUMMY_TEAM IS PRESENT
 
 			$bracket[] = new \TournamentGenerator\Game([$home, $away], $group);
 

src/TournamentGenerator/Team.php

Indentation +14 added lines, -14 removed lines

@@ -16,20 +16,20 @@
 	public $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

@@ -66,70 +66,70 @@
 		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']->winPoints;
 		$this->sumPoints += $this->groupResults[$groupId]['group']->winPoints;
 		$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']->winPoints;
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->winPoints;
 		$this->groupResults[$groupId]['wins']--;
 		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']->drawPoints;
 		$this->sumPoints += $this->groupResults[$groupId]['group']->drawPoints;
 		$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']->drawPointsPoints;
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->drawPoints;
 		$this->groupResults[$groupId]['draws']--;
 		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']->lostPoints;
 		$this->sumPoints += $this->groupResults[$groupId]['group']->lostPoints;
 		$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']->lostPoints;
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->lostPoints;
 		$this->groupResults[$groupId]['losses']--;
 		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']->secondPoints;
 		$this->sumPoints += $this->groupResults[$groupId]['group']->secondPoints;
 		$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']->secondPoints;
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->secondPoints;
 		$this->groupResults[$groupId]['second']--;
 		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']->thirdPoints;
 		$this->sumPoints += $this->groupResults[$groupId]['group']->thirdPoints;
 		$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']->thirdPoints;
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->thirdPoints;

Braces +51 added lines, -17 removed lines

@@ -44,17 +44,23 @@ 
 	}
 
 	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;
 	}
@@ -67,88 +73,116 @@ 
 	}
 
 	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;
 	}

src/TournamentGenerator/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]);
-				$this->games = array_merge($this->games, array_filter($game, function($a){ return ($a instanceof Game); }));
+				$this->games = array_merge($this->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 = \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;
 	}
@@ -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 @@ 
 				$this->games = array_merge($this->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;
 	}

src/TournamentGenerator/Filter.php

Braces +29 added lines, -14 removed lines

@@ -25,8 +25,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->group->id, 'sum', $this->group); });
 				continue;
 			}
@@ -39,12 +38,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;
 		}
@@ -56,19 +61,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;
 				}
 				continue;
-			}
-			elseif ($value instanceof TeamFilter) {
-				if (!$value->validate($team, $this->group->id, 'sum', $this->group)) return false;
+			} elseif ($value instanceof TeamFilter) {
+				if (!$value->validate($team, $this->group->id, 'sum', $this->group)) {
+					return false;
+				}
 				continue;
 			}
 			throw new \Exception('Filer ['.$key.'] is not an instance of TeamFilter class');
@@ -80,19 +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;
 				}
 				continue;
-			}
-			elseif ($value instanceof TeamFilter) {
-				if (!$value->validate($team, $this->group->id, 'sum', $this->group)) return true;
+			} elseif ($value instanceof TeamFilter) {
+				if (!$value->validate($team, $this->group->id, 'sum', $this->group)) {
+					return true;
+				}
 				continue;
 			}
 			throw new \Exception('Filer ['.$key.'] is not an instance of TeamFilter class');

src/TournamentGenerator/Game.php

Indentation +4 added lines, -4 removed lines

@@ -94,10 +94,10 @@
 	}
 
 	/**
-	* $results = array (
-	* * team->id => team->score
-	* )
-	*/
+	 * $results = array (
+	 * * team->id => team->score
+	 * )
+	 */
 	public function setResults(array $results = []) {
 		if (count($this->results) === 0) $this->resetResults();
 		arsort($results);

Spacing +3 added lines, -3 removed lines

@@ -66,11 +66,11 @@
 		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(){
+	public function getTeams() {
 		return $this->teams;
 	}
-	public function getTeamsIds(){
-		return array_map(function($a){ return $a->id; }, $this->teams);
+	public function getTeamsIds() {
+		return array_map(function($a) { return $a->id; }, $this->teams);
 	}
 	public function getTeam(string $id) {
 		foreach ($this->teams as $team) {

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