Heroyt / tournament-generator

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

src/TournamentGenerator/Preset/R2G.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
 		$this->splitTeams($round1);
 
-		if (count($this->getTeams()) % 4 == 2) {
+		if (count($this->getTeams())%4 == 2) {
 			$group_top = $round2->group('TOP')->setType(\TournamentGenerator\Constants::ROUND_TWO);
 
 			$filter_win_2 = new \TournamentGenerator\TeamFilter('wins', '=', 2, [$group_0_0, $group_top]);

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/TournamentGenerator/Preset/SingleElimination.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,17 +27,17 @@ 
 
 		$previousGroups = [];
 
-		for ($i=1; $i <= (($countTeams+$byes)/2); $i++) {
+		for ($i = 1; $i <= (($countTeams+$byes)/2); $i++) {
 			$g = $startRound->group('Round 1 '.$i)->setInGame(2)->setType(\TournamentGenerator\Constants::ROUND_TWO);
 			$previousGroups[] = $g;
 		}
 
 		$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('Round '.$r.' - '.$g)->setInGame(2)->setType(\TournamentGenerator\Constants::ROUND_TWO);
 				$groups[] = $group;
 				array_shift($previousGroups)->progression($group, 0, 1); // PROGRESS FROM GROUP BEFORE

src/TournamentGenerator/Preset/DoubleElimination.php

Spacing +8 added lines, -8 removed lines

@@ -31,7 +31,7 @@ 
 		$groupIds = [];
 		$allGroups = [];
 
-		for ($i=1; $i <= $startGroups; $i++) {
+		for ($i = 1; $i <= $startGroups; $i++) {
 			$g = $startRound->group('Start group - '.$i)->setInGame(2)->setType(\TournamentGenerator\Constants::ROUND_TWO);
 			$allGroups[] = $g;
 			$groupIds[] = $g->id;
@@ -41,7 +41,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);
@@ -75,7 +75,7 @@ 
 	private function calcByes(int $countTeams, int &$nextPow) {
 		$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;
 		}
@@ -83,7 +83,7 @@ 
 	}
 	private function generateWinSide(int &$r, int &$byes, int &$countTeams, \TournamentGenerator\Round &$round, array &$allGroups, array &$groups, \TournamentGenerator\Group &$lastWinningGroup = null, array &$previousGroups = []) {
 		$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('Round '.$r.' - win '.$g)->setInGame(2)->setType(\TournamentGenerator\Constants::ROUND_TWO)->setOrder($order);
 			$allGroups[] = $group;
 			$order += 2;
@@ -98,7 +98,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('Round '.$r.' - loss '.$g)->setInGame(2)->setType(\TournamentGenerator\Constants::ROUND_TWO)->setOrder($order);
 				$allGroups[] = $group;
 				$order += 2;
@@ -121,11 +121,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('Round '.$r.' - loss '.$g)->setInGame(2)->setType(\TournamentGenerator\Constants::ROUND_TWO)->setOrder($order);
 				$allGroups[] = $group;
 				$order += 2;
@@ -137,7 +137,7 @@ 
 				}
 				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;
 				}
 			}

Braces +18 added lines, -10 removed lines

@@ -13,7 +13,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
@@ -131,15 +133,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);
@@ -163,10 +169,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;
 				}
 			}

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