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/tournament_presets/class_2R2G.php

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

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

src/classes/tournament_presets/class_doubleElim.php

Spacing +8 added lines, -8 removed lines

@@ -19,7 +19,7 @@ 
 		// CALCULATE BYES
 		$byes = 0;
 		$nextPow = $countTeams;
-		if ( !\TournamentGenerator\isPowerOf2($countTeams) ) {
+		if (!\TournamentGenerator\isPowerOf2($countTeams)) {
 			$nextPow = bindec(str_pad(1, strlen(decbin($countTeams))+1, 0, STR_PAD_RIGHT));
 			$byes = $nextPow-$countTeams;
 		}
@@ -38,7 +38,7 @@ 
 		$groupIds = [];
 		$allGroups = [];
 
-		for ($i=1; $i <= $startGroups; $i++) {
+		for ($i = 1; $i <= $startGroups; $i++) {
 			$g = $startRound->group([
 				'name' => 'Start group - '.$i,
 				'inGame' => 2,
@@ -52,7 +52,7 @@ 
 		// SPLIT TEAMS EVENLY
 		$this->splitTeams();
 
-		for ($r=2; $r <= $roundsNum-1; $r++) {
+		for ($r = 2; $r <= $roundsNum-1; $r++) {
 			$groups = [];
 			$losingGroups = [];
 			$round = $this->round('Round '.$r);
@@ -63,7 +63,7 @@ 
 			$losingGroupTeamsCount = count($previousLosingGroups)+count($previousGroups);
 			$order = 2;
 			if (\TournamentGenerator\isPowerOf2($losingGroupTeamsCount)) { // IF THE NUMBER OF TEAMS IS A POWER OF 2, GENERATE GROUPS WITHOUT BYES
-				for ($g=1; $g <= $losingGroupTeamsCount/2; $g++) {
+				for ($g = 1; $g <= $losingGroupTeamsCount/2; $g++) {
 					$group = $round->group([
 						'name' => 'Round '.$r.' - loss '.$g,
 						'inGame' => 2,
@@ -91,11 +91,11 @@ 
 				$n = (floor(count($previousLosingGroups)/2)+$losingByes);
 				$byesGroupsNums = [];
 				$byesProgressed = 0;
-				for ($i=0; $i < $losingByes; $i++) {
+				for ($i = 0; $i < $losingByes; $i++) {
 					$byesGroupsNums[] = $n-($i*2);
 				}
 				$lastGroup = 0;
-				for ($g=1; $g <= ((count($previousLosingGroups)/2)+$losingByes); $g++) {
+				for ($g = 1; $g <= ((count($previousLosingGroups)/2)+$losingByes); $g++) {
 					$group = $round->group([
 						'name' => 'Round '.$r.' - loss '.$g,
 						'inGame' => 2,
@@ -112,14 +112,14 @@ 
 					}
 					else {
 						$previousLosingGroups[$lastGroup]->progression($group, 0, 1); // PROGRESS FROM LOSING GROUP BEFORE
-						if (isset($previousLosingGroups[$lastGroup + 1])) $previousLosingGroups[$lastGroup + 1]->progression($group, 0, 1); // PROGREESS FROM LOSING GROUP BEFORE
+						if (isset($previousLosingGroups[$lastGroup+1])) $previousLosingGroups[$lastGroup+1]->progression($group, 0, 1); // PROGREESS FROM LOSING GROUP BEFORE
 						$lastGroup += 2;
 					}
 				}
 			}
 			// WINNING SIDE LIKE SINGLE ELIMINATION
 			$order = 1;
-			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.' - win '.$g,
 					'inGame' => 2,

Braces +18 added lines, -10 removed lines

@@ -15,7 +15,9 @@ 
 
 		$countTeams = count($this->getTeams());
 
-		if ($countTeams < 3) throw new \Exception('Double elimination is possible for minimum of 3 teams - '.$countTeams.' teams given.');
+		if ($countTeams < 3) {
+			throw new \Exception('Double elimination is possible for minimum of 3 teams - '.$countTeams.' teams given.');
+		}
 
 
 		// CALCULATE BYES
@@ -79,15 +81,19 @@ 
 					if ($r === 2) { // FIRST LOSING ROUND
 						$previousGroups[2*($g-1)]->progression($group, 1, 1); // PROGRESS FROM STARTING GROUP
 						$previousGroups[(2*($g-1))+1]->progression($group, 1, 1); // PROGREESS FROM STARTING GROUP
-					}
-					elseif ($losingGroupTeamsCount >= 2) {
+					} elseif ($losingGroupTeamsCount >= 2) {
 						$previousLosingGroups[$g-1]->progression($group, 0, 1); // PROGRESS FROM LOSING GROUP BEFORE
-						if (isset(array_reverse($previousGroups)[$g-1])) array_reverse($previousGroups)[$g-1]->progression($group, 1, 1); // PROGREESS FROM WINNING GROUP BEFORE
-						else $previousLosingGroups[$g]->progression($group, 0, 1); // PROGRESS OTHER TEAM FROM LOSING GROUP BEEFORE
+						if (isset(array_reverse($previousGroups)[$g-1])) {
+							array_reverse($previousGroups)[$g-1]->progression($group, 1, 1);
+						}
+						// PROGREESS FROM WINNING GROUP BEFORE
+						else {
+							$previousLosingGroups[$g]->progression($group, 0, 1);
+						}
+						// PROGRESS OTHER TEAM FROM LOSING GROUP BEEFORE
 					}
 				}
-			}
-			else { // IF THE NUMBER OF TEAMS IS NOT A POWER OF 2, GENERATE GROUPS WITH BYES
+			} else { // IF THE NUMBER OF TEAMS IS NOT A POWER OF 2, GENERATE GROUPS WITH BYES
 				// LOOK FOR THE CLOSEST LOWER POWER OF 2
 				$losingByes = $losingGroupTeamsCount-bindec(str_pad(1, strlen(decbin($losingGroupTeamsCount)), 0, STR_PAD_RIGHT));
 				$n = (floor(count($previousLosingGroups)/2)+$losingByes);
@@ -111,10 +117,12 @@ 
 					if (in_array($g, $byesGroupsNums) && isset($previousGroups[$byesProgressed])) { // EMPTY GROUP FROM BYE
 						$previousGroups[$byesProgressed]->progression($group, 1, 1); // PROGRESS FROM WINNING GROUP BEFORE
 						$byesProgressed++;
-					}
-					else {
+					} else {
 						$previousLosingGroups[$lastGroup]->progression($group, 0, 1); // PROGRESS FROM LOSING GROUP BEFORE
-						if (isset($previousLosingGroups[$lastGroup + 1])) $previousLosingGroups[$lastGroup + 1]->progression($group, 0, 1); // PROGREESS FROM LOSING GROUP BEFORE
+						if (isset($previousLosingGroups[$lastGroup + 1])) {
+							$previousLosingGroups[$lastGroup + 1]->progression($group, 0, 1);
+						}
+						// PROGREESS FROM LOSING GROUP BEFORE
 						$lastGroup += 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 +5 added lines, -5 removed lines

@@ -78,10 +78,10 @@ 
 		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(){
+	public function getTeamsIds() {
 		$ids = [];
 		foreach ($this->teams as $team) {
 			$ids[] = $team->id;
@@ -128,7 +128,7 @@ 
 						$team->addLoss($this->group->id);
 						$this->results[$team->id] += ['points' => $this->group->lostPoints, 'type' => 'loss'];
 					}
-					break;}
+					break; }
 				case 3:{
 					switch ($i) {
 						case 1:
@@ -147,7 +147,7 @@ 
 							$this->results[$team->id] += ['points' => $this->group->lostPoints, 'type' => 'loss'];
 							break;
 					}
-					break;}
+					break; }
 				case 4:{
 					switch ($i) {
 						case 1:
@@ -171,7 +171,7 @@ 
 							$this->results[$team->id] += ['points' => $this->group->lostPoints, 'type' => 'loss'];
 							break;
 					}
-					break;}
+					break; }
 			}
 			$team->groupResults[$this->group->id]['score'] += $score;
 			$i++;

Braces +40 added lines, -20 removed lines

@@ -27,9 +27,10 @@ 
 			if (!$team instanceof Team) {
 				$error[] = $team;
 				unset($teams[$key]);
-			}
-			else {
-				if (!isset($team->games[$group->id])) $team->games[$group->id] = [];
+			} else {
+				if (!isset($team->games[$group->id])) {
+					$team->games[$group->id] = [];
+				}
 				$team->games[$group->id][] = $this;
 				$tids[] = $team->id;
 			}
@@ -38,12 +39,16 @@ 
 		foreach ($this->teams as $team) {
 			foreach ($tids as $id) {
 				if ($team->id !== $id) {
-					if (!isset($team->gamesWith[$group->id][$id])) $team->gamesWith[$group->id][$id] = 0;
+					if (!isset($team->gamesWith[$group->id][$id])) {
+						$team->gamesWith[$group->id][$id] = 0;
+					}
 					$team->gamesWith[$group->id][$id]++;
 				}
 			}
 		}
-		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 addTeam(...$teams) {
@@ -51,9 +56,13 @@ 
 		foreach ($this->teams as $team) {
 			foreach ($teams as $team2) {
 				if ($team2 instanceof Team) {
-					if (!isset($team->gamesWith[$this->group->id][$team2->id])) $team->gamesWith[$this->group->id][$team2->id] = 0;
+					if (!isset($team->gamesWith[$this->group->id][$team2->id])) {
+						$team->gamesWith[$this->group->id][$team2->id] = 0;
+					}
 					$team->gamesWith[$this->group->id][$team2->id]++;
-					if (!isset($team2->gamesWith[$this->group->id][$team->id])) $team2->gamesWith[$this->group->id][$team->id] = 0;
+					if (!isset($team2->gamesWith[$this->group->id][$team->id])) {
+						$team2->gamesWith[$this->group->id][$team->id] = 0;
+					}
 					$team2->gamesWith[$this->group->id][$team->id]++;
 				}
 			}
@@ -61,21 +70,26 @@ 
 		foreach ($teams as $key => $team) {
 			if ($team instanceof Team) {
 				$this->teams[] = $team;
-				if (!isset($team->games[$this->group->id])) $team->games[$this->group->id] = [];
+				if (!isset($team->games[$this->group->id])) {
+					$team->games[$this->group->id] = [];
+				}
 				$team->games[$this->group->id][] = $this;
 				foreach ($teams as $key2 => $team2) {
 					if ($team2 instanceof Team) {
-						if (!isset($team->gamesWith[$this->group->id][$team2->id])) $team->gamesWith[$this->group->id][$team2->id] = 0;
+						if (!isset($team->gamesWith[$this->group->id][$team2->id])) {
+							$team->gamesWith[$this->group->id][$team2->id] = 0;
+						}
 						$team->gamesWith[$this->group->id][$team2->id]++;
 					}
 				}
-			}
-			else {
+			} else {
 				$error[] = $team;
 				unset($teams[$key]);
 			}
 		}
-		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(){
@@ -90,7 +104,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;
 	}
@@ -101,12 +117,16 @@ 
 	* )
 	*/
 	public function setResults(array $results = []) {
-		if (count($this->results) === 0) $this->resetResults();
+		if (count($this->results) === 0) {
+			$this->resetResults();
+		}
 		arsort($results);
 		$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];
 			$prev = prev($results);
 			next($results);
@@ -117,13 +137,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 +238,9 @@ 
 	}
 
 	public function isPlayed() {
-		if (count($this->results) > 0) return true;
+		if (count($this->results) > 0) {
+			return true;
+		}
 		return false;
 	}
 }

src/classes/class_team.php

Indentation +14 added lines, -14 removed lines

@@ -14,20 +14,20 @@
 	public $gamesWith = [];
 
 	/**
-	* 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') {

Spacing +10 added lines, -10 removed lines

@@ -43,61 +43,61 @@
 		return array_filter($this->groupResults[$groupId], function($k) { return $k !== 'group'; }, ARRAY_FILTER_USE_KEY);
 	}
 
-	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->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->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->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->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->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->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->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->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->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->groupResults[$groupId]['third']--;

Braces +30 added lines, -10 removed lines

@@ -44,61 +44,81 @@
 	}
 
 	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->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->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->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->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->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->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->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->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->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->groupResults[$groupId]['third']--;
 		return $this;

src/functions.php

Spacing +3 added lines, -3 removed lines

@@ -22,11 +22,11 @@ 
 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
 
-	for ($i=0; $i < count($teams)-1; $i++) {
+	for ($i = 0; $i < count($teams)-1; $i++) {
 		$bracket = array_merge($bracket, circle_saveBracket($teams, $group)); // SAVE CURRENT ROUND
 
 		$teams = circle_rotateBracket($teams); // ROTATE TEAMS IN BRACKET
@@ -41,7 +41,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 +8 added lines, -2 removed lines

@@ -22,7 +22,10 @@ 
 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
 
@@ -47,7 +50,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_group.php

Spacing +14 added lines, -14 removed lines

@@ -68,11 +68,11 @@ 
 		return 'Group '.$this->name;
 	}
 
-	public function allowSkip(){
+	public function allowSkip() {
 		$this->allowSkip = true;
 		return $this;
 	}
-	public function disallowSkip(){
+	public function disallowSkip() {
 		$this->allowSkip = false;
 		return $this;
 	}
@@ -86,7 +86,7 @@ 
 
 	public function addTeam(...$teams) {
 		foreach ($teams as $team) {
-			if ($team instanceof Team)  {
+			if ($team instanceof Team) {
 				$this->teams[] = $team;
 				$team->groupResults[$this->id] = [
 					'group' => $this,
@@ -243,13 +243,13 @@ 
 					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;}
+				break; }
 			case SCORE:{
 				usort($this->teams, function($a, $b) {
 					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;}
+				break; }
 		}
 		return $this->getTeams($filters);
 	}
@@ -314,19 +314,19 @@ 
 		switch ($this->type) {
 			case R_R:{
 					$this->games = $this->r_rGames();
-				break;}
+				break; }
 			case TWO_TWO:
 				$teams = $this->teams;
 				$discard = [];
 				shuffle($teams);
 				$count = count($teams);
-				while (count($teams) % $this->inGame !== 0) {
+				while (count($teams)%$this->inGame !== 0) {
 					$discard[] = array_shift($teams);
 				}
 
 				while (count($teams) > 0) {
 					$tInGame = [];
-					for ($i=0; $i < $this->inGame; $i++) {
+					for ($i = 0; $i < $this->inGame; $i++) {
 						$tInGame[] = array_shift($teams);
 					}
 					$this->game($tInGame);
@@ -365,7 +365,7 @@ 
 		$this->games[] = $g;
 		return $g;
 	}
-	public function addGame(Game ...$games){
+	public function addGame(Game ...$games) {
 		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.');
@@ -461,7 +461,7 @@ 
 			foreach ($games as $key => $game) {
 				$gTeams = $game->getTeamsIds();
 				$suitable = true;
-				$requiredTeams = array_filter($teams, function($a){
+				$requiredTeams = array_filter($teams, function($a) {
 					return $a < 4;
 				});
 				foreach ($gTeams as $tid) {
@@ -512,7 +512,7 @@ 
 			foreach ($games as $key => $game) {
 				$gTeams = $game->getTeamsIds();
 				$suitable = false;
-				$requiredTeams = array_filter($teams, function($a){
+				$requiredTeams = array_filter($teams, function($a) {
 					return $a < 4;
 				});
 				foreach ($gTeams as $tid) {
@@ -557,7 +557,7 @@ 
 					$games = array_merge($games, $games);
 				}
 				// $this->orderGames();
-				break;}
+				break; }
 			case 4:{
 				$teamsB = $teams;
 				$lockedTeam1 = array_shift($teamsB);
@@ -575,7 +575,7 @@ 
 				}
 				$games[] = new Game(array_merge([$lockedTeam1], $teamsB), $this);
 				// $this->orderGames();
-				break;}
+				break; }
 		}
 		return $games;
 	}
@@ -601,7 +601,7 @@ 
 		}
 		return $this;
 	}
-	public function isPlayed(){
+	public function isPlayed() {
 		foreach ($this->games as $game) {
 			if ((isset($game) || !$this->getSkip()) && !$game->isPlayed()) return false;
 		}

Braces +146 added lines, -70 removed lines

@@ -33,23 +33,36 @@ 
 		foreach ($settings as $key => $value) {
 			switch ($key) {
 				case 'name':
-					if (gettype($value) === 'string') $this->name = $value;
-					else throw new \Exception('Expected string as group name '.gettype($value).' given');
+					if (gettype($value) === 'string') {
+						$this->name = $value;
+					} else {
+						throw new \Exception('Expected string as group name '.gettype($value).' given');
+					}
 					break;
 				case 'type':
-					if (in_array($value, groupTypes)) $this->type = $value;
-					else throw new \Exception('Unknown group type: '.$value);
+					if (in_array($value, groupTypes)) {
+						$this->type = $value;
+					} else {
+						throw new \Exception('Unknown group type: '.$value);
+					}
 					break;
 				case 'ordering':
-					if (in_array($value, orderingTypes)) $this->ordering = $value;
-					else throw new \Exception('Unknown group ordering: '.$value);
+					if (in_array($value, orderingTypes)) {
+						$this->ordering = $value;
+					} else {
+						throw new \Exception('Unknown group ordering: '.$value);
+					}
 					break;
 				case 'inGame':
 					if (gettype($value) === 'integer') {
-						if ($value === 2 || $value === 3 || $value === 4) $this->inGame = $value;
-						else throw new \Exception('Expected 2,3 or 4 as inGame '.$value.' given');
+						if ($value === 2 || $value === 3 || $value === 4) {
+							$this->inGame = $value;
+						} else {
+							throw new \Exception('Expected 2,3 or 4 as inGame '.$value.' given');
+						}
+					} else {
+						throw new \Exception('Expected integer as inGame '.gettype($value).' given');
 					}
-					else throw new \Exception('Expected integer as inGame '.gettype($value).' given');
 					break;
 				case 'maxSize':
 					if (gettype($value) === 'integer') {
@@ -98,10 +111,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,
@@ -113,16 +127,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) {
@@ -130,27 +148,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,20 +183,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');
 			}
 		}
@@ -185,20 +211,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');
 			}
 		}
@@ -220,16 +250,22 @@ 
 		return $t;
 	}
 	public function setType(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() {
 		return $this->type;
 	}
 	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() {
@@ -239,14 +275,20 @@ 
 		switch ($this->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;}
@@ -255,10 +297,14 @@ 
 	}
 	public function setInGame(int $inGame) {
 		if (gettype($inGame) === 'integer') {
-			if ($inGame === 2 || $inGame === 3 || $inGame === 4) $this->inGame = $inGame;
-			else throw new \Exception('Expected 2,3 or 4 as inGame '.$inGame.' given');
+			if ($inGame === 2 || $inGame === 3 || $inGame === 4) {
+				$this->inGame = $inGame;
+			} else {
+				throw new \Exception('Expected 2,3 or 4 as inGame '.$inGame.' given');
+			}
+		} else {
+			throw new \Exception('Expected integer as inGame '.gettype($inGame).' given');
 		}
-		else throw new \Exception('Expected integer as inGame '.gettype($inGame).' given');
 	}
 	public function getInGame() {
 		return $this->inGame;
@@ -286,16 +332,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;
 					}
 				}
@@ -349,12 +392,15 @@ 
 					while ($g > 0) {
 						foreach ($games as $key => $group) {
 							$this->games[] = array_shift($games[$key]);
-							if (count($games[$key]) === 0) unset($games[$key]);
+							if (count($games[$key]) === 0) {
+								unset($games[$key]);
+							}
 							$g--;
 						}
 					}
+				} else {
+					$this->games = $this->r_rGames();
 				}
-				else $this->games = $this->r_rGames();
 				break;
 		}
 		return $this->games;
@@ -366,8 +412,11 @@ 
 	}
 	public function addGame(Game ...$games){
 		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;
 	}
@@ -395,21 +444,30 @@ 
 				$teams[$team->id] = 0;
 			}
 			foreach (end($this->games)->getTeams() as $team) {
-				if (!isset($teams[$team->id])) $teams[$team->id] = 4;
-				else $teams[$team->id] += 4;
+				if (!isset($teams[$team->id])) {
+					$teams[$team->id] = 4;
+				} else {
+					$teams[$team->id] += 4;
+				}
 			}
 			$g = prev($this->games);
 			if ($g instanceof Game) {
 				foreach ($g->getTeams() as $team) {
-					if (!isset($teams[$team->id])) $teams[$team->id] = 2;
-					else $teams[$team->id] += 2;
+					if (!isset($teams[$team->id])) {
+						$teams[$team->id] = 2;
+					} else {
+						$teams[$team->id] += 2;
+					}
 				}
 			}
 			$g = prev($this->games);
 			if ($g instanceof Game) {
 				foreach ($g->getTeams() as $team) {
-					if (!isset($teams[$team->id])) $teams[$team->id] = 1;
-					else $teams[$team->id]++;
+					if (!isset($teams[$team->id])) {
+						$teams[$team->id] = 1;
+					} else {
+						$teams[$team->id]++;
+					}
 				}
 			}
 
@@ -431,7 +489,9 @@ 
 					break;
 				}
 			}
-			if ($found) continue;
+			if ($found) {
+				continue;
+			}
 
 			// CYCLE 2
 			// ! TEAM WHICH PLAYED IN LAST TWO GAMES (NOT 6 or 7)
@@ -452,7 +512,9 @@ 
 					break;
 				}
 			}
-			if ($found) continue;
+			if ($found) {
+				continue;
+			}
 
 			// CYCLE 3
 			// ! TEAM WHICH PLAYED IN LAST THREE GAMES (NOT 7)
@@ -483,7 +545,9 @@ 
 					break;
 				}
 			}
-			if ($found) continue;
+			if ($found) {
+				continue;
+			}
 
 			// CYCLE 4
 			// ! TEAM WHICH PLAYED IN LAST THREE GAMES (NOT 7)
@@ -504,7 +568,9 @@ 
 					break;
 				}
 			}
-			if ($found) continue;
+			if ($found) {
+				continue;
+			}
 
 			// CYCLE 5
 			// TEAMS THAT DIDN'T PLAY IN LAST GAME WILL PLAY THIS GAME (< 4)
@@ -529,7 +595,9 @@ 
 					break;
 				}
 			}
-			if ($found) continue;
+			if ($found) {
+				continue;
+			}
 
 			// CYCLE 6
 			// FIRST AVAILABLE GAME
@@ -540,7 +608,9 @@ 
 	}
 	public function r_rGames(array $teams = []) {
 		$games = [];
-		if (count($teams) === 0) $teams = $this->teams;
+		if (count($teams) === 0) {
+			$teams = $this->teams;
+		}
 		switch ($this->inGame) {
 			case 2:
 				$games = circle_genGames2($teams, $this);
@@ -588,7 +658,9 @@ 
 			$game->setResults($results);
 		}
 		$return = $this->sortTeams($filters);
-		if (!$reset) return $return;
+		if (!$reset) {
+			return $return;
+		}
 		foreach ($this->getGames() as $game) {
 			$game->resetResults();
 		}
@@ -596,13 +668,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_round.php

Spacing +11 added lines, -11 removed lines

@@ -25,7 +25,7 @@ 
 		return $this->name;
 	}
 
-	public function addGroup(Group ...$groups){
+	public function addGroup(Group ...$groups) {
 		foreach ($groups as $group) {
 			if ($group instanceof Group) $this->groups[] = $group;
 			else throw new \Exception('Trying to add group which is not an instance of Group class.');
@@ -37,21 +37,21 @@ 
 		$this->groups[] = $g->setSkip($this->allowSkip);
 		return $g;
 	}
-	public function getGroups(){
+	public function getGroups() {
 		$this->orderGroups();
 		return $this->groups;
 	}
 	public function orderGroups() {
-		usort($this->groups, function($a, $b){
-			return $a->order - $b->order;
+		usort($this->groups, function($a, $b) {
+			return $a->order-$b->order;
 		});
 	}
 
-	public function allowSkip(){
+	public function allowSkip() {
 		$this->allowSkip = true;
 		return $this;
 	}
-	public function disallowSkip(){
+	public function disallowSkip() {
 		$this->allowSkip = false;
 		return $this;
 	}
@@ -63,7 +63,7 @@ 
 		return $this->allowSkip;
 	}
 
-	public function genGames(){
+	public function genGames() {
 		$games = [];
 		$g = 0;
 		foreach ($this->groups as $group) {
@@ -87,7 +87,7 @@ 
 	public function getGames() {
 		return $this->games;
 	}
-	public function isPlayed(){
+	public function isPlayed() {
 		foreach ($this->groups as $group) {
 			if (!$group->isPlayed()) return false;
 		}
@@ -96,7 +96,7 @@ 
 
 	public function addTeam(...$teams) {
 		foreach ($teams as $team) {
-			if ($team instanceof Team)  {
+			if ($team instanceof Team) {
 				$this->teams[] = $team;
 			}
 			elseif (gettype($team) === 'array') {
@@ -157,14 +157,14 @@ 
 		return $this;
 	}
 
-	public function progress(){
+	public function progress() {
 		foreach ($this->groups as $group) {
 			$group->progress();
 		}
 		return $this;
 	}
 
-	public function progressBlank(){
+	public function progressBlank() {
 		if (!$this->isPlayed()) $this->simulate();
 		foreach ($this->groups as $group) {
 			$group->progressBlank();

Braces +32 added lines, -13 removed lines

@@ -27,8 +27,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 @@ 
 		while ($g > 0) {
 			foreach ($games as $key => $group) {
 				$this->games[] = array_shift($games[$key]);
-				if (count($games[$key]) === 0) unset($games[$key]);
+				if (count($games[$key]) === 0) {
+					unset($games[$key]);
+				}
 				$g--;
 			}
 		}
@@ -89,7 +94,9 @@ 
 	}
 	public function isPlayed(){
 		foreach ($this->groups as $group) {
-			if (!$group->isPlayed()) return false;
+			if (!$group->isPlayed()) {
+				return false;
+			}
 		}
 		return true;
 	}
@@ -98,10 +105,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,
@@ -113,8 +121,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;
 	}
@@ -124,7 +133,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->groups as $group) {
 			$teams = array_merge($teams, $group->getTeams());
@@ -135,7 +146,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') {
@@ -150,7 +163,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));
+					}
 				}
 			}
 		}
@@ -165,7 +180,9 @@ 
 	}
 
 	public function progressBlank(){
-		if (!$this->isPlayed()) $this->simulate();
+		if (!$this->isPlayed()) {
+			$this->simulate();
+		}
 		foreach ($this->groups as $group) {
 			$group->progressBlank();
 		}
@@ -174,7 +191,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_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 +44 added lines, -21 removed lines

@@ -46,11 +46,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() {
@@ -58,37 +66,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->progressed($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->progressed($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':
@@ -104,11 +129,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));
 		}