Heroyt / tournament-generator

src/classes/tournament_presets/class_singleElim.php

Spacing +4 added lines, -4 removed lines

@@ -16,7 +16,7 @@ 
 
 		// CALCULATE BYES
 		$byes = 0;
-		if ( !\TournamentGenerator\isPowerOf2($countTeams) ) {
+		if (!\TournamentGenerator\isPowerOf2($countTeams)) {
 			$nextPow = bindec(str_pad(1, strlen(decbin($countTeams))+1, 0, STR_PAD_RIGHT));
 			$byes = $nextPow-$countTeams;
 		}
@@ -27,7 +27,7 @@ 
 
 		$previousGroups = [];
 
-		for ($i=1; $i <= (($countTeams+$byes)/2); $i++) {
+		for ($i = 1; $i <= (($countTeams+$byes)/2); $i++) {
 			$g = $startRound->group([
 				'name' => 'Round 1 - '.$i,
 				'inGame' => 2,
@@ -38,10 +38,10 @@ 
 
 		$this->splitTeams();
 
-		for ($r=2; $r <= $roundsNum; $r++) {
+		for ($r = 2; $r <= $roundsNum; $r++) {
 			$groups = [];
 			$round = $this->round('Round '.$r);
-			for ($g=1; $g <= (($countTeams+$byes)/pow(2, $r)); $g++) {
+			for ($g = 1; $g <= (($countTeams+$byes)/pow(2, $r)); $g++) {
 				$group = $round->group([
 					'name' => 'Round '.$r.' - '.$g,
 					'inGame' => 2,

src/classes/class_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;
 	}
 }

src/classes/tournament_presets/class_2R2G.php

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
 
 	public function generate() {
 
-		if (count($this->getTeams()) === 0) throw new \Exception('Couldn\'t generate 2R2G tournament because there are no teams in the tournament.');
+		if (count($this->getTeams()) === 0) {
+			throw new \Exception('Couldn\'t generate 2R2G tournament because there are no teams in the tournament.');
+		}
 
 
 		$round1 = $this->round('Round 1');

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 
 		$this->splitTeams($round1);
 
-		if (count($this->getTeams()) % 4 == 2) {
+		if (count($this->getTeams())%4 == 2) {
 			$group_top = $round2->group([
 				'name' => 'TOP',
 				'type' => \TWO_TWO

src/classes/class_teamFilter.php

Spacing +2 added lines, -2 removed lines

@@ -45,12 +45,12 @@
 
 	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;
 		foreach ($groups as $group) {
-			if ($group instanceof Group) $this->groups[] =  $group->id;
+			if ($group instanceof Group) $this->groups[] = $group->id;
 		}
 	}
 	public function __toString() {

Braces +43 added lines, -18 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,14 +64,14 @@ 
 	}
 
 	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->validateTeam($team);
-		}
-		elseif ($this->what == 'notprogressed') {
+		} elseif ($this->what == 'notprogressed') {
 			return !$this->validateProgressed($team, $from);
-		}
-		elseif ($this->what == 'progressed') {
+		} elseif ($this->what == 'progressed') {
 			return $this->validateProgressed($team, $from);
 		}
 		return $this->validateCalc($team, $groupsId, $operation, $from);
@@ -72,30 +80,45 @@ 
 	private function validateTeam(Team $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;
 	}
 	private function validateProgressed(Team $team, Group $from) {
-		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', Group $from = null) {
-		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':
@@ -111,9 +134,11 @@ 
 					$comp = $min;
 					break;
 			}
+		} elseif (gettype($groupsId) === 'string' && isset($team->groupResults[$groupsId])) {
+			$comp = $team->groupResults[$groupsId][$this->what];
+		} else {
+			throw new \Exception("Couldn't find group of id ".print_r($groupsId, true));
 		}
-		elseif (gettype($groupsId) === 'string' && isset($team->groupResults[$groupsId])) $comp = $team->groupResults[$groupsId][$this->what];
-		else throw new \Exception("Couldn't find group of id ".print_r($groupsId, true));
 
 		switch ($this->how) {
 			case '>': return ($comp > $this->val);

src/classes/class_category.php

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
 		$this->name = $name;
 	}
 
-	public function addRound(Round ...$rounds){
+	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.');
@@ -33,15 +33,15 @@ 
 		$this->rounds[] = $r->setSkip($this->allowSkip);
 		return $r;
 	}
-	public function getRounds(){
+	public function getRounds() {
 		return $this->rounds;
 	}
 
-	public function allowSkip(){
+	public function allowSkip() {
 		$this->allowSkip = true;
 		return $this;
 	}
-	public function disallowSkip(){
+	public function disallowSkip() {
 		$this->allowSkip = false;
 		return $this;
 	}
@@ -55,7 +55,7 @@ 
 
 	public function addTeam(...$teams) {
 		foreach ($teams as $team) {
-			if ($team instanceof Team)  {
+			if ($team instanceof Team) {
 				$this->teams[] = $team;
 			}
 			elseif (gettype($team) === 'array') {

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_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

@@ -59,70 +59,70 @@
 		return $this;
 	}
 
-	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,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;
 	}

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_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/classes/class_generator.php

Spacing +11 added lines, -11 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;
 	}
@@ -66,17 +66,17 @@ 
 		switch ($this->type) {
 			case \R_R:{
 					$this->group->addGame($this->r_rGames());
-				break;}
+				break; }
 			case \TWO_TWO:
 				$teams = $this->group->getTeams();
 				$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);
 				}
 
@@ -122,7 +122,7 @@ 
 					}
 					$games = array_merge($games, $gamesTemp);
 				}
-				break;}
+				break; }
 			case 4:{
 				$teamsB = $teams;
 				$lockedTeam1 = array_shift($teamsB);
@@ -139,7 +139,7 @@ 
 					$lockedTeam1 = array_shift($teamsB);
 				}
 				$games[] = new \TournamentGenerator\Game(array_merge([$lockedTeam1], $teamsB), $this->group);
-				break;}
+				break; }
 		}
 		return $games;
 	}
@@ -154,11 +154,11 @@ 
 	public static function circle_genGames2(array $teams = [], \tournamentGenerator\Group $group) {
 		$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
 
-		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
@@ -172,7 +172,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 +30 added lines, -10 removed lines

@@ -36,8 +36,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() {
@@ -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;
 	}
@@ -80,7 +87,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->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'));
+				}
 				break;
 			case \COND_SPLIT:
 				$games = [];
@@ -95,19 +104,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);
@@ -154,7 +168,10 @@ 
 	public static function circle_genGames2(array $teams = [], \tournamentGenerator\Group $group) {
 		$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
 
@@ -178,7 +195,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 \TournamentGenerator\Game([$home, $away], $group);