Heroyt / tournament-generator

src/classes/class_group.php

Spacing +7 added lines, -7 removed lines

@@ -57,11 +57,11 @@ 
 		return 'Group '.$this->name;
 	}
 
-	public function allowSkip(){
+	public function allowSkip() {
 		$this->generator->allowSkip();
 		return $this;
 	}
-	public function disallowSkip(){
+	public function disallowSkip() {
 		$this->generator->disallowSkip();
 		return $this;
 	}
@@ -75,7 +75,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,
@@ -169,13 +169,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);
 	}
@@ -306,7 +306,7 @@ 
 		$this->games[] = $g;
 		return $g;
 	}
-	public function addGame(...$games){
+	public function addGame(...$games) {
 		foreach ($games as $key => $game) {
 			if (gettype($game) === 'array') {
 				unset($games[$key]);
@@ -350,7 +350,7 @@ 
 		}
 		return $this;
 	}
-	public function isPlayed(){
+	public function isPlayed() {
 		foreach ($this->games as $game) {
 			if ((isset($game) || !$this->getSkip()) && !$game->isPlayed()) return false;
 		}

Braces +89 added lines, -47 removed lines

@@ -30,14 +30,18 @@ 
 		foreach ($settings as $key => $value) {
 			switch ($key) {
 				case 'name':
-					if (gettype($value) !== 'string') throw new \Exception('Expected string as group name '.gettype($value).' given');
+					if (gettype($value) !== 'string') {
+						throw new \Exception('Expected string as group name '.gettype($value).' given');
+					}
 					$this->name = $value;
 					break;
 				case 'type':
 					$this->generator->setType($value);
 					break;
 				case 'ordering':
-					if (!in_array($value, orderingTypes)) throw new \Exception('Unknown group ordering: '.$value);
+					if (!in_array($value, orderingTypes)) {
+						throw new \Exception('Unknown group ordering: '.$value);
+					}
 					$this->ordering = $value;
 					break;
 				case 'inGame':
@@ -45,7 +49,9 @@ 
 					break;
 				case 'maxSize':
 					$value = (int) $value;
-					if ($value > 1) $this->generator->setMaxSize($value);
+					if ($value > 1) {
+						$this->generator->setMaxSize($value);
+					}
 					break;
 				case 'order':
 					$this->order = (int) $value;
@@ -87,10 +93,11 @@ 
 					'second' => 0,
 					'third'  => 0
 				];
-			}
-			elseif (gettype($team) === 'array') {
+			} elseif (gettype($team) === 'array') {
 				foreach ($team as $team2) {
-					if ($team2 instanceof Team) $this->teams[] = $team2;
+					if ($team2 instanceof Team) {
+						$this->teams[] = $team2;
+					}
 					$team2->groupResults[$this->id] = [
 						'group' => $this,
 						'points' => 0,
@@ -102,16 +109,20 @@ 
 						'third'  => 0
 					];
 				}
+			} else {
+				throw new \Exception('Trying to add team which is not an instance of Team class');
 			}
-			else throw new \Exception('Trying to add team which is not an instance of Team class');
 		}
 		return $this;
 	}
 	public function getTeams($filters = []) {
 		$teams = $this->teams;
 
-		if (gettype($filters) !== 'array' && $filters instanceof TeamFilter) $filters = [$filters];
-		elseif (gettype($filters) !== 'array') $filters = [];
+		if (gettype($filters) !== 'array' && $filters instanceof TeamFilter) {
+			$filters = [$filters];
+		} elseif (gettype($filters) !== 'array') {
+			$filters = [];
+		}
 
 		// APPLY FILTERS
 		foreach ($filters as $key => $filter) {
@@ -119,27 +130,31 @@ 
 				switch (strtolower($key)) {
 					case 'and':
 						foreach ($teams as $tkey => $team) {
-							if (!$this->filterAnd($team, $filter)) unset($teams[$tkey]); // IF FILTER IS NOT VALIDATED REMOVE TEAM FROM RETURN ARRAY
+							if (!$this->filterAnd($team, $filter)) {
+								unset($teams[$tkey]);
+							}
+							// IF FILTER IS NOT VALIDATED REMOVE TEAM FROM RETURN ARRAY
 						}
 						break;
 					case 'or':
 						foreach ($teams as $tkey => $team) {
-							if (!$this->filterOr($team, $filter)) unset($teams[$tkey]); // IF FILTER IS NOT VALIDATED REMOVE TEAM FROM RETURN ARRAY
+							if (!$this->filterOr($team, $filter)) {
+								unset($teams[$tkey]);
+							}
+							// IF FILTER IS NOT VALIDATED REMOVE TEAM FROM RETURN ARRAY
 						}
 						break;
 					default:
 						throw new \Exception('Unknown opperand type "'.$key.'". Expected "and" or "or".');
 						break;
 				}
-			}
-			elseif ($filter instanceof TeamFilter) {
+			} elseif ($filter instanceof TeamFilter) {
 				foreach ($teams as $tkey => $team) {
 					if (!$filter->validate($team, $this->id, 'sum', $this)) {
 						unset($teams[$tkey]); // IF FILTER IS NOT VALIDATED REMOVE TEAM FROM RETURN ARRAY
 					}
 				}
-			}
-			else {
+			} else {
 				throw new \Exception('Filer ['.$key.'] is not an instance of TeamFilter class');
 			}
 		}
@@ -161,18 +176,26 @@ 
 		return $t;
 	}
 	public function sortTeams($filters = [], $ordering = null) {
-		if (!isset($ordering)) $ordering = $this->ordering;
+		if (!isset($ordering)) {
+			$ordering = $this->ordering;
+		}
 		switch ($ordering) {
 			case POINTS:{
 				usort($this->teams, function($a, $b) {
-					if ($a->groupResults[$this->id]["points"] === $b->groupResults[$this->id]["points"] && $a->groupResults[$this->id]["score"] === $b->groupResults[$this->id]["score"]) return 0;
-					if ($a->groupResults[$this->id]["points"] === $b->groupResults[$this->id]["points"]) return ($a->groupResults[$this->id]["score"] > $b->groupResults[$this->id]["score"] ? -1 : 1);
+					if ($a->groupResults[$this->id]["points"] === $b->groupResults[$this->id]["points"] && $a->groupResults[$this->id]["score"] === $b->groupResults[$this->id]["score"]) {
+						return 0;
+					}
+					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;}
 			case SCORE:{
 				usort($this->teams, function($a, $b) {
-					if ($a->groupResults[$this->id]["score"] === $b->groupResults[$this->id]["score"]) return 0;
+					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;}
@@ -185,20 +208,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;
 				}
-			}
-			elseif ($value instanceof TeamFilter) {
-				if (!$value->validate($team, $this->id, 'sum', $this)) return false;
-			}
-			else {
+			} elseif ($value instanceof TeamFilter) {
+				if (!$value->validate($team, $this->id, 'sum', $this)) {
+					return false;
+				}
+			} else {
 				throw new \Exception('Filer ['.$key.'] is not an instance of TeamFilter class');
 			}
 		}
@@ -209,20 +236,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;
 				}
-			}
-			elseif ($value instanceof TeamFilter) {
-				if (!$value->validate($team, $this->id, 'sum', $this)) return true;
-			}
-			else {
+			} elseif ($value instanceof TeamFilter) {
+				if (!$value->validate($team, $this->id, 'sum', $this)) {
+					return true;
+				}
+			} else {
 				throw new \Exception('Filer ['.$key.'] is not an instance of TeamFilter class');
 			}
 		}
@@ -238,8 +269,11 @@ 
 	}
 
 	public function setOrdering(string $ordering = POINTS) {
-		if (in_array($ordering, orderingTypes)) $this->ordering = $ordering;
-		else throw new \Exception('Unknown group ordering: '.$ordering);
+		if (in_array($ordering, orderingTypes)) {
+			$this->ordering = $ordering;
+		} else {
+			throw new \Exception('Unknown group ordering: '.$ordering);
+		}
 		return $this;
 	}
 	public function getOrdering() {
@@ -272,16 +306,13 @@ 
 		foreach ($teams as $team) {
 			if ($team instanceOf Team) {
 				$this->progressed[] = $team->id;
-			}
-			elseif (gettype($team) === 'string' || gettype($team) === 'integer') {
+			} elseif (gettype($team) === 'string' || gettype($team) === 'integer') {
 				$this->progressed[] = $team;
-			}
-			elseif (gettype($team) === 'array') {
+			} elseif (gettype($team) === 'array') {
 				foreach ($team as $teamInner) {
 					if ($teamInner instanceOf Team) {
 						$this->progressed[] = $teamInner->id;
-					}
-					elseif (gettype($teamInner) === 'string' || gettype($teamInner) === 'integer') {
+					} elseif (gettype($teamInner) === 'string' || gettype($teamInner) === 'integer') {
 						$this->progressed[] = $teamInner;
 					}
 				}
@@ -314,8 +345,11 @@ 
 			}
 		}
 		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.');
+			if ($game instanceof Game) {
+				$this->games[] = $game;
+			} else {
+				throw new \Exception('Trying to add game which is not instance of Game object.');
+			}
 		}
 		return $this;
 	}
@@ -323,7 +357,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;
 	}
@@ -338,7 +374,9 @@ 
 			$game->setResults($results);
 		}
 		$return = $this->sortTeams($filters);
-		if (!$reset) return $return;
+		if (!$reset) {
+			return $return;
+		}
 		foreach ($this->getGames() as $game) {
 			$game->resetResults();
 		}
@@ -346,13 +384,17 @@ 
 	}
 	public function resetGames() {
 		foreach ($this->getGames() as $game) {
-			if (isset($game)) $game->resetResults();
+			if (isset($game)) {
+				$game->resetResults();
+			}
 		}
 		return $this;
 	}
 	public function isPlayed(){
 		foreach ($this->games as $game) {
-			if ((isset($game) || !$this->getSkip()) && !$game->isPlayed()) return false;
+			if ((isset($game) || !$this->getSkip()) && !$game->isPlayed()) {
+				return false;
+			}
 		}
 		return true;
 	}

src/classes/class_progression.php

Braces +18 added lines, -7 removed lines

@@ -27,18 +27,26 @@ 
 
 	public function addFilter(...$filters) {
 		foreach ($filters as $filter) {
-			if (!$filter instanceof TeamFilter) throw new \Exception('Trying to add filter which is not an instance of TeamFilter.');
+			if (!$filter instanceof TeamFilter) {
+				throw new \Exception('Trying to add filter which is not an instance of TeamFilter.');
+			}
 			$this->filters[] = $filter;
 		}
 		return $this;
 	}
 
 	public function progress(bool $blank = false) {
-		if ($blank) $teams = $this->from->isPlayed() ? $this->from->sortTeams($this->filters) : $this->from->simulate($this->filters);
-		else $teams = $this->from->sortTeams($this->filters);
+		if ($blank) {
+			$teams = $this->from->isPlayed() ? $this->from->sortTeams($this->filters) : $this->from->simulate($this->filters);
+		} else {
+			$teams = $this->from->sortTeams($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;
+		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;
+		}
 
 		$i = 1;
 
@@ -46,12 +54,15 @@ 
 			if ($blank) {
 				$this->to->addTeam(new BlankTeam($this.' - '.$i, $team));
 				$i++;
+			} else {
+				$team->sumPoints += $this->from->progressPoints;
 			}
-			else $team->sumPoints += $this->from->progressPoints;
 		}
 
 		$this->from->addProgressed($next);
-		if (!$blank) $this->to->addTeam($next);
+		if (!$blank) {
+			$this->to->addTeam($next);
+		}
 		return $this;
 	}
 

src/classes/class_round.php

Spacing +12 added lines, -12 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,7 +35,7 @@ 
 		$this->groups[] = $g->setSkip($this->allowSkip);
 		return $g;
 	}
-	public function getGroups(){
+	public function getGroups() {
 		$this->orderGroups();
 		return $this->groups;
 	}
@@ -44,16 +44,16 @@ 
 		return array_map(function($a) { return $a->id; }, $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;
 	}
@@ -65,7 +65,7 @@ 
 		return $this->allowSkip;
 	}
 
-	public function genGames(){
+	public function genGames() {
 		$g = 0;
 		foreach ($this->groups as $group) {
 			$group->genGames();
@@ -76,7 +76,7 @@ 
 	public function getGames() {
 		return $this->games;
 	}
-	public function isPlayed(){
+	public function isPlayed() {
 		foreach ($this->groups as $group) {
 			if (!$group->isPlayed()) return false;
 		}
@@ -85,7 +85,7 @@ 
 
 	public function addTeam(...$teams) {
 		foreach ($teams as $team) {
-			if ($team instanceof Team)  {
+			if ($team instanceof Team) {
 				$this->teams[] = $team;
 			}
 			elseif (gettype($team) === 'array') {
@@ -135,13 +135,13 @@ 
 					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);
 				});
-				break;}
+				break; }
 			case SCORE:{
 				uasort($this->teams, function($a, $b) use ($groupsIds) {
 					if ($a->sumScore($groupsIds) === $b->sumScore($groupsIds)) return 0;
 					return ($a->sumScore($groupsIds) > $b->sumScore($groupsIds) ? -1 : 1);
 				});
-				break;}
+				break; }
 		}
 		return $this->teams;
 	}
@@ -170,7 +170,7 @@ 
 		return $this;
 	}
 
-	public function progress(bool $blank = false){
+	public function progress(bool $blank = false) {
 		foreach ($this->groups as $group) {
 			$group->progress($blank);
 		}

Braces +32 added lines, -13 removed lines

@@ -25,8 +25,11 @@ 
 
 	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.');
+			if ($group instanceof Group) {
+				$this->groups[] = $group;
+			} else {
+				throw new \Exception('Trying to add group which is not an instance of Group class.');
+			}
 		}
 		return $this;
 	}
@@ -78,7 +81,9 @@ 
 	}
 	public function isPlayed(){
 		foreach ($this->groups as $group) {
-			if (!$group->isPlayed()) return false;
+			if (!$group->isPlayed()) {
+				return false;
+			}
 		}
 		return true;
 	}
@@ -87,10 +92,11 @@ 
 		foreach ($teams as $team) {
 			if ($team instanceof Team)  {
 				$this->teams[] = $team;
-			}
-			elseif (gettype($team) === 'array') {
+			} elseif (gettype($team) === 'array') {
 				foreach ($team as $team2) {
-					if ($team2 instanceof Team) $this->teams[] = $team2;
+					if ($team2 instanceof Team) {
+						$this->teams[] = $team2;
+					}
 					$team2->groupResults[$this->id] = [
 						'group' => $this,
 						'points' => 0,
@@ -102,8 +108,9 @@ 
 						'third'  => 0
 					];
 				}
+			} else {
+				throw new \Exception('Trying to add team which is not an instance of Team class');
 			}
-			else throw new \Exception('Trying to add team which is not an instance of Team class');
 		}
 		return $this;
 	}
@@ -131,14 +138,20 @@ 
 		switch ($ordering) {
 			case POINTS:{
 				uasort($this->teams, function($a, $b) use ($groupsIds) {
-					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);
 				});
 				break;}
 			case SCORE:{
 				uasort($this->teams, function($a, $b) use ($groupsIds) {
-					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);
 				});
 				break;}
@@ -148,7 +161,9 @@ 
 
 	public function splitTeams(...$groups) {
 
-		if (count($groups) === 0) $groups = $this->getGroups();
+		if (count($groups) === 0) {
+			$groups = $this->getGroups();
+		}
 
 		foreach ($groups as $key => $value) {
 			if (gettype($value) === 'array') {
@@ -163,7 +178,9 @@ 
 		while (count($teams) > 0) {
 			foreach ($groups as $group) {
 				if ($group instanceof Group) {
-					if (count($teams) > 0) $group->addTeam(array_shift($teams));
+					if (count($teams) > 0) {
+						$group->addTeam(array_shift($teams));
+					}
 				}
 			}
 		}
@@ -179,7 +196,9 @@ 
 
 	public function simulate() {
 		foreach ($this->groups as $group) {
-			if ($group->isPlayed()) continue;
+			if ($group->isPlayed()) {
+				continue;
+			}
 			$group->simulate([], false);
 		}
 		return $this;