smrealms / smr

lib/Default/DummyPlayer.class.php

Spacing +20 added lines, -20 removed lines

@@ -1,30 +1,30 @@ 
 <?php declare(strict_types=1);
 
 class DummyPlayer extends AbstractSmrPlayer {
-	public function __construct($gameID=0,$playerName='Dummy',$raceID=1,$experience=1000,$alignment=100,$allianceID=0,$shipTypeID=60) {
+	public function __construct($gameID = 0, $playerName = 'Dummy', $raceID = 1, $experience = 1000, $alignment = 100, $allianceID = 0, $shipTypeID = 60) {
 		$this->accountID				= 0;
-		$this->gameID					= (int) $gameID;
-		$this->playerName				= (string) $playerName;
+		$this->gameID = (int)$gameID;
+		$this->playerName = (string)$playerName;
 		$this->playerID					= 0;
 		$this->sectorID					= 0;
-		$this->lastSectorID				= 0;
+		$this->lastSectorID = 0;
 		$this->turns					= 1000;
-		$this->newbieTurns				= 0;
+		$this->newbieTurns = 0;
 		$this->lastNewsUpdate			= 0;
 		$this->dead						= false;
 		$this->landedOnPlanet			= false;
-		$this->lastActive				= 0;
-		$this->lastCPLAction			= 0;
-		$this->raceID					= (int) $raceID;
-		$this->credits					= 0;
-		$this->experience				= (int) $experience;
-		$this->alignment				= (int) $alignment;
-		$this->militaryPayment			= 0;
-		$this->allianceID				= (int) $allianceID;
-		$this->shipID					= (int) $shipTypeID;
+		$this->lastActive = 0;
+		$this->lastCPLAction = 0;
+		$this->raceID = (int)$raceID;
+		$this->credits = 0;
+		$this->experience				= (int)$experience;
+		$this->alignment = (int)$alignment;
+		$this->militaryPayment = 0;
+		$this->allianceID				= (int)$allianceID;
+		$this->shipID					= (int)$shipTypeID;
 		$this->kills					= 0;
 		$this->deaths					= 0;
-		$this->lastPort					= 0;
+		$this->lastPort = 0;
 		$this->bank						= 0;
 		$this->zoom						= 0;
 
@@ -48,9 +48,9 @@ 
 	}
 
 	public function setAllianceID($ID) {
-		if($this->allianceID == $ID)
+		if ($this->allianceID == $ID)
 			return;
-		$this->allianceID=$ID;
+		$this->allianceID = $ID;
 	}
 
 	public function &killPlayerByPlayer(AbstractSmrPlayer $killer) {
@@ -76,7 +76,7 @@ 
 		$db = MySqlDatabase::getInstance();
 		$db->query('REPLACE INTO cached_dummys ' .
 					'(type, id, info) ' .
-					'VALUES (\'DummyPlayer\', '.$db->escapeString($this->getPlayerName()).', '.$db->escapeString($cache).')');
+					'VALUES (\'DummyPlayer\', ' . $db->escapeString($this->getPlayerName()) . ', ' . $db->escapeString($cache) . ')');
 		 unserialize($cache);
 	}
 
@@ -85,7 +85,7 @@ 
 		$db->query('SELECT info FROM cached_dummys
 					WHERE type = \'DummyPlayer\'
 						AND id = ' . $db->escapeString($name) . ' LIMIT 1');
-		if($db->nextRecord()) {
+		if ($db->nextRecord()) {
 			$return = unserialize($db->getField('info'));
 			return $return;
 		}
@@ -100,7 +100,7 @@ 
 		$db->query('SELECT id FROM cached_dummys
 					WHERE type = \'DummyPlayer\'');
 		$dummyNames = array();
-		while($db->nextRecord()) {
+		while ($db->nextRecord()) {
 			$dummyNames[] = $db->getField('id');
 		}
 		return $dummyNames;

lib/Default/AbstractSmrPlayer.class.php

Spacing +11 added lines, -11 removed lines

@@ -268,7 +268,7 @@ 
 	/**
 	 * Insert a new player into the database. Returns the new player object.
 	 */
-	public static function createPlayer($accountID, $gameID, $playerName, $raceID, $isNewbie, $npc=false) {
+	public static function createPlayer($accountID, $gameID, $playerName, $raceID, $isNewbie, $npc = false) {
 		$db = MySqlDatabase::getInstance();
 		$db->lockTable('player');
 
@@ -1703,7 +1703,7 @@ 
 			create_error('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;
@@ -2030,13 +2030,13 @@ 
 			$this->db->query('SELECT type,amount FROM player_hof WHERE ' . $this->SQL);
 			$this->HOF = array();
 			while ($this->db->nextRecord()) {
-				$hof =& $this->HOF;
+				$hof = & $this->HOF;
 				$typeList = explode(':', $this->db->getField('type'));
 				foreach ($typeList as $type) {
 					if (!isset($hof[$type])) {
 						$hof[$type] = array();
 					}
-					$hof =& $hof[$type];
+					$hof = & $hof[$type];
 				}
 				$hof = $this->db->getFloat('amount');
 			}
@@ -2115,8 +2115,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])) {
@@ -2126,8 +2126,8 @@ 
 				$hof[$type] = array();
 				$new = true;
 			}
-			$hof =& $hof[$type];
-			$hofChanged =& $hofChanged[$type];
+			$hof = & $hof[$type];
+			$hofChanged = & $hofChanged[$type];
 		}
 		if ($hofChanged == null) {
 			$hofChanged = self::HOF_CHANGED;
@@ -2730,7 +2730,7 @@ 
 	}
 
 	private function setupMissionStep($missionID) {
-		$mission =& $this->missions[$missionID];
+		$mission = & $this->missions[$missionID];
 		if ($mission['On Step'] >= count(MISSIONS[$missionID]['Steps'])) {
 			// Nothing to do if this mission is already completed
 			return;
@@ -2779,7 +2779,7 @@ 
 			'Starting Sector' => $this->getSectorID()
 		);
 
-		$this->missions[$missionID] =& $mission;
+		$this->missions[$missionID] = & $mission;
 		$this->setupMissionStep($missionID);
 		$this->rebuildMission($missionID);
 
@@ -2829,7 +2829,7 @@ 
 
 	public function claimMissionReward($missionID) {
 		$this->getMissions();
-		$mission =& $this->missions[$missionID];
+		$mission = & $this->missions[$missionID];
 		if ($mission === false) {
 			throw new Exception('Unknown mission: ' . $missionID);
 		}

lib/Default/DummyShip.class.php

Spacing +9 added lines, -9 removed lines

@@ -17,7 +17,7 @@ 
 		$this->cargo_left = $this->getCargoHolds();
 	}
 	protected function doFullUNO() {
-		foreach($this->getMaxHardware() as $hardwareTypeID => $max) {
+		foreach ($this->getMaxHardware() as $hardwareTypeID => $max) {
 			$this->hardware[$hardwareTypeID] = $max;
 			$this->oldHardware[$hardwareTypeID] = $max;
 		}
@@ -47,8 +47,8 @@ 
 	}
 
 	public function getIllusionShip() {
-		if(!isset($this->illusionShip)) {
-			$this->illusionShip=false;
+		if (!isset($this->illusionShip)) {
+			$this->illusionShip = false;
 		}
 		return $this->illusionShip;
 	}
@@ -58,20 +58,20 @@ 
 		$db = MySqlDatabase::getInstance();
 		$db->query('REPLACE INTO cached_dummys ' .
 					'(type, id, info) ' .
-					'VALUES (\'DummyShip\', '.$db->escapeString($this->getPlayer()->getPlayerName()).', '.$db->escapeString($cache).')');
+					'VALUES (\'DummyShip\', ' . $db->escapeString($this->getPlayer()->getPlayerName()) . ', ' . $db->escapeString($cache) . ')');
 		unserialize($cache);
 	}
 
 	public static function getCachedDummyShip(AbstractSmrPlayer $player) {
-		if(!isset(self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()])) {
+		if (!isset(self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()])) {
 			$db = MySqlDatabase::getInstance();
 			$db->query('SELECT info FROM cached_dummys
 						WHERE type = \'DummyShip\'
 						AND id = ' . $db->escapeString($player->getPlayerName()) . ' LIMIT 1');
-			if($db->nextRecord()) {
+			if ($db->nextRecord()) {
 				$return = unserialize($db->getField('info'));
 				$return->regenerate($player);
-				self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] =& $return;
+				self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] = & $return;
 			} else {
 				self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] = new DummyShip($player);
 			}
@@ -84,7 +84,7 @@ 
 		$db->query('SELECT id FROM cached_dummys
 					WHERE type = \'DummyShip\'');
 		$dummyNames = array();
-		while($db->nextRecord()) {
+		while ($db->nextRecord()) {
 			$dummyNames[] = $db->getField('id');
 		}
 		return $dummyNames;
@@ -93,7 +93,7 @@ 
 
 
 	public function __sleep() {
-		return array('gameID','weapons');
+		return array('gameID', 'weapons');
 	}
 
 	public function __wakeup() {

engine/Default/help.inc

Spacing +25 added lines, -25 removed lines

@@ -7,7 +7,7 @@ 
 	$db3 = MySqlDatabase::getNewInstance();
 
 	// get current entry
-	$db->query('SELECT * FROM manual WHERE topic_id = '.$db->escapeNumber($topic_id));
+	$db->query('SELECT * FROM manual WHERE topic_id = ' . $db->escapeNumber($topic_id));
 	if ($db->nextRecord()) {
 		$parent_topic_id = $db->getInt('parent_topic_id');
 		$order_id = $db->getInt('order_id');
@@ -19,17 +19,17 @@ 
 		// **************************
 		// **  PREVIOUS
 		// **************************
-		$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id - 1));
+		$db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($order_id - 1));
 
 		// no result?
 		if (!$db2->getNumRows())
-			$db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
+			$db2->query('SELECT * FROM manual WHERE topic_id = ' . $db2->escapeNumber($parent_topic_id));
 
 		echo ('<th width="32">');
 		if ($db2->nextRecord()) {
 			$previous_topic_id = $db2->getInt('topic_id');
 			$previous_topic = stripslashes($db2->getField('topic'));
-			echo ('<a href="/manual.php?'.$previous_topic_id.'"><img src="/images/help/previous.jpg" width="32" height="32" border="0"></a>');
+			echo ('<a href="/manual.php?' . $previous_topic_id . '"><img src="/images/help/previous.jpg" width="32" height="32" border="0"></a>');
 		} else
 			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
 		echo ('</th>');
@@ -37,12 +37,12 @@ 
 		// **************************
 		// **  UP
 		// **************************
-		$db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
+		$db2->query('SELECT * FROM manual WHERE topic_id = ' . $db2->escapeNumber($parent_topic_id));
 		echo ('<th width="32">');
 		if ($db2->nextRecord()) {
 			$up_topic_id = $db2->getInt('topic_id');
 			$up_topic = stripslashes($db2->getField('topic'));
-			echo ('<a href="/manual.php?'.$up_topic_id.'"><img src="/images/help/up.jpg" width="32" height="32" border="0"></a>');
+			echo ('<a href="/manual.php?' . $up_topic_id . '"><img src="/images/help/up.jpg" width="32" height="32" border="0"></a>');
 		} else
 			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
 		echo ('</th>');
@@ -50,35 +50,35 @@ 
 		// **************************
 		// **  NEXT
 		// **************************
-		$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($topic_id).' AND order_id = 1');
+		$db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($topic_id) . ' AND order_id = 1');
 
 		if (!$db2->getNumRows())
-			$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id + 1));
+			$db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($order_id + 1));
 
 		$seenParentIDs = array(0);
 		$curr_parent_topic_id = $parent_topic_id;
 		while (!$db2->getNumRows() && !in_array($curr_parent_topic_id, $seenParentIDs)) {
 			$seenParentIDs[] = $curr_parent_topic_id;
-			$db3->query('SELECT * FROM manual WHERE topic_id = '.$db3->escapeNumber($parent_topic_id));
+			$db3->query('SELECT * FROM manual WHERE topic_id = ' . $db3->escapeNumber($parent_topic_id));
 			$db3->nextRecord();
 			$curr_order_id = $db3->getInt('order_id');
 			$curr_parent_topic_id = $db3->getInt('parent_topic_id');
 
-			$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($curr_order_id + 1));
+			$db2->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db2->escapeNumber($parent_topic_id) . ' AND order_id = ' . $db2->escapeNumber($curr_order_id + 1));
 		}
 
 		echo ('<th width="32">');
 		if ($db2->nextRecord()) {
 			$next_topic_id = $db2->getInt('topic_id');
 			$next_topic = stripslashes($db2->getField('topic'));
-			echo ('<a href="/manual.php?'.$next_topic_id.'"><img src="/images/help/next.jpg" width="32" height="32" border="0"></a>');
+			echo ('<a href="/manual.php?' . $next_topic_id . '"><img src="/images/help/next.jpg" width="32" height="32" border="0"></a>');
 		}
 		else {
 			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
 		}
 		echo ('</th>');
 
-		echo ('<th width="100%" class="center" validn="middle" style="font-size:18pt;font-weight:bold;">' . get_numbering($topic_id) . $topic.'</th>');
+		echo ('<th width="100%" class="center" validn="middle" style="font-size:18pt;font-weight:bold;">' . get_numbering($topic_id) . $topic . '</th>');
 		echo ('<th width="32"><a href="/manual_toc.php"><img src="/images/help/contents.jpg" width="32" height="32" border="0"></a></th>');
 
 		echo ('</tr>');
@@ -86,11 +86,11 @@ 
 		echo ('<tr>');
 		echo ('<td colspan="5">');
 		if (isset($previous_topic_id) && $previous_topic_id > 0)
-			echo ('<b>Previous:</b> <a href="/manual.php?'.$previous_topic_id.'">' . get_numbering($previous_topic_id) . $previous_topic.'</a>&nbsp;&nbsp;&nbsp;');
+			echo ('<b>Previous:</b> <a href="/manual.php?' . $previous_topic_id . '">' . get_numbering($previous_topic_id) . $previous_topic . '</a>&nbsp;&nbsp;&nbsp;');
 		if (isset($up_topic_id) && $up_topic_id > 0)
-			echo ('<b>Up:</b> <a href="/manual.php?'.$up_topic_id.'">' . get_numbering($up_topic_id) . $up_topic.'</a>&nbsp;&nbsp;&nbsp;');
+			echo ('<b>Up:</b> <a href="/manual.php?' . $up_topic_id . '">' . get_numbering($up_topic_id) . $up_topic . '</a>&nbsp;&nbsp;&nbsp;');
 		if (isset($next_topic_id) && $next_topic_id > 0)
-			echo ('<b>Next:</b> <a href="/manual.php?'.$next_topic_id.'">' . get_numbering($next_topic_id) . $next_topic.'</a>');
+			echo ('<b>Next:</b> <a href="/manual.php?' . $next_topic_id . '">' . get_numbering($next_topic_id) . $next_topic . '</a>');
 		echo ('</tr>');
 
 		echo ('</table>');
@@ -103,7 +103,7 @@ 
 	$db = MySqlDatabase::getInstance();
 
 	// get current entry
-	$db->query('SELECT * FROM manual WHERE topic_id = '.$topic_id);
+	$db->query('SELECT * FROM manual WHERE topic_id = ' . $topic_id);
 	if ($db->nextRecord()) {
 		$parent_topic_id = $db->getInt('parent_topic_id');
 		$order_id = $db->getInt('order_id');
@@ -111,8 +111,8 @@ 
 		$text = stripslashes($db->getField('text'));
 
 		echo ('<div id="help_content">');
-		echo ('<h1>' . get_numbering($topic_id) . $topic.'</h1>');
-		echo ('<p>'.$text.'<p>');
+		echo ('<h1>' . get_numbering($topic_id) . $topic . '</h1>');
+		echo ('<p>' . $text . '<p>');
 		echo ('</div>');
 	} else
 		echo ('Invalid Topic!');
@@ -121,9 +121,9 @@ 
 function echo_subsection($topic_id) {
 	// database object
 	$db = MySqlDatabase::getInstance();
-	$return='';
+	$return = '';
 	// check if there are subsections
-	$db->query('SELECT * FROM manual WHERE parent_topic_id = '.$db->escapeNumber($topic_id).' ORDER BY order_id');
+	$db->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db->escapeNumber($topic_id) . ' ORDER BY order_id');
 	if ($db->getNumRows()) {
 		echo ('<hr noshade width="75%" size="1" class="center"/>');
 		echo ('<div id="help_menu">');
@@ -137,19 +137,19 @@ 
 }
 
 function echo_menu($topic_id) {
-	$return='';
+	$return = '';
 	// database object
 	$db = MySqlDatabase::getInstance();
 
-	$db->query('SELECT * FROM manual WHERE parent_topic_id = '.$db->escapeNumber($topic_id).' ORDER BY order_id');
+	$db->query('SELECT * FROM manual WHERE parent_topic_id = ' . $db->escapeNumber($topic_id) . ' ORDER BY order_id');
 	if ($db->getNumRows()) {
 		echo ('<ul type="disc">');
-		while($db->nextRecord()) {
+		while ($db->nextRecord()) {
 			$sub_topic_id = $db->getInt('topic_id');
 			$order_id = $db->getInt('order_id');
 			$sub_topic = stripslashes($db->getField('topic'));
 
-			echo ('<li><a href="/manual.php?'.$sub_topic_id.'">' . get_numbering($sub_topic_id) . $sub_topic.'</a></li>');
+			echo ('<li><a href="/manual.php?' . $sub_topic_id . '">' . get_numbering($sub_topic_id) . $sub_topic . '</a></li>');
 			echo_menu($sub_topic_id);
 		}
 		echo ('</ul>');
@@ -160,7 +160,7 @@ 
 function get_numbering($topic_id) {
 	$db = MySqlDatabase::getInstance();
 
-	$db->query('SELECT * FROM manual WHERE topic_id = '.$db->escapeNumber($topic_id));
+	$db->query('SELECT * FROM manual WHERE topic_id = ' . $db->escapeNumber($topic_id));
 	if ($db->nextRecord()) {
 		$up_topic_id = $db->getInt('parent_topic_id');
 		$order_id = $db->getInt('order_id');

lib/Default/MySqlDatabase.class.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	}
 
 	public static function mysqliFactory(MySqlProperties $mysqlProperties): 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');
 		}
 		return new mysqli(

lib/Smr/Container/DiContainer.php

Spacing +2 added lines, -2 removed lines

@@ -36,10 +36,10 @@
 			 * The factories themselves are able to use dependency injection as well, so we can provide the MySqlProperties
 			 * typehint to make sure the container constructs an instance and provides it to the factory.
 			 */
-			mysqli::class => function (MySqlProperties $mysqlProperties): mysqli {
+			mysqli::class => function(MySqlProperties $mysqlProperties): mysqli {
 				return MySqlDatabase::mysqliFactory($mysqlProperties);
 			},
-			Dotenv::class => function (): Dotenv {
+			Dotenv::class => function(): Dotenv {
 				return Dotenv::createArrayBacked(ROOT);
 			},
 			// Explicitly name all classes that are autowired, so we can take advantage of