Heroyt / tournament-generator

src/TournamentGenerator/Utilis/Sorter/Games.php

Spacing +10 added lines, -10 removed lines

@@ -69,7 +69,7 @@ 
 
 			// CYCLE 6
 			// FIRST AVAILABLE GAME
-			$this->moveCalculatedGames(array_shift($games),$teams);
+			$this->moveCalculatedGames(array_shift($games), $teams);
 		}
 
 		return $this->games;
@@ -79,8 +79,8 @@ 
 	private function cycle1(array &$games, array &$teams) {
 		$found = false;
 		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;
@@ -92,8 +92,8 @@ 
 	private function cycle2(array &$games, array &$teams) {
 		$found = false;
 		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;
@@ -106,8 +106,8 @@ 
 	private function cycle3(array &$games, array &$teams) {
 		$found = false;
 		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;
@@ -120,7 +120,7 @@ 
 		$found = false;
 		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;
@@ -132,8 +132,8 @@ 
 	private function cycle5(array &$games, array &$teams) {
 		$found = false;
 		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;

src/TournamentGenerator/Utilis/Generator.php

Spacing +8 added lines, -8 removed lines

@@ -18,11 +18,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;
 	}
@@ -45,7 +45,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;
 	}
@@ -120,11 +120,11 @@ 
 		$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);
 		}
 
@@ -165,11 +165,11 @@ 
 	public static function circle_genGames2(array $teams = [], \tournamentGenerator\Group $group) {
 		$bracket = []; // ARRAY OF GAMES
 
-		if (count($teams) % 2 != 0) $teams[] = \TournamentGenerator\Constants::DUMMY_TEAM; // IF NOT EVEN NUMBER OF TEAMS, ADD DUMMY
+		if (count($teams)%2 != 0) $teams[] = \TournamentGenerator\Constants::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
@@ -183,7 +183,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/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;
 	}

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

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->getId();
@@ -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;
 				}
 			}

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) {
 			$this->categories[] = $category;
 		}

src/TournamentGenerator/Team.php

Spacing +10 added lines, -10 removed lines

@@ -121,14 +121,14 @@ 
 		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;
@@ -136,14 +136,14 @@ 
 		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']->drawPoints;
 		$this->sumPoints -= $this->groupResults[$groupId]['group']->drawPoints;
@@ -151,14 +151,14 @@ 
 		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;
@@ -166,14 +166,14 @@ 
 		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;
@@ -181,14 +181,14 @@ 
 		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;

src/TournamentGenerator/Game.php

Spacing +5 added lines, -5 removed lines

@@ -66,14 +66,14 @@ 
 		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->getId(); }, $this->teams);
+	public function getTeamsIds() {
+		return array_map(function($a) { return $a->getId(); }, $this->teams);
 	}
 	public function getTeam($id) {
-		$key = array_search($id, array_map(function($a){ return $a->getId();}, $this->teams));
+		$key = array_search($id, array_map(function($a) { return $a->getId(); }, $this->teams));
 		return ($key !== false ? $this->teams[$key] : false);
 	}
 
@@ -110,7 +110,7 @@ 
 		return $this;
 	}
 	private function setResults2($i, $score, $results, $team) {
-		if (count(array_filter($results, function($a) use ($score){return $a === $score;})) > 1) {
+		if (count(array_filter($results, function($a) use ($score){return $a === $score; })) > 1) {
 			$this->drawIds[] = $team->getId();
 			$team->addDraw($this->group->getId());
 			$this->results[$team->getId()] += ['points' => $this->group->drawPoints, 'type' => 'draw'];