Heroyt / tournament-generator

src/TournamentGenerator/Round.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 	public function orderGroups() : array {
 		$groups = $this->getGroups();
 		usort($groups, static function($a, $b) {
-			return $a->getOrder() - $b->getOrder();
+			return $a->getOrder()-$b->getOrder();
 		});
 		return $groups;
 	}

src/TournamentGenerator/Helpers/Functions.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 	 * @return bool
 	 */
 	public static function isPowerOf2(int $x) : bool {
-		return ($x !== 0) && ($x & ($x - 1)) === 0;
+		return ($x !== 0) && ($x&($x-1)) === 0;
 	}
 
 	/**
@@ -47,7 +47,7 @@ 
 	 */
 	public static function previousPowerOf2(int $x) : int {
 		// Left bit shift by the bit length of the previous number
-		return 1 << (strlen(decbin($x)) - 1);
+		return 1 << (strlen(decbin($x))-1);
 	}
 
 	/**

src/TournamentGenerator/Containers/ContainerQuery.php

Braces +6 added lines, -12 removed lines

@@ -64,8 +64,7 @@ 
 		// Get initial data
 		if ($this->topLevelOnly) {
 			$data = $this->container->getTopLevel();
-		}
-		else {
+		} else {
 			$data = $this->container->get();
 		}
 
@@ -105,8 +104,7 @@ 
 					}
 					$ids[] = $obj->getId();
 				}
-			}
-			else {
+			} else {
 				$data = array_unique($data);
 			}
 		}
@@ -131,11 +129,9 @@ 
 	protected function sortData(array &$data) : void {
 		if (isset($this->sorter)) {
 			$data = $this->sorter->sort($data);
-		}
-		elseif (isset($this->sortClosure)) {
+		} elseif (isset($this->sortClosure)) {
 			uasort($data, $this->sortClosure);
-		}
-		elseif (isset($this->sortProperty)) {
+		} elseif (isset($this->sortProperty)) {
 			uasort($data, [$this, 'sortByPropertyCallback']);
 		}
 	}
@@ -274,14 +270,12 @@ 
 		$property2 = null;
 		if (is_object($value1) && isset($value1->$property)) {
 			$property1 = $value1->$property;
-		}
-		elseif (is_array($value1) && isset($value1[$property])) {
+		} elseif (is_array($value1) && isset($value1[$property])) {
 			$property1 = $value1[$property];
 		}
 		if (is_object($value2) && isset($value2->$property)) {
 			$property2 = $value2->$property;
-		}
-		elseif (is_array($value2) && isset($value2[$property])) {
+		} elseif (is_array($value2) && isset($value2[$property])) {
 			$property2 = $value2[$property];
 		}
 

src/TournamentGenerator/Export/Hierarchy/SetupExporter.php

Braces +3 added lines, -6 removed lines

@@ -112,8 +112,7 @@ 
 			$data['categories'] = [
 				$this->object->getId() => $this->getCategoryData($this->object),
 			];
-		}
-		elseif ($this->object instanceof WithCategories) {
+		} elseif ($this->object instanceof WithCategories) {
 			$data['categories'] = [];
 			foreach ($this->object->getCategories() as $category) {
 				$data['categories'][$category->getId()] = $this->getCategoryData($category);
@@ -153,8 +152,7 @@ 
 			$data['rounds'] = [
 				$this->object->getId() => $this->getRoundData($this->object),
 			];
-		}
-		elseif ($this->object instanceof WithRounds) {
+		} elseif ($this->object instanceof WithRounds) {
 			$data['rounds'] = [];
 			foreach ($this->object->getRounds() as $round) {
 				$data['rounds'][$round->getId()] = $this->getRoundData($round);
@@ -197,8 +195,7 @@ 
 			foreach ($this->object->getProgressions() as $progression) {
 				$data['progressions'][] = $this->getProgressionData($progression);
 			}
-		}
-		elseif ($this->object instanceof WithGroups) {
+		} elseif ($this->object instanceof WithGroups) {
 			foreach ($this->object->getGroups() as $group) {
 				$data['groups'][$group->getId()] = $this->getGroupData($group);
 				foreach ($group->getProgressions() as $progression) {

src/TournamentGenerator/Import/ImportValidator.php

Spacing +1 added lines, -1 removed lines

@@ -564,7 +564,7 @@
 	 * @return bool
 	 */
 	public static function isObject($data) : bool {
-		return is_object($data) || (is_array($data) && !empty($data) && array_keys($data) !== range(0, count($data) - 1));
+		return is_object($data) || (is_array($data) && !empty($data) && array_keys($data) !== range(0, count($data)-1));
 	}
 
 	/**

Braces +1 added lines, -2 removed lines

@@ -490,8 +490,7 @@
 					foreach (((array) $data) as $key => $value) {
 						self::validateParams($value, array_merge($keys, [$key]), $setting['parameters'][$key]);
 					}
-				}
-				else {
+				} else {
 					foreach (((array) $data) as $object) {
 						foreach (((array) $object) as $key => $value) {
 							self::validateParams($value, array_merge($keys, [$key]), $setting['parameters'][$key]);

src/TournamentGenerator/Export/ExporterBase.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	 *
 	 */
 	public function getJson() : string {
-		return json_encode($this->get(), JSON_THROW_ON_ERROR | JSON_UNESCAPED_SLASHES);
+		return json_encode($this->get(), JSON_THROW_ON_ERROR|JSON_UNESCAPED_SLASHES);
 	}
 
 	/**

src/TournamentGenerator/Import/Importer.php

Braces +1 added lines, -2 removed lines

@@ -118,8 +118,7 @@
 			// Check tournament type (can be a preset)
 			if (empty($setting['type']) || $setting['type'] === 'general') {
 				$tournament = new Tournament();
-			}
-			else {
+			} else {
 				$tournament = new $setting['type'];
 			}
 			self::$root = $tournament; // If set - Tournament is always root