smrealms / smr

src/lib/Default/Routes/RouteGenerator.class.php

Indentation +2 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
 				foreach (\Globals::getGoods() as $goodId => $value) {
 					if ($goods[$goodId] === true) {
 						if ($sectors[$currentSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_SELLS &&
-						    $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_BUYS) {
+							$sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_BUYS) {
 							$rl[] = new OneWayRoute($currentSectorId, $targetSectorId, $raceID, $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getGoodDistance($goodId), $sectors[$targetSectorId]->getPort()->getGoodDistance($goodId), $distance, $goodId);
 						}
 					}
@@ -118,7 +118,7 @@ 
 				foreach (\Globals::getGoods() as $goodId => $value) {
 					if ($goods[$goodId] === true) {
 						if ($sectors[$currentSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_SELLS &&
-						    $sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_BUYS) {
+							$sectors[$targetSectorId]->getPort()->getGoodTransaction($goodId) === TRADER_BUYS) {
 							$owr = new OneWayRoute($currentSectorId, $targetSectorId, $sectors[$currentSectorId]->getPort()->getRaceID(), $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getGoodDistance($goodId), $sectors[$targetSectorId]->getPort()->getGoodDistance($goodId), $distance, $goodId);
 							$fakeReturn = new OneWayRoute($targetSectorId, $currentSectorId, $sectors[$targetSectorId]->getPort()->getRaceID(), $sectors[$currentSectorId]->getPort()->getRaceID(), 0, 0, $distance, GOODS_NOTHING);
 							$mpr = new MultiplePortRoute($owr, $fakeReturn);

src/admin/Default/notify_view.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 	/**
 	 * @var $messagePlayer SmrPlayer | string
 	 */
-	$getName = function ($messagePlayer) use ($container, $account) : string {
+	$getName = function($messagePlayer) use ($container, $account) : string {
 		$name = $messagePlayer;
 		if ($messagePlayer instanceof SmrPlayer) {
 			$name = $messagePlayer->getAccount()->getLogin();

src/lib/Default/AbstractSmrPort.class.php

Spacing +2 added lines, -2 removed lines

@@ -1219,7 +1219,7 @@ 
 			do {
 				$targetPlayer = array_rand_value($targetPlayers);
 			} while ($results['TotalShotsPerTargetPlayer'][$targetPlayer->getAccountID()] > min($results['TotalShotsPerTargetPlayer']));
-			$results['Weapons'][$orderID] =& $weapon->shootPlayerAsPort($this, $targetPlayer);
+			$results['Weapons'][$orderID] = & $weapon->shootPlayerAsPort($this, $targetPlayer);
 			$results['TotalShotsPerTargetPlayer'][$targetPlayer->getAccountID()]++;
 			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
@@ -1228,7 +1228,7 @@ 
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs(), true);
-			$results['Drones'] =& $thisCDs->shootPlayerAsPort($this, array_rand_value($targetPlayers));
+			$results['Drones'] = & $thisCDs->shootPlayerAsPort($this, array_rand_value($targetPlayers));
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 			$results['TotalDamagePerTargetPlayer'][$results['Drones']['TargetPlayer']->getAccountID()] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}

src/lib/Default/SmrForce.class.php

Spacing +3 added lines, -3 removed lines

@@ -460,20 +460,20 @@
 
 		if ($this->hasMines()) {
 			$thisMines = new SmrMines($this->getGameID(), $this->getMines());
-			$results['Results']['Mines'] =& $thisMines->shootPlayerAsForce($this, array_rand_value($targetPlayers), $minesAreAttacker);
+			$results['Results']['Mines'] = & $thisMines->shootPlayerAsForce($this, array_rand_value($targetPlayers), $minesAreAttacker);
 			$results['TotalDamage'] += $results['Results']['Mines']['ActualDamage']['TotalDamage'];
 		}
 
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Results']['Drones'] =& $thisCDs->shootPlayerAsForce($this, array_rand_value($targetPlayers));
+			$results['Results']['Drones'] = & $thisCDs->shootPlayerAsForce($this, array_rand_value($targetPlayers));
 			$results['TotalDamage'] += $results['Results']['Drones']['ActualDamage']['TotalDamage'];
 		}
 
 		if (!$minesAreAttacker) {
 			if ($this->hasSDs()) {
 				$thisSDs = new SmrScoutDrones($this->getGameID(), $this->getSDs());
-				$results['Results']['Scouts'] =& $thisSDs->shootPlayerAsForce($this, array_rand_value($targetPlayers));
+				$results['Results']['Scouts'] = & $thisSDs->shootPlayerAsForce($this, array_rand_value($targetPlayers));
 				$results['TotalDamage'] += $results['Results']['Scouts']['ActualDamage']['TotalDamage'];
 			}
 		}

src/lib/Smr/SocialLogin/Twitter.php

Indentation +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 		}
 		$helper = self::getTwitterObj($_SESSION['TwitterToken']);
 		$accessToken = $helper->oauth('oauth/access_token',
-		                              ['oauth_verifier' => \Request::get('oauth_verifier')]);
+									  ['oauth_verifier' => \Request::get('oauth_verifier')]);
 		$auth = self::getTwitterObj($accessToken);
 		$userInfo = $auth->get('account/verify_credentials', ['include_email' => 'true']);
 		if ($auth->getLastHttpCode() == 200) {

src/lib/Default/SmrGalaxy.class.php

Spacing +1 added lines, -1 removed lines

@@ -340,7 +340,7 @@
 	/**
 	 * Check if the galaxy contains a specific sector.
 	 */
-	public function contains(int | SmrSector $sectorID) : bool {
+	public function contains(int|SmrSector $sectorID) : bool {
 		if ($sectorID instanceof SmrSector) {
 			return $sectorID->getGalaxyID() == $this->getGalaxyID();
 		}

src/admin/Default/ip_view_results.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 	}
 	$accountID = (int)$variable;
 	$template->assign('BanAccountID', $accountID);
-	$summary = 'Account ' . $accountID. ' has had the following IPs at the following times.';
+	$summary = 'Account ' . $accountID . ' has had the following IPs at the following times.';
 	$template->assign('Summary', $summary);
 	$db2->query('SELECT * FROM account_exceptions WHERE account_id = ' . $db->escapeNumber($variable));
 	if ($db2->nextRecord()) {

src/lib/Default/AbstractSmrCombatWeapon.class.php

Spacing +21 added lines, -21 removed lines

@@ -67,68 +67,68 @@
 	abstract public function &getModifiedPlanetDamageAgainstPlayer(SmrPlanet $planet, AbstractSmrPlayer $targetPlayer);
 
 	protected function &doPlayerDamageToForce(array &$return, AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstForces($weaponPlayer,$forces);
-		$return['ActualDamage'] =& $forces->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstForces($weaponPlayer, $forces);
+		$return['ActualDamage'] = & $forces->doWeaponDamage($return['WeaponDamage']);
 		if ($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $forces->killForcesByPlayer($weaponPlayer);
+			$return['KillResults'] = & $forces->killForcesByPlayer($weaponPlayer);
 		}
 		return $return;
 	}
 
 	protected function &doPlayerDamageToPlayer(array &$return, AbstractSmrPlayer $weaponPlayer, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPlayer($weaponPlayer,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstPlayer($weaponPlayer, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
 		if ($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $targetPlayer->killPlayerByPlayer($weaponPlayer);
+			$return['KillResults'] = & $targetPlayer->killPlayerByPlayer($weaponPlayer);
 		}
 		return $return;
 	}
 
 	protected function &doPlayerDamageToPort(array &$return, AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPort($weaponPlayer,$port);
-		$return['ActualDamage'] =& $port->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstPort($weaponPlayer, $port);
+		$return['ActualDamage'] = & $port->doWeaponDamage($return['WeaponDamage']);
 		if ($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $port->killPortByPlayer($weaponPlayer);
+			$return['KillResults'] = & $port->killPortByPlayer($weaponPlayer);
 		}
 		return $return;
 	}
 
 	protected function &doPlayerDamageToPlanet(array &$return, AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet, $delayed) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPlanet($weaponPlayer,$planet);
-		$return['ActualDamage'] =& $planet->doWeaponDamage($return['WeaponDamage'],$delayed);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstPlanet($weaponPlayer, $planet);
+		$return['ActualDamage'] = & $planet->doWeaponDamage($return['WeaponDamage'], $delayed);
 		if ($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $planet->killPlanetByPlayer($weaponPlayer);
+			$return['KillResults'] = & $planet->killPlanetByPlayer($weaponPlayer);
 		}
 		return $return;
 	}
 
 	protected function &doPortDamageToPlayer(array &$return, SmrPort $port, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedPortDamageAgainstPlayer($port,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedPortDamageAgainstPlayer($port, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
 		if ($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $targetPlayer->killPlayerByPort($port);
+			$return['KillResults'] = & $targetPlayer->killPlayerByPort($port);
 		}
 		return $return;
 	}
 
 	protected function &doPlanetDamageToPlayer(array &$return, SmrPlanet $planet, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedPlanetDamageAgainstPlayer($planet,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedPlanetDamageAgainstPlayer($planet, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
 		if ($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $targetPlayer->killPlayerByPlanet($planet);
+			$return['KillResults'] = & $targetPlayer->killPlayerByPlanet($planet);
 		}
 		return $return;
 	}
 
 	protected function &doForceDamageToPlayer(array &$return, SmrForce $forces, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
 		if ($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $targetPlayer->killPlayerByForces($forces);
+			$return['KillResults'] = & $targetPlayer->killPlayerByForces($forces);
 		}
 		return $return;
 	}

src/lib/Default/ChessPiece.class.php

Spacing +2 added lines, -2 removed lines

@@ -234,7 +234,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',
@@ -249,7 +249,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,