smrealms / smr

src/lib/Default/AbstractSmrPort.php

Spacing +1 added lines, -1 removed lines

@@ -279,7 +279,7 @@
 		if (!isset($this->goodDistances[$goodID])) {
 			$x = Globals::getGood($goodID);
 			// Calculate distance to the opposite of the offered transaction
-			$x['TransactionType'] = match ($this->getGoodTransaction($goodID)) {
+			$x['TransactionType'] = match($this->getGoodTransaction($goodID)) {
 				TRADER_BUYS => TRADER_SELLS,
 				TRADER_SELLS => TRADER_BUYS,
 			};

src/lib/Default/AbstractSmrPlayer.php

Indentation +3 added lines, -3 removed lines

@@ -870,9 +870,9 @@
 	 */
 	public function canFight(): bool {
 		return !($this->hasNewbieTurns() ||
-		         $this->isDead() ||
-		         $this->isLandedOnPlanet() ||
-		         $this->hasFederalProtection());
+				 $this->isDead() ||
+				 $this->isLandedOnPlanet() ||
+				 $this->hasFederalProtection());
 	}
 
 	public function setDead(bool $bool): void {

Spacing +13 added lines, -13 removed lines

@@ -610,7 +610,7 @@ 
 	}
 
 	public function getScoutMessageGroupLimit(): int {
-		return match ($this->groupScoutMessages) {
+		return match($this->groupScoutMessages) {
 			'ALWAYS' => 0,
 			'AUTO' => MESSAGES_PER_PAGE,
 			'NEVER' => PHP_INT_MAX,
@@ -727,7 +727,7 @@ 
 
 		// If expires not specified, use default based on message type
 		if ($expires === null) {
-			$expires = match ($messageTypeID) {
+			$expires = match($messageTypeID) {
 				MSG_GLOBAL => 3600, // 1h
 				MSG_PLAYER => 86400 * 31, // 1 month
 				MSG_PLANET => 86400 * 7, // 1 week
@@ -1677,7 +1677,7 @@ 
 			throw new Smr\Exceptions\UserError('The saved sector must be in the box!');
 		}
 
-		$storedDestinations =& $this->getStoredDestinations();
+		$storedDestinations = & $this->getStoredDestinations();
 		foreach ($storedDestinations as &$sd) {
 			if ($sd['SectorID'] == $sectorID) {
 				$sd['OffsetTop'] = $offsetTop;
@@ -1841,7 +1841,7 @@ 
 	public function getClaimableBounties(string $type = null): array {
 		$bounties = [];
 		$query = 'SELECT * FROM bounty WHERE claimer_id=' . $this->db->escapeNumber($this->getAccountID()) . ' AND game_id=' . $this->db->escapeNumber($this->getGameID());
-		$query .= match ($type) {
+		$query .= match($type) {
 			'HQ', 'UG' => ' AND type=' . $this->db->escapeString($type),
 			null => '',
 		};
@@ -2008,13 +2008,13 @@ 
 			$dbResult = $this->db->read('SELECT type,amount FROM player_hof WHERE ' . $this->SQL);
 			$this->HOF = [];
 			foreach ($dbResult->records() as $dbRecord) {
-				$hof =& $this->HOF;
+				$hof = & $this->HOF;
 				$typeList = explode(':', $dbRecord->getString('type'));
 				foreach ($typeList as $type) {
 					if (!isset($hof[$type])) {
 						$hof[$type] = [];
 					}
-					$hof =& $hof[$type];
+					$hof = & $hof[$type];
 				}
 				$hof = $dbRecord->getFloat('amount');
 			}
@@ -2093,8 +2093,8 @@ 
 		}
 		self::$HOFVis[$hofType] = $visibility;
 
-		$hof =& $this->HOF;
-		$hofChanged =& $this->hasHOFChanged;
+		$hof = & $this->HOF;
+		$hofChanged = & $this->hasHOFChanged;
 		$new = false;
 		foreach ($typeList as $type) {
 			if (!isset($hofChanged[$type])) {
@@ -2104,8 +2104,8 @@ 
 				$hof[$type] = [];
 				$new = true;
 			}
-			$hof =& $hof[$type];
-			$hofChanged =& $hofChanged[$type];
+			$hof = & $hof[$type];
+			$hofChanged = & $hofChanged[$type];
 		}
 		if ($hofChanged == null) {
 			$hofChanged = self::HOF_CHANGED;
@@ -2496,7 +2496,7 @@ 
 	 * Returns the CSS class color to use when displaying the player's turns
 	 */
 	public function getTurnsColor(): string {
-		return match ($this->getTurnsLevel()) {
+		return match($this->getTurnsLevel()) {
 			'NONE', 'LOW' => 'red',
 			'MEDIUM' => 'yellow',
 			'HIGH' => 'green',
@@ -2771,7 +2771,7 @@ 
 			'Starting Sector' => $this->getSectorID(),
 		];
 
-		$this->missions[$missionID] =& $mission;
+		$this->missions[$missionID] = & $mission;
 		$this->setupMissionStep($missionID);
 		$this->rebuildMission($missionID);
 
@@ -2820,7 +2820,7 @@ 
 
 	public function claimMissionReward(int $missionID): string {
 		$this->getMissions();
-		$mission =& $this->missions[$missionID];
+		$mission = & $this->missions[$missionID];
 		if ($mission === false) {
 			throw new Exception('Unknown mission: ' . $missionID);
 		}

src/lib/Default/AbstractSmrAccount.php

Spacing +2 added lines, -2 removed lines

@@ -393,13 +393,13 @@
 			$dbResult = $this->db->read('SELECT type,sum(amount) as amount FROM player_hof WHERE ' . $this->SQL . ' AND game_id IN (SELECT game_id FROM game WHERE ignore_stats = \'FALSE\') GROUP BY type');
 			$this->HOF = [];
 			foreach ($dbResult->records() as $dbRecord) {
-				$hof =& $this->HOF;
+				$hof = & $this->HOF;
 				$typeList = explode(':', $dbRecord->getString('type'));
 				foreach ($typeList as $type) {
 					if (!isset($hof[$type])) {
 						$hof[$type] = [];
 					}
-					$hof =& $hof[$type];
+					$hof = & $hof[$type];
 				}
 				$hof = $dbRecord->getFloat('amount');
 			}

src/lib/Smr/Database.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
 	 * Not intended to be used outside the DI context.
 	 */
 	public static function mysqliFactory(DatabaseProperties $dbProperties): mysqli {
-		if (!mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT)) {
+		if (!mysqli_report(MYSQLI_REPORT_ERROR|MYSQLI_REPORT_STRICT)) {
 			throw new RuntimeException('Failed to enable mysqli error reporting');
 		}
 		$mysql = new mysqli(
@@ -168,7 +168,7 @@ 
 	}
 
 	public function escape(mixed $escape): mixed {
-		return match (true) {
+		return match(true) {
 			is_bool($escape) => $this->escapeBoolean($escape),
 			is_numeric($escape) => $this->escapeNumber($escape),
 			is_string($escape) => $this->escapeString($escape),

src/lib/Smr/Messages.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 			if (!empty($accountID)) {
 				$return = SmrPlayer::getPlayer($accountID, $gameID);
 			} else {
-				$return = match ($messageType) {
+				$return = match($messageType) {
 					MSG_ADMIN => '<span class="admin">Administrator</span>',
 					MSG_ALLIANCE => '<span class="green">Alliance Ambassador</span>',
 					default => 'Unknown',

src/lib/Smr/Blackjack/Card.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
 	 * Return the card's blackjack value.
 	 */
 	public function getValue(): int {
-		return match ($this->rank) {
+		return match($this->rank) {
 			self::RANK_ACE => 11,
 			self::RANK_JACK, self::RANK_QUEEN, self::RANK_KING => 10,
 			// For normal pip (non-face) cards, value and rank are the same.
@@ -57,7 +57,7 @@ 
 	 * Returns the rank name of this card (of the 13 ranks).
 	 */
 	public function getRankName(): string {
-		return match ($this->rank) {
+		return match($this->rank) {
 			self::RANK_ACE => 'A',
 			self::RANK_JACK => 'J',
 			self::RANK_QUEEN => 'Q',

src/lib/Smr/HallOfFame.php

Indentation +3 added lines, -3 removed lines

@@ -67,9 +67,9 @@
 		$session = Session::getInstance();
 		$account = $session->getAccount();
 		if (($vis == HOF_PRIVATE && $account->getAccountID() != $accountID) ||
-		    ($vis == HOF_ALLIANCE && isset($gameID) &&
-		     !SmrGame::getGame($gameID)->hasEnded() &&
-		     !SmrPlayer::getPlayer($accountID, $gameID)->sameAlliance($session->getPlayer()))) {
+			($vis == HOF_ALLIANCE && isset($gameID) &&
+			 !SmrGame::getGame($gameID)->hasEnded() &&
+			 !SmrPlayer::getPlayer($accountID, $gameID)->sameAlliance($session->getPlayer()))) {
 			return '-';
 		} else {
 			return $amount;

src/lib/Smr/Chess/ChessPiece.php

Spacing +2 added lines, -2 removed lines

@@ -208,7 +208,7 @@ 
 	}
 
 	public static function getLetterForPiece(int $pieceID, string $colour): string {
-		$letter = match ($pieceID) {
+		$letter = match($pieceID) {
 			self::KING => 'k',
 			self::QUEEN => 'q',
 			self::ROOK => 'r',
@@ -223,7 +223,7 @@ 
 	}
 
 	public static function getPieceForLetter(string $letter): int {
-		return match (strtolower($letter)) {
+		return match(strtolower($letter)) {
 			'k' => self::KING,
 			'q' => self::QUEEN,
 			'r' => self::ROOK,

src/lib/Smr/Chess/ChessGame.php

Spacing +6 added lines, -6 removed lines

@@ -266,7 +266,7 @@ 
 				$blanks = 0;
 			}
 		}
-		$fen .= match ($this->getCurrentTurnColour()) {
+		$fen .= match($this->getCurrentTurnColour()) {
 			self::PLAYER_WHITE => ' w ',
 			self::PLAYER_BLACK => ' b ',
 		};
@@ -296,7 +296,7 @@ 
 
 		if ($this->hasMoved[ChessPiece::PAWN][0] != -1) {
 			$fen .= chr(ord('a') + $this->hasMoved[ChessPiece::PAWN][0]);
-			$fen .= match ($this->hasMoved[ChessPiece::PAWN][1]) {
+			$fen .= match($this->hasMoved[ChessPiece::PAWN][1]) {
 				3 => '6',
 				4 => '3',
 			};
@@ -464,7 +464,7 @@ 
 
 	public static function isCastling(int $x, int $toX): array|false {
 		$movement = $toX - $x;
-		return match ($movement) {
+		return match($movement) {
 			-2 => ['Type' => 'Queen', 'X' => 0, 'ToX' => 3],
 			2 => ['Type' => 'King', 'X' => 7, 'ToX' => 5],
 			default => false,
@@ -772,7 +772,7 @@ 
 	}
 
 	public function getColourID(string $colour): int {
-		return match ($colour) {
+		return match($colour) {
 			self::PLAYER_WHITE => $this->getWhiteID(),
 			self::PLAYER_BLACK => $this->getBlackID(),
 		};
@@ -783,7 +783,7 @@ 
 	}
 
 	public function getColourForAccountID(int $accountID): string {
-		return match ($accountID) {
+		return match($accountID) {
 			$this->getWhiteID() => self::PLAYER_WHITE,
 			$this->getBlackID() => self::PLAYER_BLACK,
 		};
@@ -860,7 +860,7 @@ 
 	}
 
 	public static function getOtherColour(string $colour): string {
-		return match ($colour) {
+		return match($colour) {
 			self::PLAYER_WHITE => self::PLAYER_BLACK,
 			self::PLAYER_BLACK => self::PLAYER_WHITE,
 		};