Skip to content

Commit

Permalink
Apply Scrutinizer formatting suggestions
Browse files Browse the repository at this point in the history 
No functionality changes.

For array construction, prefer structured indentation over hanging
alignment.
  • Loading branch information
@hemberger
hemberger committed Mar 1, 2021
1 parent 6e12dc2 commit 56fef3a
Show file tree
Hide file tree
Showing 16 changed files with 66 additions and 39 deletions.
2 changes: 1 addition & 1 deletion src/admin/Default/ip_view_results.php
View file
Expand Up @@ -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()) {
Expand Down
6 changes: 4 additions & 2 deletions src/admin/Default/manage_draft_leaders.php
View file
Expand Up @@ -9,8 +9,10 @@
$activeGames = array();
$db->query('SELECT game_id, game_name FROM game WHERE game_type=' . $db->escapeNumber(SmrGame::GAME_TYPE_DRAFT) . ' AND join_time < ' . $db->escapeNumber(SmrSession::getTime()) . ' AND end_time > ' . $db->escapeNumber(SmrSession::getTime()) . ' ORDER BY start_time DESC');
while ($db->nextRecord()) {
$activeGames[] = array('game_name' => $db->getField('game_name'),
'game_id' => $db->getInt('game_id'));
$activeGames[] = [
'game_name' => $db->getField('game_name'),
'game_id' => $db->getInt('game_id'),
];
}
$template->assign('ActiveGames', $activeGames);

Expand Down
6 changes: 4 additions & 2 deletions src/admin/Default/manage_post_editors.php
View file
Expand Up @@ -9,8 +9,10 @@
$activeGames = array();
$db->query('SELECT game_id, game_name FROM game WHERE join_time < ' . $db->escapeNumber(SmrSession::getTime()) . ' AND end_time > ' . $db->escapeNumber(SmrSession::getTime()) . ' ORDER BY start_time DESC');
while ($db->nextRecord()) {
$activeGames[] = array('game_name' => $db->getField('game_name'),
'game_id' => $db->getInt('game_id'));
$activeGames[] = [
'game_name' => $db->getField('game_name'),
'game_id' => $db->getInt('game_id'),
];
}
$template->assign('ActiveGames', $activeGames);

Expand Down
2 changes: 1 addition & 1 deletion src/admin/Default/notify_view.php
View file
Expand Up @@ -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();
Expand Down
6 changes: 4 additions & 2 deletions src/engine/Default/announcements.php
View file
Expand Up @@ -15,8 +15,10 @@

$announcements = [];
while ($db->nextRecord()) {
$announcements[] = ['Time' => $db->getInt('time'),
'Msg' => htmlentities($db->getField('msg'))];
$announcements[] = [
'Time' => $db->getInt('time'),
'Msg' => htmlentities($db->getField('msg')),
];
}
$template->assign('Announcements', $announcements);

Expand Down
14 changes: 9 additions & 5 deletions src/engine/Default/galactic_post_past.php
View file
Expand Up @@ -15,8 +15,10 @@
$db->query('SELECT game_name, game_id FROM game WHERE game_id IN (SELECT DISTINCT game_id FROM galactic_post_paper WHERE online_since IS NOT NULL) OR game_id=' . $db->escapeNumber($player->getGameID()) . ' ORDER BY game_id DESC');
$publishedGames = array();
while ($db->nextRecord()) {
$publishedGames[] = array('game_name' => $db->getField('game_name'),
'game_id' => $db->getInt('game_id'));
$publishedGames[] = [
'game_name' => $db->getField('game_name'),
'game_id' => $db->getInt('game_id'),
];
}
$template->assign('PublishedGames', $publishedGames);

Expand All @@ -29,8 +31,10 @@
$container['game_id'] = $selectedGameID;
$container['back'] = true;

$pastEditions[] = array('title' => $db->getField('title'),
'online_since' => $db->getInt('online_since'),
'href' => SmrSession::getNewHREF($container));
$pastEditions[] = [
'title' => $db->getField('title'),
'online_since' => $db->getInt('online_since'),
'href' => SmrSession::getNewHREF($container),
];
}
$template->assign('PastEditions', $pastEditions);
2 changes: 1 addition & 1 deletion src/engine/Default/rankings_alliance_profit.php
View file
Expand Up @@ -28,7 +28,7 @@
$template->assign('OurRank', $ourRank);
}

$profitRanks = function (int $minRank, int $maxRank) use ($player, $db, $profitTypeEscaped) : array {
$profitRanks = function(int $minRank, int $maxRank) use ($player, $db, $profitTypeEscaped) : array {
$offset = $minRank - 1;
$limit = $maxRank - $offset;
$db->query('SELECT alliance_id, COALESCE(SUM(amount), 0) amount
Expand Down
2 changes: 1 addition & 1 deletion src/engine/Default/rankings_player_profit.php
View file
Expand Up @@ -24,7 +24,7 @@

$totalPlayers = $player->getGame()->getTotalPlayers();

$profitRanks = function (int $minRank, int $maxRank) use ($player, $db, $profitTypeEscaped) : array {
$profitRanks = function(int $minRank, int $maxRank) use ($player, $db, $profitTypeEscaped) : array {
$offset = $minRank - 1;
$limit = $maxRank - $offset;
$db->query('SELECT p.*, COALESCE(ph.amount,0) amount FROM player p LEFT JOIN player_hof ph ON p.account_id = ph.account_id AND p.game_id = ph.game_id AND ph.type = ' . $profitTypeEscaped . ' WHERE p.game_id = ' . $db->escapeNumber($player->getGameID()) . ' ORDER BY amount DESC, player_name ASC LIMIT ' . $offset . ', ' . $limit);
Expand Down
7 changes: 5 additions & 2 deletions src/engine/Default/trader_bounties.php
View file
Expand Up @@ -14,5 +14,8 @@
$template->assign('Bounty' . $type, $msg);
}

$template->assign('AllClaims', array($player->getClaimableBounties('HQ'),
$player->getClaimableBounties('UG')));
$allClaims = [
$player->getClaimableBounties('HQ'),
$player->getClaimableBounties('UG'),
];
$template->assign('AllClaims', $allClaims);
8 changes: 5 additions & 3 deletions src/engine/Draft/alliance_pick.php
View file
Expand Up @@ -29,9 +29,11 @@
while ($db->nextRecord()) {
$leader = SmrPlayer::getPlayer($db->getInt('leader_account_id'), $player->getGameID());
$pickedPlayer = SmrPlayer::getPlayer($db->getInt('picked_account_id'), $player->getGameID());
$history[] = array('Leader' => $leader,
'Player' => $pickedPlayer,
'Time' => $db->getInt('time'));
$history[] = [
'Leader' => $leader,
'Player' => $pickedPlayer,
'Time' => $db->getInt('time'),
];
}

$template->assign('History', $history);
24 changes: 16 additions & 8 deletions src/lib/Default/AbstractMenu.class.php
View file
Expand Up @@ -121,17 +121,25 @@ public static function history_games($selected_index) {
$container['HistoryDatabase'] = $var['HistoryDatabase'];
$container['view_game_id'] = $var['view_game_id'];
$container['game_name'] = $var['game_name'];
$menuItems[] = ['Link' => SmrSession::getNewHREF($container),
'Text' => 'Game Details'];
$menuItems[] = [
'Link' => SmrSession::getNewHREF($container),
'Text' => 'Game Details',
];
$container['body'] = 'history_games_detail.php';
$menuItems[] = ['Link' => SmrSession::getNewHREF($container),
'Text' => 'Extended Stats'];
$menuItems[] = [
'Link' => SmrSession::getNewHREF($container),
'Text' => 'Extended Stats',
];
$container['body'] = 'history_games_hof.php';
$menuItems[] = ['Link' => SmrSession::getNewHREF($container),
'Text' => 'Hall of Fame'];
$menuItems[] = [
'Link' => SmrSession::getNewHREF($container),
'Text' => 'Hall of Fame',
];
$container['body'] = 'history_games_news.php';
$menuItems[] = ['Link' => SmrSession::getNewHREF($container),
'Text' => 'Game News'];
$menuItems[] = [
'Link' => SmrSession::getNewHREF($container),
'Text' => 'Game News',
];
// make the selected index bold
$boldItem =& $menuItems[$selected_index]['Text'];
$boldItem = '<b>' . $boldItem . '</b>';
Expand Down
4 changes: 2 additions & 2 deletions src/lib/Default/AbstractSmrAccount.class.php
View file
Expand Up @@ -246,7 +246,7 @@ protected function __construct(int $accountID) {
/**
* Check if the account is disabled.
*/
public function isDisabled() : array | false {
public function isDisabled() : array|false {
$this->db->query('SELECT * FROM account_is_closed JOIN closing_reason USING(reason_id) ' .
'WHERE ' . $this->SQL . ' LIMIT 1');
if ($this->db->nextRecord()) {
Expand Down Expand Up @@ -1125,7 +1125,7 @@ public function removePoints(int $numPoints, ?int $lastUpdate = null) : void {
}
}

public function addPoints(int $numPoints, SmrAccount $admin, int $reasonID, string $suspicion) : int | false {
public function addPoints(int $numPoints, SmrAccount $admin, int $reasonID, string $suspicion) : int|false {
//do we have points
$this->setPoints($this->getPoints() + $numPoints, SmrSession::getTime());
$totalPoints = $this->getPoints();
Expand Down
4 changes: 2 additions & 2 deletions src/lib/Default/ChessPiece.class.php
View file
Expand Up @@ -234,7 +234,7 @@ public static function getSymbolForPiece($pieceID, $colour) {
}

public static function getLetterForPiece(int $pieceID, string $colour) : string {
$letter = match ($pieceID) {
$letter = match($pieceID) {
self::KING => 'k',
self::QUEEN => 'q',
self::ROOK => 'r',
Expand All @@ -249,7 +249,7 @@ public static function getLetterForPiece(int $pieceID, string $colour) : string
}

public static function getPieceForLetter(string $letter) : int {
return match (strtolower($letter)) {
return match(strtolower($letter)) {
'k' => self::KING,
'q' => self::QUEEN,
'r' => self::ROOK,
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Default/Rankings.class.php
View file
Expand Up @@ -98,7 +98,7 @@ public static function allianceRanks(string $stat, int $minRank = 1, int $maxRan
global $player, $db;
$offset = $minRank - 1;
$limit = $maxRank - $offset;
$db->query('SELECT alliance_id, alliance_' . $stat . ' AS amount FROM alliance WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' ORDER BY amount DESC, alliance_name LIMIT ' . $offset. ', ' . $limit);
$db->query('SELECT alliance_id, alliance_' . $stat . ' AS amount FROM alliance WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' ORDER BY amount DESC, alliance_name LIMIT ' . $offset . ', ' . $limit);
return self::collectAllianceRankings($db, $player, $offset);
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib/Default/SmrGalaxy.class.php
View file
Expand Up @@ -340,7 +340,7 @@ public function getConnectivity() : float {
/**
* 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();
}
Expand Down
14 changes: 9 additions & 5 deletions src/lib/Draft/alliance_pick.inc.php
View file
Expand Up @@ -14,12 +14,16 @@ function get_draft_teams($gameId) {
if (!$leader->hasAlliance() || $alliance->getAllianceID() == NHA_ID) {
// Special case for leaders who haven't made their own alliance yet,
// or are still in the Newbie Help Alliance.
$teams[$leader->getAccountId()] = array('Leader' => $leader,
'Size' => 0);
$teams[$leader->getAccountId()] = [
'Leader' => $leader,
'Size' => 0,
];
} else {
$teams[$leader->getAccountId()] = array('Leader' => $leader,
'Alliance' => $alliance,
'Size' => $alliance->getNumMembers());
$teams[$leader->getAccountId()] = [
'Leader' => $leader,
'Alliance' => $alliance,
'Size' => $alliance->getNumMembers(),
];
}
}

Expand Down

0 comments on commit 56fef3a

Please sign in to comment.