Heroyt / tournament-generator

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

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(){
@@ -83,14 +91,20 @@ 
 	* )
 	*/
 	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) {
-			if (!is_numeric($score)) throw new \TypeError('Score passed to TournamentGenerator\Game::setResults() must be of the type numeric, '.gettype($score).' given');
+			if (!is_numeric($score)) {
+				throw new \TypeError('Score passed to TournamentGenerator\Game::setResults() must be of the type numeric, '.gettype($score).' given');
+			}
 			$team = $this->getTeam($id);
-			if (!$team instanceof Team) throw new \Exception('Couldn\'t find team with id of "'.$id.'"');
+			if (!$team instanceof Team) {
+				throw new \Exception('Couldn\'t find team with id of "'.$id.'"');
+			}
 			$this->results[$team->getId()] = ['score' => $score];
 			$team->addScore($score);
 			switch ($inGame) {
@@ -114,13 +128,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'];
@@ -220,7 +232,9 @@ 
 	}
 
 	public function isPlayed() {
-		if (count($this->results) > 0) return true;
+		if (count($this->results) > 0) {
+			return true;
+		}
 		return false;
 	}
 }

src/TournamentGenerator/Round.php

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;

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
 		$this->setId(isset($id) ? $id : uniqid());
 	}
 
-	public function addGroup(Group ...$groups){
+	public function addGroup(Group ...$groups) {
 		foreach ($groups as $group) {
 			$this->groups[] = $group;
 		}
@@ -29,7 +29,7 @@ 
 		$this->groups[] = $g->setSkip($this->allowSkip);
 		return $g;
 	}
-	public function getGroups(){
+	public function getGroups() {
 		$this->orderGroups();
 		return $this->groups;
 	}
@@ -38,17 +38,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;
 	}
@@ -60,7 +60,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());
@@ -70,7 +70,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;
@@ -122,7 +122,7 @@ 
 		return $this;
 	}
 
-	public function progress(bool $blank = false){
+	public function progress(bool $blank = false) {
 		foreach ($this->groups as $group) {
 			$group->progress($blank);
 		}

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

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

Spacing +10 added lines, -10 removed lines

@@ -28,11 +28,11 @@ 
 		$this->setId(isset($id) ? $id : uniqid());
 	}
 
-	public function allowSkip(){
+	public function allowSkip() {
 		$this->generator->allowSkip();
 		return $this;
 	}
-	public function disallowSkip(){
+	public function disallowSkip() {
 		$this->generator->disallowSkip();
 		return $this;
 	}
@@ -139,9 +139,9 @@ 
 		}
 	}
 	public function addProgressed(...$teams) {
-		$this->progressed = array_merge($this->progressed, array_map(function ($a) {return $a->getId();}, 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_map(function ($a) {return $a->getId();}, array_filter($team, function($a) {
+		$this->progressed = array_merge($this->progressed, array_map(function($a) {return $a->getId(); }, 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_map(function($a) {return $a->getId(); }, array_filter($team, function($a) {
 				return ($a instanceof Team);
 			})));
 		}
@@ -161,11 +161,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;
 	}
@@ -187,7 +187,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;

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,18 +61,23 @@ 
 			if (is_array($value)) {
 				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".');
 				}
 				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('Filter ['.$key.'] is not an instance of TeamFilter class');
@@ -79,18 +89,23 @@ 
 			if (is_array($value)) {
 				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".');
 				}
 				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('Filter ['.$key.'] is not an instance of TeamFilter class');

src/TournamentGenerator/Utilis/FilterComparator.php

Braces +15 added lines, -5 removed lines

@@ -52,7 +52,9 @@ 
 	private static function calcSum(\TournamentGenerator\Team $team, array $groupsId) {
 		$sum = 0;
 		foreach ($groupsId as $id) {
-			if (isset($team->groupResults[$id])) $sum += $team->groupResults[$id][self::$what];
+			if (isset($team->groupResults[$id])) {
+				$sum += $team->groupResults[$id][self::$what];
+			}
 		}
 		return $sum;
 	}
@@ -62,12 +64,16 @@ 
 			$games = $team->getGames(null, reset($groupsId));
 			foreach ($games as $game) {
 				$results = $game->getResults()[$team->getId()];
-				if (($results[self::$what] > $max || $max === null)) $max = $results[self::$what];
+				if (($results[self::$what] > $max || $max === null)) {
+					$max = $results[self::$what];
+				}
 			}
 			return $max;
 		}
 		foreach ($groupsId as $id) {
-			if (isset($team->groupResults[$id]) && ($team->groupResults[$id][self::$what] > $max || $max === null)) $max = $team->groupResults[$id][self::$what];
+			if (isset($team->groupResults[$id]) && ($team->groupResults[$id][self::$what] > $max || $max === null)) {
+				$max = $team->groupResults[$id][self::$what];
+			}
 		}
 		return $max;
 	}
@@ -77,12 +83,16 @@ 
 			$games = $team->getGames(null, reset($groupsId));
 			foreach ($games as $game) {
 				$results = $game->getResults()[$team->getId()];
-				if (($results[self::$what] < $min || $min === null)) $min = $results[self::$what];
+				if (($results[self::$what] < $min || $min === null)) {
+					$min = $results[self::$what];
+				}
 			}
 			return $min;
 		}
 		foreach ($groupsId as $id) {
-			if (isset($team->groupResults[$id]) && ($team->groupResults[$id][self::$what] < $min || $min === null)) $min = $team->groupResults[$id][self::$what];
+			if (isset($team->groupResults[$id]) && ($team->groupResults[$id][self::$what] < $min || $min === null)) {
+				$min = $team->groupResults[$id][self::$what];
+			}
 		}
 		return $min;
 	}

src/TournamentGenerator/TeamFilter.php

Spacing +2 added lines, -2 removed lines

@@ -43,14 +43,14 @@
 
 	private $groups = [];
 
-	function __construct(string $what = 'points', string $how = '>', $val = 0, array $groups = []){
+	function __construct(string $what = 'points', string $how = '>', $val = 0, array $groups = []) {
 		if (!in_array(strtolower($what), ['points', 'score', 'wins', 'draws', 'losses', 'second', 'third', 'team', 'notprogressed', 'progressed'])) throw new \Exception('Trying to filter unexisting type ('.$what.')');
 		$this->what = strtolower($what);
 		if (!in_array($how, ['>', '<', '>=', '<=', '=', '!='])) throw new \Exception('Trying to filter with unexisting operator ('.$how.')');
 		$this->how = $how;
 		if (!(gettype($val) === 'integer' && strtolower($what) !== 'team') && !($val instanceof Team && strtolower($what) === 'team')) throw new \Exception('Unsupported filter value type ('.gettype($val).')');
 		$this->val = $val;
-		$this->groups = array_map(function($a) { return $a->getId(); }, array_filter($groups, function($a) {return ($a instanceof Group);}));
+		$this->groups = array_map(function($a) { return $a->getId(); }, array_filter($groups, function($a) {return ($a instanceof Group); }));
 	}
 	public function __toString() {
 		return 'Filter: '.$this->what.' '.($this->what !== 'notprogressed' && $this->what !== 'progressed' ? $this->how.' '.$this->val : '');

Braces +25 added lines, -9 removed lines

@@ -44,11 +44,17 @@ 
 	private $groups = [];
 
 	function __construct(string $what = 'points', string $how = '>', $val = 0, array $groups = []){
-		if (!in_array(strtolower($what), ['points', 'score', 'wins', 'draws', 'losses', 'second', 'third', 'team', 'notprogressed', 'progressed'])) throw new \Exception('Trying to filter unexisting type ('.$what.')');
+		if (!in_array(strtolower($what), ['points', 'score', 'wins', 'draws', 'losses', 'second', 'third', 'team', 'notprogressed', 'progressed'])) {
+			throw new \Exception('Trying to filter unexisting type ('.$what.')');
+		}
 		$this->what = strtolower($what);
-		if (!in_array($how, ['>', '<', '>=', '<=', '=', '!='])) throw new \Exception('Trying to filter with unexisting operator ('.$how.')');
+		if (!in_array($how, ['>', '<', '>=', '<=', '=', '!='])) {
+			throw new \Exception('Trying to filter with unexisting operator ('.$how.')');
+		}
 		$this->how = $how;
-		if (!(gettype($val) === 'integer' && strtolower($what) !== 'team') && !($val instanceof Team && strtolower($what) === 'team')) throw new \Exception('Unsupported filter value type ('.gettype($val).')');
+		if (!(gettype($val) === 'integer' && strtolower($what) !== 'team') && !($val instanceof Team && strtolower($what) === 'team')) {
+			throw new \Exception('Unsupported filter value type ('.gettype($val).')');
+		}
 		$this->val = $val;
 		$this->groups = array_map(function($a) { return $a->getId(); }, array_filter($groups, function($a) {return ($a instanceof Group);}));
 	}
@@ -57,11 +63,17 @@ 
 	}
 
 	public function validate(Team $team, $groupsId, string $operation = 'sum', Group $from = null) {
-		if (count($this->groups) > 0) $groupsId = array_unique(array_merge($this->groups, (gettype($groupsId) === 'array' ? $groupsId : [$groupsId])), SORT_REGULAR);
+		if (count($this->groups) > 0) {
+			$groupsId = array_unique(array_merge($this->groups, (gettype($groupsId) === 'array' ? $groupsId : [$groupsId])), SORT_REGULAR);
+		}
 
-		if ($this->what == 'team') return ($this->how === '!=' ? !$this->validateTeam($team) : $this->validateTeam($team));
-		elseif ($this->what == 'notprogressed') return !$this->validateProgressed($team, $from);
-		elseif ($this->what == 'progressed') return $this->validateProgressed($team, $from);
+		if ($this->what == 'team') {
+			return ($this->how === '!=' ? !$this->validateTeam($team) : $this->validateTeam($team));
+		} elseif ($this->what == 'notprogressed') {
+			return !$this->validateProgressed($team, $from);
+		} elseif ($this->what == 'progressed') {
+			return $this->validateProgressed($team, $from);
+		}
 
 		return $this->validateCalc($team, $groupsId, $operation);
 	}
@@ -70,11 +82,15 @@ 
 		return $this->val === $team;
 	}
 	private function validateProgressed(Team $team, Group $from = null) {
-		if ($from === null) throw new \Exception('Group $from was not defined.');
+		if ($from === null) {
+			throw new \Exception('Group $from was not defined.');
+		}
 		return $from->isProgressed($team);
 	}
 	private function validateCalc(Team $team, array $groupsId, string $operation = 'sum') {
-		if (gettype($groupsId) === 'array' && !in_array(strtolower($operation), ['sum', 'avg', 'max', 'min'])) throw new \Exception('Unknown operation of '.$operation.'. Only "sum", "avg", "min", "max" possible.');
+		if (gettype($groupsId) === 'array' && !in_array(strtolower($operation), ['sum', 'avg', 'max', 'min'])) {
+			throw new \Exception('Unknown operation of '.$operation.'. Only "sum", "avg", "min", "max" possible.');
+		}
 
 		return Utilis\FilterComparator::compare($operation, $this->val, $this->how, $this->what, $team, $groupsId);