Heroyt / tournament-generator

src/TournamentGenerator/Team.php

Spacing +10 added lines, -10 removed lines

@@ -66,70 +66,70 @@
 		return $this->sumScore;
 	}
 
-	public function addWin(string $groupId = ''){
+	public function addWin(string $groupId = '') {
 		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
 		$this->groupResults[$groupId]['points'] += $this->groupResults[$groupId]['group']->winPoints;
 		$this->sumPoints += $this->groupResults[$groupId]['group']->winPoints;
 		$this->groupResults[$groupId]['wins']++;
 		return $this;
 	}
-	public function removeWin(string $groupId = ''){
+	public function removeWin(string $groupId = '') {
 		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
 		$this->groupResults[$groupId]['points'] -= $this->groupResults[$groupId]['group']->winPoints;
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->winPoints;
 		$this->groupResults[$groupId]['wins']--;
 		return $this;
 	}
-	public function addDraw(string $groupId = ''){
+	public function addDraw(string $groupId = '') {
 		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
 		$this->groupResults[$groupId]['points'] += $this->groupResults[$groupId]['group']->drawPoints;
 		$this->sumPoints += $this->groupResults[$groupId]['group']->drawPoints;
 		$this->groupResults[$groupId]['draws']++;
 		return $this;
 	}
-	public function removeDraw(string $groupId = ''){
+	public function removeDraw(string $groupId = '') {
 		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
 		$this->groupResults[$groupId]['points'] -= $this->groupResults[$groupId]['group']->drawPointsPoints;
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->drawPoints;
 		$this->groupResults[$groupId]['draws']--;
 		return $this;
 	}
-	public function addLoss(string $groupId = ''){
+	public function addLoss(string $groupId = '') {
 		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
 		$this->groupResults[$groupId]['points'] += $this->groupResults[$groupId]['group']->lostPoints;
 		$this->sumPoints += $this->groupResults[$groupId]['group']->lostPoints;
 		$this->groupResults[$groupId]['losses']++;
 		return $this;
 	}
-	public function removeLoss(string $groupId = ''){
+	public function removeLoss(string $groupId = '') {
 		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
 		$this->groupResults[$groupId]['points'] -= $this->groupResults[$groupId]['group']->lostPoints;
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->lostPoints;
 		$this->groupResults[$groupId]['losses']--;
 		return $this;
 	}
-	public function addSecond(string $groupId = ''){
+	public function addSecond(string $groupId = '') {
 		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
 		$this->groupResults[$groupId]['points'] += $this->groupResults[$groupId]['group']->secondPoints;
 		$this->sumPoints += $this->groupResults[$groupId]['group']->secondPoints;
 		$this->groupResults[$groupId]['second']++;
 		return $this;
 	}
-	public function removeSecond(string $groupId = ''){
+	public function removeSecond(string $groupId = '') {
 		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
 		$this->groupResults[$groupId]['points'] -= $this->groupResults[$groupId]['group']->secondPoints;
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->secondPoints;
 		$this->groupResults[$groupId]['second']--;
 		return $this;
 	}
-	public function addThird(string $groupId = ''){
+	public function addThird(string $groupId = '') {
 		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
 		$this->groupResults[$groupId]['points'] += $this->groupResults[$groupId]['group']->thirdPoints;
 		$this->sumPoints += $this->groupResults[$groupId]['group']->thirdPoints;
 		$this->groupResults[$groupId]['third']++;
 		return $this;
 	}
-	public function removeThird(string $groupId = ''){
+	public function removeThird(string $groupId = '') {
 		if (!isset($this->groupResults[$groupId])) throw new \Exception('Group '.$groupId.' is not set for this team ('.$this->name.')');
 		$this->groupResults[$groupId]['points'] -= $this->groupResults[$groupId]['group']->thirdPoints;
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->thirdPoints;

Braces +51 added lines, -17 removed lines

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

src/TournamentGenerator/Round.php

Spacing +10 added lines, -10 removed lines

@@ -30,7 +30,7 @@ 
 		return $this->name;
 	}
 
-	public function addGroup(Group ...$groups){
+	public function addGroup(Group ...$groups) {
 		foreach ($groups as $group) {
 			$this->groups[] = $group;
 		}
@@ -41,7 +41,7 @@ 
 		$this->groups[] = $g->setSkip($this->allowSkip);
 		return $g;
 	}
-	public function getGroups(){
+	public function getGroups() {
 		$this->orderGroups();
 		return $this->groups;
 	}
@@ -50,16 +50,16 @@ 
 		return array_map(function($a) { return $a->id; }, $this->groups);
 	}
 	public function orderGroups() {
-		usort($this->groups, function($a, $b){
-			return $a->getOrder() - $b->getOrder();
+		usort($this->groups, function($a, $b) {
+			return $a->getOrder()-$b->getOrder();
 		});
 	}
 
-	public function allowSkip(){
+	public function allowSkip() {
 		$this->allowSkip = true;
 		return $this;
 	}
-	public function disallowSkip(){
+	public function disallowSkip() {
 		$this->allowSkip = false;
 		return $this;
 	}
@@ -71,7 +71,7 @@ 
 		return $this->allowSkip;
 	}
 
-	public function genGames(){
+	public function genGames() {
 		foreach ($this->groups as $group) {
 			$group->genGames();
 			$this->games = array_merge($this->games, $group->orderGames());
@@ -81,7 +81,7 @@ 
 	public function getGames() {
 		return $this->games;
 	}
-	public function isPlayed(){
+	public function isPlayed() {
 		foreach ($this->groups as $group) {
 			if (!$group->isPlayed()) return false;
 		}
@@ -90,7 +90,7 @@ 
 
 	public function addTeam(...$teams) {
 		foreach ($teams as $team) {
-			if ($team instanceof Team)  {
+			if ($team instanceof Team) {
 				$this->teams[] = $team;
 			}
 			elseif (gettype($team) === 'array') {
@@ -159,7 +159,7 @@ 
 		return $this;
 	}
 
-	public function progress(bool $blank = false){
+	public function progress(bool $blank = false) {
 		foreach ($this->groups as $group) {
 			$group->progress($blank);
 		}

Braces +15 added lines, -7 removed lines

@@ -83,7 +83,9 @@ 
 	}
 	public function isPlayed(){
 		foreach ($this->groups as $group) {
-			if (!$group->isPlayed()) return false;
+			if (!$group->isPlayed()) {
+				return false;
+			}
 		}
 		return true;
 	}
@@ -92,10 +94,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,
@@ -107,8 +110,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;
 	}
@@ -137,7 +141,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') {
@@ -152,7 +158,9 @@ 
 		while (count($teams) > 0) {
 			foreach ($groups as $group) {
 				if ($group instanceof Group) {
-					if (count($teams) > 0) $group->addTeam(array_shift($teams));
+					if (count($teams) > 0) {
+						$group->addTeam(array_shift($teams));
+					}
 				}
 			}
 		}

src/TournamentGenerator/Progression.php

Braces +15 added lines, -6 removed lines

@@ -33,11 +33,17 @@ 
 	}
 
 	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;
 
@@ -45,12 +51,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/TournamentGenerator/Category.php

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,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.');
@@ -31,15 +31,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;
 	}

Braces +14 added lines, -5 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;
 	}
@@ -63,7 +66,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());
@@ -82,7 +87,9 @@ 
 
 	public function splitTeams(...$rounds) {
 
-		if (count($rounds) === 0) $rounds = $this->getRounds();
+		if (count($rounds) === 0) {
+			$rounds = $this->getRounds();
+		}
 
 		$teams = $this->getTeams();
 		shuffle($teams);
@@ -102,7 +109,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/TournamentGenerator/Tournament.php

Spacing +5 added lines, -5 removed lines

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

Braces +25 added lines, -9 removed lines

@@ -86,8 +86,11 @@ 
 
 	public function addCategory(Category ...$categories){
 		foreach ($categories as $category) {
-			if ($category instanceof Category) $this->categories[] = $category;
-			else throw new \Exception('Trying to add category which is not an instance of the Category class.');
+			if ($category instanceof Category) {
+				$this->categories[] = $category;
+			} else {
+				throw new \Exception('Trying to add category which is not an instance of the Category class.');
+			}
 		}
 		return $this;
 	}
@@ -102,8 +105,11 @@ 
 
 	public function addRound(Round ...$rounds) {
 		foreach ($rounds as $round) {
-			if ($round instanceof Round) $this->rounds[] = $round;
-			else throw new \Exception('Trying to add round which is not an instance of the Round class.');
+			if ($round instanceof Round) {
+				$this->rounds[] = $round;
+			} else {
+				throw new \Exception('Trying to add round which is not an instance of the Round class.');
+			}
 		}
 		return $this;
 	}
@@ -143,7 +149,9 @@ 
 			$teams = array_merge($teams, $round->getTeams());
 		}
 		$this->teams = \array_unique($teams);
-		if ($ordered) $this->sortTeams($ordering);
+		if ($ordered) {
+			$this->sortTeams($ordering);
+		}
 		return $this->teams;
 	}
 	public function sortTeams($ordering = \TournamentGenerator\Constants::POINTS) {
@@ -166,7 +174,9 @@ 
 
 	public function splitTeams(Round ...$wheres) {
 
-		if (count($wheres) === 0) $wheres = $this->getRounds();
+		if (count($wheres) === 0) {
+			$wheres = $this->getRounds();
+		}
 
 		foreach ($wheres as $key => $value) {
 			if (gettype($value) === 'array') {
@@ -181,7 +191,9 @@ 
 
 		while (count($teams) > 0) {
 			foreach ($wheres as $where) {
-				if (count($teams) > 0) $where->addTeam(array_shift($teams));
+				if (count($teams) > 0) {
+					$where->addTeam(array_shift($teams));
+				}
 			}
 		}
 		foreach ($wheres as $where) {
@@ -193,13 +205,17 @@ 
 	public function genGamesSimulate(bool $returnTime = false) {
 		$games = Utilis\Simulator::simulateTournament($this);
 
-		if ($returnTime) return $this->getTournamentTime();
+		if ($returnTime) {
+			return $this->getTournamentTime();
+		}
 		return $games;
 	}
 	public function genGamesSimulateReal(bool $returnTime = false) {
 		$games = Utilis\Simulator::simulateTournamentReal($this);
 
-		if ($returnTime) return $this->getTournamentTime();
+		if ($returnTime) {
+			return $this->getTournamentTime();
+		}
 		return $games;
 	}
 

tests/TournamentTest.php

Spacing +11 added lines, -11 removed lines

@@ -263,13 +263,13 @@ 
 		$round1 = $tournament->round('Round1');
 		$round2 = $tournament->round('Round1');
 
-		$category1->addTeam(new \TournamentGenerator\Team('Team1'),new \TournamentGenerator\Team('Team2'),new \TournamentGenerator\Team('Team3'));
-		$category2->addTeam(new \TournamentGenerator\Team('Team4'),new \TournamentGenerator\Team('Team5'),new \TournamentGenerator\Team('Team6'));
+		$category1->addTeam(new \TournamentGenerator\Team('Team1'), new \TournamentGenerator\Team('Team2'), new \TournamentGenerator\Team('Team3'));
+		$category2->addTeam(new \TournamentGenerator\Team('Team4'), new \TournamentGenerator\Team('Team5'), new \TournamentGenerator\Team('Team6'));
 
-		$round1->addTeam(new \TournamentGenerator\Team('Team7'),new \TournamentGenerator\Team('Team8'),new \TournamentGenerator\Team('Team9'));
-		$round2->addTeam(new \TournamentGenerator\Team('Team10'),new \TournamentGenerator\Team('Team11'),new \TournamentGenerator\Team('Team12'));
+		$round1->addTeam(new \TournamentGenerator\Team('Team7'), new \TournamentGenerator\Team('Team8'), new \TournamentGenerator\Team('Team9'));
+		$round2->addTeam(new \TournamentGenerator\Team('Team10'), new \TournamentGenerator\Team('Team11'), new \TournamentGenerator\Team('Team12'));
 
-		$tournament->addTeam(new \TournamentGenerator\Team('Team13'),new \TournamentGenerator\Team('Team14'),new \TournamentGenerator\Team('Team15'));
+		$tournament->addTeam(new \TournamentGenerator\Team('Team13'), new \TournamentGenerator\Team('Team14'), new \TournamentGenerator\Team('Team15'));
 
 		$this->assertCount(15, $tournament->getTeams());
 		// Test if teams does not duplicate
@@ -282,7 +282,7 @@ 
 
 		$tournament = new \TournamentGenerator\Tournament('Name of tournament 1');
 
-		for ($i=1; $i <= 8; $i++) {
+		for ($i = 1; $i <= 8; $i++) {
 			$tournament->team('Team '.$i);
 		}
 
@@ -303,7 +303,7 @@ 
 
 		$tournament = new \TournamentGenerator\Tournament('Name of tournament 1');
 
-		for ($i=1; $i <= 8; $i++) {
+		for ($i = 1; $i <= 8; $i++) {
 			$tournament->team('Team '.$i);
 		}
 
@@ -330,7 +330,7 @@ 
 			->setGameWait(2) // SET TIME BETWEEN GAMES TO 2 MINUTES
 			->setRoundWait(0); // SET TIME BETWEEN ROUNDS TO 0 MINUTES
 
-		for ($i=1; $i <= 8; $i++) {
+		for ($i = 1; $i <= 8; $i++) {
 			$tournament->team('Team '.$i);
 		}
 		// Create a round and a final round
@@ -427,7 +427,7 @@ 
 
 		$group = $round->group('Group name');
 
-		for ($i=1; $i <= 4; $i++) {
+		for ($i = 1; $i <= 4; $i++) {
 			$tournament->team('Team '.$i);
 		}
 
@@ -460,7 +460,7 @@ 
 
 		$group = $round->group('Group name');
 
-		for ($i=1; $i <= 4; $i++) {
+		for ($i = 1; $i <= 4; $i++) {
 			$tournament->team('Team '.$i);
 		}
 
@@ -492,7 +492,7 @@ 
 
 		$group = $round->group('Group name');
 
-		for ($i=1; $i <= 4; $i++) {
+		for ($i = 1; $i <= 4; $i++) {
 			$tournament->team('Team '.$i);
 		}