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

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,

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

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() {

src/classes/class_tournament.php

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
 
 	private $allowSkip = false;
 
-	function __construct(string $name = ''){
+	function __construct(string $name = '') {
 		$this->name = $name;
 	}
 	public function __toString() {
@@ -57,16 +57,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;
 	}
@@ -78,7 +78,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.');
@@ -119,7 +119,7 @@ 
 
 	public function addTeam(...$teams) {
 		foreach ($teams as $team) {
-			if ($team instanceof Team)  {
+			if ($team instanceof Team) {
 				$this->teams[] = $team;
 			}
 			elseif (gettype($team) === 'array') {

src/classes/class_category.php

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
 		$this->name = $name;
 	}
 
-	public function addRound(Round ...$rounds){
+	public function addRound(Round ...$rounds) {
 		foreach ($rounds as $round) {
 			if ($round instanceof Round) $this->rounds[] = $round;
 			else throw new \Exception('Trying to add round which is not an instance of Round class.');
@@ -33,15 +33,15 @@ 
 		$this->rounds[] = $r->setSkip($this->allowSkip);
 		return $r;
 	}
-	public function getRounds(){
+	public function getRounds() {
 		return $this->rounds;
 	}
 
-	public function allowSkip(){
+	public function allowSkip() {
 		$this->allowSkip = true;
 		return $this;
 	}
-	public function disallowSkip(){
+	public function disallowSkip() {
 		$this->allowSkip = false;
 		return $this;
 	}
@@ -55,7 +55,7 @@ 
 
 	public function addTeam(...$teams) {
 		foreach ($teams as $team) {
-			if ($team instanceof Team)  {
+			if ($team instanceof Team) {
 				$this->teams[] = $team;
 			}
 			elseif (gettype($team) === 'array') {

src/classes/class_generator.php

Spacing +21 added lines, -21 removed lines

@@ -19,11 +19,11 @@ 
 		$this->group = $group;
 	}
 
-	public function allowSkip(){
+	public function allowSkip() {
 		$this->allowSkip = true;
 		return $this;
 	}
-	public function disallowSkip(){
+	public function disallowSkip() {
 		$this->allowSkip = false;
 		return $this;
 	}
@@ -46,7 +46,7 @@ 
 	}
 
 	public function setInGame(int $inGame) {
-		if ($inGame < 2 ||  $inGame > 4) throw new \Exception('Expected 2,3 or 4 as inGame '.$inGame.' given');
+		if ($inGame < 2 || $inGame > 4) throw new \Exception('Expected 2,3 or 4 as inGame '.$inGame.' given');
 		$this->inGame = $inGame;
 		return $this;
 	}
@@ -67,17 +67,17 @@ 
 		switch ($this->type) {
 			case R_R:{
 					$this->group->addGame($this->r_rGames());
-				break;}
+				break; }
 			case TWO_TWO:
 				$teams = $this->group->getTeams();
 				$discard = [];
 				shuffle($teams);
 				$count = count($teams);
-				while (count($teams) % $this->inGame !== 0) { $discard[] = array_shift($teams); }
+				while (count($teams)%$this->inGame !== 0) { $discard[] = array_shift($teams); }
 
 				while (count($teams) > 0) {
 					$tInGame = [];
-					for ($i=0; $i < $this->inGame; $i++) { $tInGame[] = array_shift($teams); }
+					for ($i = 0; $i < $this->inGame; $i++) { $tInGame[] = array_shift($teams); }
 					$this->group->game($tInGame);
 				}
 
@@ -123,7 +123,7 @@ 
 					}
 					$games = array_merge($games, $gamesTemp);
 				}
-				break;}
+				break; }
 			case 4:{
 				$teamsB = $teams;
 				$lockedTeam1 = array_shift($teamsB);
@@ -140,7 +140,7 @@ 
 					$lockedTeam1 = array_shift($teamsB);
 				}
 				$games[] = new Game(array_merge([$lockedTeam1], $teamsB), $this->group);
-				break;}
+				break; }
 		}
 		return $games;
 	}
@@ -172,8 +172,8 @@ 
 			// CYCLE 1
 			// TEAM WHICH DIDN'T PLAY IN LAST GAME (< 4)
 			foreach ($games as $key => $game) {
-				if ($this->orderCheckTeamsVal($game, $teams, [4,5,6,7])) {
-					$this->moveCalculatedGames($game,$teams);
+				if ($this->orderCheckTeamsVal($game, $teams, [4, 5, 6, 7])) {
+					$this->moveCalculatedGames($game, $teams);
 					unset($games[$key]);
 					$found = true;
 					break;
@@ -184,8 +184,8 @@ 
 			// CYCLE 2
 			// ! TEAM WHICH PLAYED IN LAST TWO GAMES (NOT 6 or 7)
 			foreach ($games as $key => $game) {
-				if ($this->orderCheckTeamsVal($game, $teams, [6,7])) {
-					$this->moveCalculatedGames($game,$teams);
+				if ($this->orderCheckTeamsVal($game, $teams, [6, 7])) {
+					$this->moveCalculatedGames($game, $teams);
 					unset($games[$key]);
 					$found = true;
 					break;
@@ -197,8 +197,8 @@ 
 			// NOT TEAM WHICH PLAYED IN LAST THREE GAMES (NOT 7)
 			// TEAMS THAT DIDN'T PLAY IN LAST GAME WILL PLAY THIS GAME (< 4)
 			foreach ($games as $key => $game) {
-				if ($this->orderCheckTeamsVal($game, $teams, [7], [1,2,3])) {
-					$this->moveCalculatedGames($game,$teams);
+				if ($this->orderCheckTeamsVal($game, $teams, [7], [1, 2, 3])) {
+					$this->moveCalculatedGames($game, $teams);
 					unset($games[$key]);
 					$found = true;
 					break;
@@ -210,7 +210,7 @@ 
 			// NOT TEAM WHICH PLAYED IN LAST THREE GAMES (NOT 7)
 			foreach ($games as $key => $game) {
 				if ($this->orderCheckTeamsVal($game, $teams, [7])) {
-					$this->moveCalculatedGames($game,$teams);
+					$this->moveCalculatedGames($game, $teams);
 					unset($games[$key]);
 					$found = true;
 					break;
@@ -221,8 +221,8 @@ 
 			// CYCLE 5
 			// TEAMS THAT DIDN'T PLAY IN LAST GAME WILL PLAY THIS GAME (< 4)
 			foreach ($games as $key => $game) {
-				if ($this->orderCheckTeamsVal($game, $teams, [], [1,2,3])) {
-					$this->moveCalculatedGames($game,$teams);
+				if ($this->orderCheckTeamsVal($game, $teams, [], [1, 2, 3])) {
+					$this->moveCalculatedGames($game, $teams);
 					unset($games[$key]);
 					$found = true;
 					break;
@@ -232,7 +232,7 @@ 
 
 			// CYCLE 6
 			// FIRST AVAILABLE GAME
-			$this->moveCalculatedGames(array_shift($games),$teams);
+			$this->moveCalculatedGames(array_shift($games), $teams);
 		}
 
 		return $this->games;
@@ -283,11 +283,11 @@ 
 	public static 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, Generator::circle_saveBracket($teams, $group)); // SAVE CURRENT ROUND
 
 			$teams = Generator::circle_rotateBracket($teams); // ROTATE TEAMS IN BRACKET
@@ -301,7 +301,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);

src/classes/class_game.php

Spacing +3 added lines, -3 removed lines

@@ -66,11 +66,11 @@
 		if (count($error) > 0) throw new \Exception('Trying to add teams ('.count($error).') that are not instance of Team class'.PHP_EOL.print_r($error, true));
 		return $this;
 	}
-	public function getTeams(){
+	public function getTeams() {
 		return $this->teams;
 	}
-	public function getTeamsIds(){
-		return array_map(function($a){ return $a->id; }, $this->teams);
+	public function getTeamsIds() {
+		return array_map(function($a) { return $a->id; }, $this->teams);
 	}
 	public function getTeam(string $id) {
 		foreach ($this->teams as $team) {