Heroyt / tournament-generator

src/TournamentGenerator/Round.php

Braces +2 added lines, -4 removed lines

@@ -151,8 +151,7 @@ 
 		$teams = $this->getTeams(true, Constants::SEED);
 		if ($this::isSeeded($teams)) {
 			Functions::sortAlternate($teams);
-		}
-		else {
+		} else {
 			shuffle($teams);
 		}
 
@@ -182,8 +181,7 @@ 
 		$teams = $this->getTeams(true, Constants::SEED);
 		if ($this::isSeeded($teams)) {
 			Functions::sortAlternate($teams);
-		}
-		else {
+		} else {
 			shuffle($teams);
 		}
 

src/TournamentGenerator/Preset/DoubleElimination.php

Spacing +19 added lines, -19 removed lines

@@ -44,13 +44,13 @@ 
 		$startRound = $this->round('Start round');
 
 		/** Total round count (minus final rounds) */
-		$roundsNum = log($nextPow, 2) * 2;
+		$roundsNum = log($nextPow, 2)*2;
 
 		/** How many groups are in the first round */
-		$startGroups = ($countTeams + $byes) / 2;
+		$startGroups = ($countTeams+$byes)/2;
 
 		/** How many losing teams there are after the first winning rounds */
-		$losingTeams = (($countTeams - $byes) / 2) + ($extraStart ? $startGroups / 2 : 0);
+		$losingTeams = (($countTeams-$byes)/2)+($extraStart ? $startGroups/2 : 0);
 		/** If an extra losing round is generated first */
 		$extraLosingStart = !Functions::isPowerOf2($losingTeams);
 
@@ -93,7 +93,7 @@ 
 		$lastWinningGroup = end($allGroups);
 
 		// Create all rounds
-		for ($r = $winR; $r <= $roundsNum - 1; $r++) {
+		for ($r = $winR; $r <= $roundsNum-1; $r++) {
 			$groups = [];
 			$losingGroups = [];
 			$winningGroups = [];
@@ -103,8 +103,8 @@ 
 			$this->generateLosingSide($r, $extraStart, $round, $allGroups, $previousLosingGroups, $previousGroups, $losingGroups);
 
 			// Skip some winning rounds - losing side will have more rounds
-			$rr = $r - ($extraStart ? 1 : 0) + ($extraLosingStart ? 1 : 0);
-			if (($rr < 3 || $rr % 2 === 0) && (!$extraStart || count($previousWinningGroups) > 1)) {
+			$rr = $r-($extraStart ? 1 : 0)+($extraLosingStart ? 1 : 0);
+			if (($rr < 3 || $rr%2 === 0) && (!$extraStart || count($previousWinningGroups) > 1)) {
 				// First round after the starting rounds
 				if ($extraStart && $r === 3) {
 					$previousGroups = $previousWinningGroups;
@@ -159,7 +159,7 @@ 
 		$nextPow = $countTeams;
 		if (!Functions::isPowerOf2($countTeams)) {
 			$nextPow = Functions::nextPowerOf2($countTeams);
-			$byes = $nextPow - $countTeams;
+			$byes = $nextPow-$countTeams;
 		}
 		return $byes;
 	}
@@ -183,7 +183,7 @@ 
 	private function generateWinSide(int $roundNum, int $winRoundNum, int $byes, int $countTeams, Round $round, array &$allGroups, array &$groups, array &$previousWinningGroups = [], array $previousGroups = []) : void {
 		$order = 1;
 		// All groups
-		for ($g = 1; $g <= (($countTeams + $byes) / (2 ** $winRoundNum)); $g++) {
+		for ($g = 1; $g <= (($countTeams+$byes)/(2 ** $winRoundNum)); $g++) {
 			$group = $round
 				->group('Round '.$roundNum.' (win '.$g.')')
 				->setInGame(2)
@@ -197,8 +197,8 @@ 
 			$previousWinningGroups[] = $group;
 
 			// Progress from winning groups before
-			$previousGroups[2 * ($g - 1)]->progression($group, 0, 1);
-			$previousGroups[(2 * ($g - 1)) + 1]->progression($group, 0, 1);
+			$previousGroups[2*($g-1)]->progression($group, 0, 1);
+			$previousGroups[(2*($g-1))+1]->progression($group, 0, 1);
 		}
 	}
 
@@ -229,7 +229,7 @@ 
 		// Save counts
 		$losingCount = count($previousLosingGroups);
 		$winningCount = count($previousWinningGroups);
-		$teamsTotal = $losingCount + $winningCount;
+		$teamsTotal = $losingCount+$winningCount;
 
 		// Merge all groups in an alternating order for progressions
 		/** @var array[] $progressGroups 0: Group, 1: int - progression offset */
@@ -248,7 +248,7 @@ 
 		$order = 2;
 		// Check byes
 		if (Functions::isPowerOf2($teamsTotal)) {
-			for ($g = 1; $g <= $teamsTotal / 2; $g++) {
+			for ($g = 1; $g <= $teamsTotal/2; $g++) {
 				$group = $round
 					->group('Round '.$roundNum.' (loss '.$g.')')
 					->setInGame(2)
@@ -261,11 +261,11 @@ 
 				// First losing round
 				// Progress from winning teams only
 				if (($roundNum === 2 && !$extraStart) || ($roundNum === 3 && $extraStart)) {
-					$previousWinningGroups[2 * ($g - 1)]->progression($group, 1, 1);
-					$previousWinningGroups[(2 * ($g - 1)) + 1]->progression($group, 1, 1);
+					$previousWinningGroups[2*($g-1)]->progression($group, 1, 1);
+					$previousWinningGroups[(2*($g-1))+1]->progression($group, 1, 1);
 				}
 				elseif ($teamsTotal >= 2) {
-					$key = 2 * ($g - 1);
+					$key = 2*($g-1);
 					$progressGroups[$key][0]->progression($group, $progressGroups[$key][1], 1);
 					$key++;
 					$progressGroups[$key][0]->progression($group, $progressGroups[$key][1], 1);
@@ -275,14 +275,14 @@ 
 		else {
 			// Calculate byes
 			$nextPowerOf2 = Functions::nextPowerOf2($teamsTotal);
-			$losingByes = $nextPowerOf2 - $teamsTotal;
+			$losingByes = $nextPowerOf2-$teamsTotal;
 
 			// Counters
 			$byesProgressed = 0;
 			$teamCounter = 0;
 
 			// Generate groups
-			$groupCount = $nextPowerOf2 / 2;
+			$groupCount = $nextPowerOf2/2;
 			for ($g = 1; $g <= $groupCount; $g++) {
 				$group = $round
 					->group('Round '.$roundNum.' (loss '.$g.')')
@@ -296,7 +296,7 @@ 
 				// Create progressions from groups before
 				$teamCounter++;
 				$progressGroups[$byesProgressed][0]->progression($group, $progressGroups[$byesProgressed++][1], 1);
-				if (isset($progressGroups[$byesProgressed]) && $teamCounter < $teamsTotal - $losingByes) {
+				if (isset($progressGroups[$byesProgressed]) && $teamCounter < $teamsTotal-$losingByes) {
 					$teamCounter++;
 					$progressGroups[$byesProgressed][0]->progression($group, $progressGroups[$byesProgressed++][1], 1);
 				}
@@ -313,7 +313,7 @@ 
 		foreach ($this->getRounds() as $round) {
 			$name = $round->getName();
 			$len = strlen($name);
-			$str .= "\n| ---------------------------------------- |\n| ".str_repeat('-', floor((40 - $len) / 2) - 1).' '.$name.' '.str_repeat('-', ceil((40 - $len) / 2) - 1)." |\n| ---------------------------------------- |\n\n";
+			$str .= "\n| ---------------------------------------- |\n| ".str_repeat('-', floor((40-$len)/2)-1).' '.$name.' '.str_repeat('-', ceil((40-$len)/2)-1)." |\n| ---------------------------------------- |\n\n";
 			foreach ($round->getGroups() as $group) {
 				$str .= '-- '.$group->getName().PHP_EOL;
 				if (count($group->getGames()) === 0) {

Braces +3 added lines, -6 removed lines

@@ -263,16 +263,14 @@ 
 				if (($roundNum === 2 && !$extraStart) || ($roundNum === 3 && $extraStart)) {
 					$previousWinningGroups[2 * ($g - 1)]->progression($group, 1, 1);
 					$previousWinningGroups[(2 * ($g - 1)) + 1]->progression($group, 1, 1);
-				}
-				elseif ($teamsTotal >= 2) {
+				} elseif ($teamsTotal >= 2) {
 					$key = 2 * ($g - 1);
 					$progressGroups[$key][0]->progression($group, $progressGroups[$key][1], 1);
 					$key++;
 					$progressGroups[$key][0]->progression($group, $progressGroups[$key][1], 1);
 				}
 			}
-		}
-		else {
+		} else {
 			// Calculate byes
 			$nextPowerOf2 = Functions::nextPowerOf2($teamsTotal);
 			$losingByes = $nextPowerOf2 - $teamsTotal;
@@ -320,8 +318,7 @@ 
 					$str .= '| '.implode(' | ', array_map(static function(Team $team) {
 							return $team->getName();
 						}, $group->getTeams())).' |'.PHP_EOL;
-				}
-				else {
+				} else {
 					foreach ($group->getGames() as $game) {
 						$str .= '| '.implode(' | ', array_map(static function(Team $team) use ($game) {
 								return ($team->getId() === $game->getWin() ? "\e[1m\e[4m" : '').$team->getName()."\e[0m";

src/TournamentGenerator/Traits/WithTeams.php

Braces +4 added lines, -8 removed lines

@@ -61,8 +61,7 @@ 
 		$teams = $this->getTeams(true, Constants::SEED);
 		if ($this::isSeeded($teams)) {
 			Functions::sortAlternate($teams);
-		}
-		else {
+		} else {
 			shuffle($teams);
 		}
 
@@ -95,8 +94,7 @@ 
 		$teams = $this->getTeams(true, Constants::SEED);
 		if ($this::isSeeded($teams)) {
 			Functions::sortAlternate($teams);
-		}
-		else {
+		} else {
 			shuffle($teams);
 		}
 
@@ -129,8 +127,7 @@ 
 		}
 		if ($ordered) {
 			$returnTeams = $this->sortTeams($ordering);
-		}
-		else {
+		} else {
 			$returnTeams = $this->teams->unique()->get();
 		}
 
@@ -180,8 +177,7 @@ 
 		if ($this instanceof WithGroupsInterface) {
 			$filter = new Filter($filters, $this->getGroups());
 			$filter->filter($teams);
-		}
-		else if ($this instanceof Group) {
+		} else if ($this instanceof Group) {
 			$filter = new Filter($filters, [$this]);
 			$filter->filter($teams);
 		}