Heroyt / tournament-generator

src/classes/class_category.php

Spacing +5 added lines, -5 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;
 	}
@@ -53,7 +53,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/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/classes/class_teamFilter.php

Spacing +2 added lines, -2 removed lines

@@ -43,12 +43,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;
 		}
 	}
 	function __toString() {

src/classes/class_game.php

Spacing +5 added lines, -5 removed lines

@@ -76,10 +76,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;
@@ -126,7 +126,7 @@ 
 						$team->addLoss($this->group->id);
 						$this->results[$team->id] += ['points' => $this->group->lostPoints, 'type' => 'loss'];
 					}
-					break;}
+					break; }
 				case 3:{
 					switch ($i) {
 						case 1:
@@ -145,7 +145,7 @@ 
 							$this->results[$team->id] += ['points' => $this->group->lostPoints, 'type' => 'loss'];
 							break;
 					}
-					break;}
+					break; }
 				case 4:{
 					switch ($i) {
 						case 1:
@@ -169,7 +169,7 @@ 
 							$this->results[$team->id] += ['points' => $this->group->lostPoints, 'type' => 'loss'];
 							break;
 					}
-					break;}
+					break; }
 			}
 			$team->groupResults[$this->group->id]['score'] += $score;
 			$i++;

src/classes/class_group.php

Spacing +14 added lines, -14 removed lines

@@ -66,11 +66,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;
 	}
@@ -84,7 +84,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,
@@ -242,13 +242,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);
 	}
@@ -313,19 +313,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);
@@ -364,7 +364,7 @@ 
 		$this->games[] = $g;
 		return $g;
 	}
-	public function addGame(Game ...$games){
+	public function addGame(Game ...$games) {
 		foreach ($game as $game) {
 			if ($game instanceof Game) $this->games[] = $game;
 			else throw new Exception('Trying to add game which is not instance of Game object.');
@@ -460,7 +460,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) {
@@ -511,7 +511,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) {
@@ -556,7 +556,7 @@ 
 					$games = array_merge($games, $games);
 				}
 				// $this->orderGames();
-				break;}
+				break; }
 			case 4:{
 				$teamsB = $teams;
 				$lockedTeam1 = array_shift($teamsB);
@@ -574,7 +574,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;
 		}

src/classes/class_progression.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 		return $this;
 	}
 
-	public function progressBlank(){
+	public function progressBlank() {
 		$teams = $this->from->isPlayed() ? $this->from->sortTeams($this->filters) : $this->from->simulate($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;

src/classes/class_round.php

Spacing +11 added lines, -11 removed lines

@@ -23,7 +23,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.');
@@ -35,21 +35,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;
 	}
@@ -61,7 +61,7 @@ 
 		return $this->allowSkip;
 	}
 
-	public function genGames(){
+	public function genGames() {
 		$games = [];
 		$ex = [];
 		$g = 0;
@@ -86,7 +86,7 @@ 
 	public function getGames() {
 		return $this->games;
 	}
-	public function isPlayed(){
+	public function isPlayed() {
 		foreach ($this->groups as $group) {
 			if (!$group->isPlayed()) return false;
 		}
@@ -95,7 +95,7 @@ 
 
 	public function addTeam(...$teams) {
 		foreach ($teams as $team) {
-			if ($team instanceof Team)  {
+			if ($team instanceof Team) {
 				$this->teams[] = $team;
 			}
 			elseif (gettype($team) === 'array') {
@@ -156,14 +156,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();