Heroyt / tournament-generator

src/TournamentGenerator/Filter.php

Braces +38 added lines, -17 removed lines

@@ -29,8 +29,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->getGroupsIds(), 'sum', $this->groups[0]); });
 				continue;
 			}
@@ -40,16 +39,24 @@ 
 	}
 
 	private function filterMulti(array &$teams, array $filters, string $how = 'and') {
-		if (is_int($how)) $how = 'and';
+		if (is_int($how)) {
+			$how = 'and';
+		}
 		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;
 		}
@@ -59,21 +66,28 @@ 
 	private function filterAnd(Team $team, array $filters) {
 		foreach ($filters as $key => $value) {
 			if (is_array($value)) {
-				if (is_int($key)) $key = 'and';
+				if (is_int($key)) {
+					$key = 'and';
+				}
 				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->getGroupsIds(), 'sum', $this->groups[0])) return false;
+			} elseif ($value instanceof TeamFilter) {
+				if (!$value->validate($team, $this->getGroupsIds(), 'sum', $this->groups[0])) {
+					return false;
+				}
 				continue;
 			}
 			throw new \Exception('Filter ['.$key.'] is not an instance of TeamFilter class');
@@ -82,22 +96,29 @@ 
 	}
 	private function filterOr(Team $team, array $filters) {
 		foreach ($filters as $key => $value) {
-			if (is_int($key)) $key = 'and';
+			if (is_int($key)) {
+				$key = 'and';
+			}
 			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->getGroupsIds(), 'sum', $this->groups[0])) return true;
+			} elseif ($value instanceof TeamFilter) {
+				if ($value->validate($team, $this->getGroupsIds(), 'sum', $this->groups[0])) {
+					return true;
+				}
 				continue;
 			}
 			throw new \Exception('Filter ['.$key.'] is not an instance of TeamFilter class');

src/TournamentGenerator/Progression.php

Braces +18 added lines, -7 removed lines

@@ -38,12 +38,20 @@ 
 	}
 
 	public function progress(bool $blank = false) {
-		if ($this->progressed) return $this;
-		if ($blank) $teams = $this->from->isPlayed() ? $this->from->sortTeams(null, $this->filters) : $this->from->simulate($this->filters);
-		else $teams = $this->from->sortTeams(null, $this->filters);
+		if ($this->progressed) {
+			return $this;
+		}
+		if ($blank) {
+			$teams = $this->from->isPlayed() ? $this->from->sortTeams(null, $this->filters) : $this->from->simulate($this->filters);
+		} else {
+			$teams = $this->from->sortTeams(null, $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;
 
@@ -51,12 +59,15 @@ 
 			if ($blank) {
 				$this->to->addTeam(new BlankTeam($this.' - '.$i, $team, $this->from, $this));
 				$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);
+		}
 		$this->progressed = true;
 		return $this;
 	}