Heroyt / tournament-generator

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

src/classes/class_team.php

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

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

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_game.php

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

src/classes/class_progression.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,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;