Heroyt / tournament-generator

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

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