Heroyt / tournament-generator

src/TournamentGenerator/Utilis/Sorter/Teams.php

Indentation +22 added lines, -22 removed lines

@@ -18,19 +18,19 @@ 
 {
 
 	/**
-	* @var array $ids Stores ids of groups get scores and points from
-	*/
+	 * @var array $ids Stores ids of groups get scores and points from
+	 */
 	protected static $ids = [];
 
 	/**
-	* Sort teams in group by defined ordering type
-	*
-	* @param array &$teams                     Array of teams to be sorted
-	* @param \TournamentGenerator\Group $group Group to get the results from
-	* @param string $ordering                  What to order by (\TournamentGenerator\Constants::POINTS / \TournamentGenerator\Constants::SCORE)
-	*
-	* @return array Sorted array of teams
-	*/
+	 * Sort teams in group by defined ordering type
+	 *
+	 * @param array &$teams                     Array of teams to be sorted
+	 * @param \TournamentGenerator\Group $group Group to get the results from
+	 * @param string $ordering                  What to order by (\TournamentGenerator\Constants::POINTS / \TournamentGenerator\Constants::SCORE)
+	 *
+	 * @return array Sorted array of teams
+	 */
 	public static function sortGroup(array &$teams, \TournamentGenerator\Group $group, string $ordering = \TournamentGenerator\Constants::POINTS) {
 		if (!in_array($ordering, \TournamentGenerator\Constants::OrderingTypes)) throw new \Exception('Unknown ordering type `'.$ordering.'`');
 
@@ -49,14 +49,14 @@ 
 	}
 
 	/**
-	* Sort teams in round by defined ordering type
-	*
-	* @param array &$teams                     Array of teams to be sorted
-	* @param \TournamentGenerator\Round $round Round to get the results from
-	* @param string $ordering                  What to order by (\TournamentGenerator\Constants::POINTS / \TournamentGenerator\Constants::SCORE)
-	*
-	* @return array Sorted array of teams
-	*/
+	 * Sort teams in round by defined ordering type
+	 *
+	 * @param array &$teams                     Array of teams to be sorted
+	 * @param \TournamentGenerator\Round $round Round to get the results from
+	 * @param string $ordering                  What to order by (\TournamentGenerator\Constants::POINTS / \TournamentGenerator\Constants::SCORE)
+	 *
+	 * @return array Sorted array of teams
+	 */
 	public static function sortRound(array &$teams, \TournamentGenerator\Round $round, string $ordering = \TournamentGenerator\Constants::POINTS) {
 		if (!in_array($ordering, \TournamentGenerator\Constants::OrderingTypes)) throw new \Exception('Unknown ordering type `'.$ordering.'`');
 
@@ -75,8 +75,8 @@ 
 	}
 
 	/**
-	* Sorter function for uasort by points
-	*/
+	 * Sorter function for uasort by points
+	 */
 	private static function sortTeamsByPoints($a, $b) {
 		$groupsIds = self::$ids;
 		if ($a->sumPoints($groupsIds) === $b->sumPoints($groupsIds) && $a->sumScore($groupsIds) === $b->sumScore($groupsIds)) return 0;
@@ -84,8 +84,8 @@ 
 		return ($a->sumPoints($groupsIds) > $b->sumPoints($groupsIds) ? -1 : 1);
 	}
 	/**
-	* Sorter function for uasort by score
-	*/
+	 * Sorter function for uasort by score
+	 */
 	private static function sortTeamsByScore($a, $b) {
 		$groupsIds = self::$ids;
 		if ($a->sumScore($groupsIds) === $b->sumScore($groupsIds)) return 0;

Braces +15 added lines, -5 removed lines

@@ -32,7 +32,9 @@ 
 	* @return array Sorted array of teams
 	*/
 	public static function sortGroup(array &$teams, \TournamentGenerator\Group $group, string $ordering = \TournamentGenerator\Constants::POINTS) {
-		if (!in_array($ordering, \TournamentGenerator\Constants::OrderingTypes)) throw new \Exception('Unknown ordering type `'.$ordering.'`');
+		if (!in_array($ordering, \TournamentGenerator\Constants::OrderingTypes)) {
+			throw new \Exception('Unknown ordering type `'.$ordering.'`');
+		}
 
 		self::$ids = [$group->getId()];
 
@@ -58,7 +60,9 @@ 
 	* @return array Sorted array of teams
 	*/
 	public static function sortRound(array &$teams, \TournamentGenerator\Round $round, string $ordering = \TournamentGenerator\Constants::POINTS) {
-		if (!in_array($ordering, \TournamentGenerator\Constants::OrderingTypes)) throw new \Exception('Unknown ordering type `'.$ordering.'`');
+		if (!in_array($ordering, \TournamentGenerator\Constants::OrderingTypes)) {
+			throw new \Exception('Unknown ordering type `'.$ordering.'`');
+		}
 
 		self::$ids = $round->getGroupsIds();
 
@@ -79,8 +83,12 @@ 
 	*/
 	private static function sortTeamsByPoints($a, $b) {
 		$groupsIds = self::$ids;
-		if ($a->sumPoints($groupsIds) === $b->sumPoints($groupsIds) && $a->sumScore($groupsIds) === $b->sumScore($groupsIds)) return 0;
-		if ($a->sumPoints($groupsIds) === $b->sumPoints($groupsIds)) return ($a->sumScore($groupsIds) > $b->sumScore($groupsIds) ? -1 : 1);
+		if ($a->sumPoints($groupsIds) === $b->sumPoints($groupsIds) && $a->sumScore($groupsIds) === $b->sumScore($groupsIds)) {
+			return 0;
+		}
+		if ($a->sumPoints($groupsIds) === $b->sumPoints($groupsIds)) {
+			return ($a->sumScore($groupsIds) > $b->sumScore($groupsIds) ? -1 : 1);
+		}
 		return ($a->sumPoints($groupsIds) > $b->sumPoints($groupsIds) ? -1 : 1);
 	}
 	/**
@@ -88,7 +96,9 @@ 
 	*/
 	private static function sortTeamsByScore($a, $b) {
 		$groupsIds = self::$ids;
-		if ($a->sumScore($groupsIds) === $b->sumScore($groupsIds)) return 0;
+		if ($a->sumScore($groupsIds) === $b->sumScore($groupsIds)) {
+			return 0;
+		}
 		return ($a->sumScore($groupsIds) > $b->sumScore($groupsIds) ? -1 : 1);
 	}
 

src/TournamentGenerator/Round.php

Spacing +9 added lines, -9 removed lines

@@ -40,7 +40,7 @@ 
 		return $this->id;
 	}
 
-	public function addGroup(Group ...$groups){
+	public function addGroup(Group ...$groups) {
 		foreach ($groups as $group) {
 			$this->groups[] = $group;
 		}
@@ -51,7 +51,7 @@ 
 		$this->groups[] = $g->setSkip($this->allowSkip);
 		return $g;
 	}
-	public function getGroups(){
+	public function getGroups() {
 		$this->orderGroups();
 		return $this->groups;
 	}
@@ -60,17 +60,17 @@ 
 		return array_map(function($a) { return $a->getId(); }, $this->groups);
 	}
 	public function orderGroups() {
-		usort($this->groups, function($a, $b){
-			return $a->getOrder() - $b->getOrder();
+		usort($this->groups, function($a, $b) {
+			return $a->getOrder()-$b->getOrder();
 		});
 		return $this->groups;
 	}
 
-	public function allowSkip(){
+	public function allowSkip() {
 		$this->allowSkip = true;
 		return $this;
 	}
-	public function disallowSkip(){
+	public function disallowSkip() {
 		$this->allowSkip = false;
 		return $this;
 	}
@@ -82,7 +82,7 @@ 
 		return $this->allowSkip;
 	}
 
-	public function genGames(){
+	public function genGames() {
 		foreach ($this->groups as $group) {
 			$group->genGames();
 			$this->games = array_merge($this->games, $group->orderGames());
@@ -92,7 +92,7 @@ 
 	public function getGames() {
 		return $this->games;
 	}
-	public function isPlayed(){
+	public function isPlayed() {
 		if (count($this->games) === 0) return false;
 		foreach ($this->groups as $group) {
 			if (!$group->isPlayed()) return false;
@@ -154,7 +154,7 @@ 
 		return $this;
 	}
 
-	public function progress(bool $blank = false){
+	public function progress(bool $blank = false) {
 		foreach ($this->groups as $group) {
 			$group->progress($blank);
 		}

Braces +12 added lines, -4 removed lines

@@ -93,9 +93,13 @@ 
 		return $this->games;
 	}
 	public function isPlayed(){
-		if (count($this->games) === 0) return false;
+		if (count($this->games) === 0) {
+			return false;
+		}
 		foreach ($this->groups as $group) {
-			if (!$group->isPlayed()) return false;
+			if (!$group->isPlayed()) {
+				return false;
+			}
 		}
 		return true;
 	}
@@ -131,14 +135,18 @@ 
 
 	public function splitTeams(Group ...$groups) {
 
-		if (count($groups) === 0) $groups = $this->getGroups();
+		if (count($groups) === 0) {
+			$groups = $this->getGroups();
+		}
 
 		$teams = $this->getTeams();
 		shuffle($teams);
 
 		while (count($teams) > 0) {
 			foreach ($groups as $group) {
-				if (count($teams) > 0) $group->addTeam(array_shift($teams));
+				if (count($teams) > 0) {
+					$group->addTeam(array_shift($teams));
+				}
 			}
 		}
 		return $this;

src/TournamentGenerator/Filter.php

Braces +29 added lines, -14 removed lines

@@ -25,8 +25,7 @@ 
 			if (gettype($filter) === 'array') {
 				$this->filterMulti($teams, $filter, $key);
 				continue;
-			}
-			elseif ($filter instanceof TeamFilter) {
+			} elseif ($filter instanceof TeamFilter) {
 				$teams = array_filter($teams, function($team) use ($filter) {return $filter->validate($team, $this->group->getId(), 'sum', $this->group); });
 				continue;
 			}
@@ -39,12 +38,18 @@ 
 		switch (strtolower($how)) {
 			case 'and':
 				foreach ($teams as $tkey => $team) {
-					if (!$this->filterAnd($team, $filters)) unset($teams[$tkey]); // IF FILTER IS NOT VALIDATED REMOVE TEAM FROM RETURN ARRAY
+					if (!$this->filterAnd($team, $filters)) {
+						unset($teams[$tkey]);
+					}
+					// IF FILTER IS NOT VALIDATED REMOVE TEAM FROM RETURN ARRAY
 				}
 				return true;
 			case 'or':
 				foreach ($teams as $tkey => $team) {
-					if (!$this->filterOr($team, $filters)) unset($teams[$tkey]); // IF FILTER IS NOT VALIDATED REMOVE TEAM FROM RETURN ARRAY
+					if (!$this->filterOr($team, $filters)) {
+						unset($teams[$tkey]);
+					}
+					// IF FILTER IS NOT VALIDATED REMOVE TEAM FROM RETURN ARRAY
 				}
 				return true;
 		}
@@ -56,19 +61,24 @@ 
 			if (gettype($value) === 'array') {
 				switch (strtolower($key)) {
 					case 'and':
-						if ($this->filterAnd($team, $value)) return false;
+						if ($this->filterAnd($team, $value)) {
+							return false;
+						}
 						break;
 					case 'or':
-						if ($this->filterOr($team, $value)) return false;
+						if ($this->filterOr($team, $value)) {
+							return false;
+						}
 						break;
 					default:
 						throw new \Exception('Unknown opperand type "'.$key.'". Expected "and" or "or".');
 						break;
 				}
 				continue;
-			}
-			elseif ($value instanceof TeamFilter) {
-				if (!$value->validate($team, $this->group->getId(), 'sum', $this->group)) return false;
+			} elseif ($value instanceof TeamFilter) {
+				if (!$value->validate($team, $this->group->getId(), 'sum', $this->group)) {
+					return false;
+				}
 				continue;
 			}
 			throw new \Exception('Filer ['.$key.'] is not an instance of TeamFilter class');
@@ -80,19 +90,24 @@ 
 			if (gettype($value) === 'array') {
 				switch (strtolower($key)) {
 					case 'and':
-						if ($this->filterAnd($team, $value)) return true;
+						if ($this->filterAnd($team, $value)) {
+							return true;
+						}
 						break;
 					case 'or':
-						if ($this->filterOr($team, $value)) return true;
+						if ($this->filterOr($team, $value)) {
+							return true;
+						}
 						break;
 					default:
 						throw new \Exception('Unknown opperand type "'.$key.'". Expected "and" or "or".');
 						break;
 				}
 				continue;
-			}
-			elseif ($value instanceof TeamFilter) {
-				if (!$value->validate($team, $this->group->getId(), 'sum', $this->group)) return true;
+			} elseif ($value instanceof TeamFilter) {
+				if (!$value->validate($team, $this->group->getId(), 'sum', $this->group)) {
+					return true;
+				}
 				continue;
 			}
 			throw new \Exception('Filer ['.$key.'] is not an instance of TeamFilter class');

src/TournamentGenerator/Game.php

Indentation +4 added lines, -4 removed lines

@@ -80,10 +80,10 @@
 	}
 
 	/**
-	* $results = array (
-	* * team->getId() => team->score
-	* )
-	*/
+	 * $results = array (
+	 * * team->getId() => team->score
+	 * )
+	 */
 	public function setResults(array $results = []) {
 		if (count($this->results) === 0) $this->resetResults();
 		arsort($results);

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->getId(); }, $this->teams);
+	public function getTeamsIds() {
+		return array_map(function($a) { return $a->getId(); }, $this->teams);
 	}
 	public function getTeam(string $id) {
 		foreach ($this->teams as $team) {

Braces +26 added lines, -12 removed lines

@@ -33,11 +33,15 @@ 
 		$this->teams = $teams;
 		foreach ($this->teams as $team) {
 			foreach ($this->teams as $team2) {
-				if ($team === $team2) continue;
+				if ($team === $team2) {
+					continue;
+				}
 				$team->addGameWith($team2, $group);
 			}
 		}
-		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));
+		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));
+		}
 	}
 
 	public function getGroup() {
@@ -56,14 +60,18 @@ 
 			$team->addGame($this);
 
 			foreach ($this->teams as $team2) {
-				if ($team === $team2) continue;
+				if ($team === $team2) {
+					continue;
+				}
 				if ($team instanceof Team) {
 					$team->addGameWith($team2, $this->group);
 					$team2->addGameWith($team, $this->group);
 				}
 			}
 		}
-		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));
+		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(){
@@ -74,7 +82,9 @@ 
 	}
 	public function getTeam(string $id) {
 		foreach ($this->teams as $team) {
-			if ($team->getId() === $id) return $team;
+			if ($team->getId() === $id) {
+				return $team;
+			}
 		}
 		return false;
 	}
@@ -85,13 +95,17 @@ 
 	* )
 	*/
 	public function setResults(array $results = []) {
-		if (count($this->results) === 0) $this->resetResults();
+		if (count($this->results) === 0) {
+			$this->resetResults();
+		}
 		arsort($results);
 		$inGame = /** @scrutinizer ignore-call */ $this->group->getInGame();
 		$i = 1;
 		foreach ($results as $id => $score) {
 			$team = $this->getTeam($id);
-			if ($team === false) throw new \Exception('Couldn\'t find team with id of "'.$id.'"');
+			if ($team === false) {
+				throw new \Exception('Couldn\'t find team with id of "'.$id.'"');
+			}
 			$this->results[$team->getId()] = ['score' => $score];
 			$team->sumScore += $score;
 			$prev = prev($results);
@@ -118,13 +132,11 @@ 
 			$this->drawIds[] = $team->getId();
 			$team->addDraw($this->group->getId());
 			$this->results[$team->getId()] += ['points' => $this->group->drawPoints, 'type' => 'draw'];
-		}
-		elseif ($i === 1) {
+		} elseif ($i === 1) {
 			$this->winId = $team->getId();
 			$team->addWin($this->group->getId());
 			$this->results[$team->getId()] += ['points' => $this->group->winPoints, 'type' => 'win'];
-		}
-		else {
+		} else {
 			$this->lossId = $team->getId();
 			$team->addLoss($this->group->getId());
 			$this->results[$team->getId()] += ['points' => $this->group->lostPoints, 'type' => 'loss'];
@@ -223,7 +235,9 @@ 
 	}
 
 	public function isPlayed() {
-		if (count($this->results) > 0) return true;
+		if (count($this->results) > 0) {
+			return true;
+		}
 		return false;
 	}
 }

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

Braces +15 added lines, -5 removed lines

@@ -141,7 +141,9 @@ 
 			$teams = array_merge($teams, $round->getTeams());
 		}
 		$this->teams = \array_unique($teams);
-		if ($ordered) $this->sortTeams($ordering);
+		if ($ordered) {
+			$this->sortTeams($ordering);
+		}
 		return $this->teams;
 	}
 	public function sortTeams($ordering = \TournamentGenerator\Constants::POINTS) {
@@ -164,14 +166,18 @@ 
 
 	public function splitTeams(Round ...$wheres) {
 
-		if (count($wheres) === 0) $wheres = $this->getRounds();
+		if (count($wheres) === 0) {
+			$wheres = $this->getRounds();
+		}
 
 		$teams = $this->getTeams();
 		shuffle($teams);
 
 		while (count($teams) > 0) {
 			foreach ($wheres as $where) {
-				if (count($teams) > 0) $where->addTeam(array_shift($teams));
+				if (count($teams) > 0) {
+					$where->addTeam(array_shift($teams));
+				}
 			}
 		}
 		foreach ($wheres as $where) {
@@ -183,13 +189,17 @@ 
 	public function genGamesSimulate(bool $returnTime = false) {
 		$games = Utilis\Simulator::simulateTournament($this);
 
-		if ($returnTime) return $this->getTournamentTime();
+		if ($returnTime) {
+			return $this->getTournamentTime();
+		}
 		return $games;
 	}
 	public function genGamesSimulateReal(bool $returnTime = false) {
 		$games = Utilis\Simulator::simulateTournamentReal($this);
 
-		if ($returnTime) return $this->getTournamentTime();
+		if ($returnTime) {
+			return $this->getTournamentTime();
+		}
 		return $games;
 	}
 

src/TournamentGenerator/Group.php

Spacing +9 added lines, -9 removed lines

@@ -50,11 +50,11 @@ 
 		return $this->id;
 	}
 
-	public function allowSkip(){
+	public function allowSkip() {
 		$this->generator->allowSkip();
 		return $this;
 	}
-	public function disallowSkip(){
+	public function disallowSkip() {
 		$this->generator->disallowSkip();
 		return $this;
 	}
@@ -161,8 +161,8 @@ 
 		}
 	}
 	public function addProgressed(...$teams) {
-		$this->progressed = array_merge($this->progressed, array_filter($teams, function($a){return $a instanceof Team;}));
-		foreach (array_filter($teams, function($a){return is_array($a);}) as $team) {
+		$this->progressed = array_merge($this->progressed, array_filter($teams, function($a) {return $a instanceof Team; }));
+		foreach (array_filter($teams, function($a) {return is_array($a); }) as $team) {
 			$this->progressed = array_merge($this->progressed, array_filter($team, function($a) {
 				return ($a instanceof Team);
 			}));
@@ -183,11 +183,11 @@ 
 		$this->games[] = $g;
 		return $g;
 	}
-	public function addGame(...$games){
-		$this->games = array_merge($this->games, array_filter($games, function($a){ return ($a instanceof Game); }));
+	public function addGame(...$games) {
+		$this->games = array_merge($this->games, array_filter($games, function($a) { return ($a instanceof Game); }));
 
-		foreach (array_filter($games, function($a){return is_array($a);}) as $key => $game) {
-			$this->games = array_merge($this->games, array_filter($game, function($a){ return ($a instanceof Game); }));
+		foreach (array_filter($games, function($a) {return is_array($a); }) as $key => $game) {
+			$this->games = array_merge($this->games, array_filter($game, function($a) { return ($a instanceof Game); }));
 		}
 		return $this;
 	}
@@ -209,7 +209,7 @@ 
 		}
 		return $this;
 	}
-	public function isPlayed(){
+	public function isPlayed() {
 		if (count($this->games) === 0) return false;
 		foreach ($this->games as $game) {
 			if (!$game->isPlayed()) return false;

Braces +15 added lines, -5 removed lines

@@ -100,7 +100,9 @@ 
 		return $t;
 	}
 	public function sortTeams(array $filters = [], $ordering = null) {
-		if (!isset($ordering)) $ordering = $this->ordering;
+		if (!isset($ordering)) {
+			$ordering = $this->ordering;
+		}
 		Utilis\Sorter\Teams::sortGroup($this->teams, $this, $ordering);
 		return $this->getTeams($filters);
 	}
@@ -130,7 +132,9 @@ 
 	}
 
 	public function setOrdering(string $ordering = \TournamentGenerator\Constants::POINTS) {
-		if (!in_array($ordering, \TournamentGenerator\Constants::OrderingTypes)) throw new \Exception('Unknown group ordering: '.$ordering);
+		if (!in_array($ordering, \TournamentGenerator\Constants::OrderingTypes)) {
+			throw new \Exception('Unknown group ordering: '.$ordering);
+		}
 		$this->ordering = $ordering;
 		return $this;
 	}
@@ -195,7 +199,9 @@ 
 		return $this->games;
 	}
 	public function orderGames() {
-		if (count($this->games) <= 4) return $this->games;
+		if (count($this->games) <= 4) {
+			return $this->games;
+		}
 		$this->games = $this->generator->orderGames();
 		return $this->games;
 	}
@@ -210,9 +216,13 @@ 
 		return $this;
 	}
 	public function isPlayed(){
-		if (count($this->games) === 0) return false;
+		if (count($this->games) === 0) {
+			return false;
+		}
 		foreach ($this->games as $game) {
-			if (!$game->isPlayed()) return false;
+			if (!$game->isPlayed()) {
+				return false;
+			}
 		}
 		return true;
 	}