Heroyt / tournament-generator

src/classes/class_teamFilter.php

Braces +43 added lines, -18 removed lines

@@ -44,11 +44,19 @@ 
 	private $groups = [];
 
 	function __construct(string $what = 'points', string $how = '>', $val = 0, $groups = []){
-		if (in_array(strtolower($what), ['points', 'score', 'wins', 'draws', 'losses', 'second', 'third', 'team', 'notprogressed', 'progressed'])) $this->what = strtolower($what);
-		if (in_array($how, ['>', '<', '>=', '<=', '=', '!='])) $this->how = $how;
-		if ((gettype($val) === 'integer' && strtolower($what) !== 'team') || ($val instanceof Team && strtolower($what) === 'team')) $this->val = $val;
+		if (in_array(strtolower($what), ['points', 'score', 'wins', 'draws', 'losses', 'second', 'third', 'team', 'notprogressed', 'progressed'])) {
+			$this->what = strtolower($what);
+		}
+		if (in_array($how, ['>', '<', '>=', '<=', '=', '!='])) {
+			$this->how = $how;
+		}
+		if ((gettype($val) === 'integer' && strtolower($what) !== 'team') || ($val instanceof Team && strtolower($what) === 'team')) {
+			$this->val = $val;
+		}
 		foreach ($groups as $group) {
-			if ($group instanceof Group) $this->groups[] =  $group->id;
+			if ($group instanceof Group) {
+				$this->groups[] =  $group->id;
+			}
 		}
 	}
 	public function __toString() {
@@ -56,14 +64,14 @@ 
 	}
 
 	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->validateTeam($team);
-		}
-		elseif ($this->what == 'notprogressed') {
+		} elseif ($this->what == 'notprogressed') {
 			return !$this->validateProgressed($team, $from);
-		}
-		elseif ($this->what == 'progressed') {
+		} elseif ($this->what == 'progressed') {
 			return $this->validateProgressed($team, $from);
 		}
 		return $this->validateCalc($team, $groupsId, $operation, $from);
@@ -72,20 +80,28 @@ 
 	private function validateTeam(Team $team) {
 		switch ($this->how) {
 			case '=':
-				if ($this->val === $team) return true;
+				if ($this->val === $team) {
+					return true;
+				}
 				break;
 			case '!=':
-				if ($this->val !== $team) return true;
+				if ($this->val !== $team) {
+					return true;
+				}
 				break;
 		}
 		return false;
 	}
 	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, $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.');
+		}
 		$comp = 0;
 		if (gettype($groupsId) === 'array' && count($groupsId) > 0) {
 			switch (strtolower($operation)) {
@@ -94,9 +110,11 @@ 
 				case 'max': $comp = $this->calcMax($team, $groupsId);
 				case 'min': $comp = $this->calcMin($team, $groupsId);
 			}
+		} elseif (gettype($groupsId) === 'string' && isset($team->groupResults[$groupsId])) {
+			$comp = $team->groupResults[$groupsId][$this->what];
+		} else {
+			throw new \Exception("Couldn't find group of id ".print_r($groupsId, true));
 		}
-		elseif (gettype($groupsId) === 'string' && isset($team->groupResults[$groupsId])) $comp = $team->groupResults[$groupsId][$this->what];
-		else throw new \Exception("Couldn't find group of id ".print_r($groupsId, true));
 
 		switch ($this->how) {
 			case '>': return ($comp > $this->val);
@@ -112,7 +130,10 @@ 
 	private function calcSum(Team $team, $groupsId) {
 		$sum = 0;
 		foreach ($groupsId as $id) {
-			if (!isset($team->groupResults[$id])) continue; // IF TEAM DIDN'T PLAY IN THAT GROUP -> SKIP
+			if (!isset($team->groupResults[$id])) {
+				continue;
+			}
+			// IF TEAM DIDN'T PLAY IN THAT GROUP -> SKIP
 			$sum += $team->groupResults[$id][$this->what];
 		}
 		return $sum;
@@ -120,14 +141,18 @@ 
 	private function calcMax(Team $team, $groupsId) {
 		$max = null;
 		foreach ($groupsId as $id) {
-			if (isset($team->groupResults[$id]) && ($team->groupResults[$id][$this->what] > $max || $max === null)) $max = $team->groupResults[$id][$this->what];
+			if (isset($team->groupResults[$id]) && ($team->groupResults[$id][$this->what] > $max || $max === null)) {
+				$max = $team->groupResults[$id][$this->what];
+			}
 		}
 		return $max;
 	}
 	private function calcMin(Team $team, $groupsId) {
 		$min = null;
 		foreach ($groupsId as $id) {
-			if (isset($team->groupResults[$id]) && ($team->groupResults[$id][$this->what] < $min || $min === null)) $min = $team->groupResults[$id][$this->what];
+			if (isset($team->groupResults[$id]) && ($team->groupResults[$id][$this->what] < $min || $min === null)) {
+				$min = $team->groupResults[$id][$this->what];
+			}
 		}
 		return $min;
 	}