Daimona / BotRiconferme

includes/Message.php

Spacing +10 added lines, -10 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -26,7 +26,7 @@ 
 	/**
 	 * @param string $key
 	 */
-	public function __construct( string $key ) {
+	public function __construct ( string $key ) {
 		$this->value = Config::getInstance()->getWikiMessage( $key );
 	}
 
@@ -34,7 +34,7 @@ 
 	 * @param array $args
 	 * @return self
 	 */
-	public function params( array $args ) : self {
+	public function params ( array $args ) : self {
 		$this->value = strtr( $this->value, $args );
 		return $this;
 	}
@@ -42,7 +42,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function text() : string {
+	public function text () : string {
 		$this->parsePlurals();
 		return $this->value;
 	}
@@ -50,7 +50,7 @@ 
 	/**
 	 * Replace {{$plur|<amount>|sing|plur}}
 	 */
-	protected function parsePlurals() {
+	protected function parsePlurals () {
 		$reg = '!\{\{\$plur\|(?P<amount>\d+)\|(?P<sing>[^}|]+)\|(?P<plur>[^|}]+)}}!';
 
 		if ( preg_match( $reg, $this->value ) === 0 ) {
@@ -59,7 +59,7 @@ 
 		$this->value = preg_replace_callback(
 			$reg,
 			function ( $matches ) {
-				return intval( $matches['amount'] ) > 1 ? trim( $matches['plur'] ) : trim( $matches['sing'] );
+				return intval( $matches[ 'amount' ] ) > 1 ? trim( $matches[ 'plur' ] ) : trim( $matches[ 'sing' ] );
 			},
 			$this->value
 		);
@@ -71,7 +71,7 @@ 
 	 * @param string $timeString Full format, e.g. "15 aprile 2019 18:27"
 	 * @return int
 	 */
-	public static function getTimestampFromLocalTime( string $timeString ) : int {
+	public static function getTimestampFromLocalTime ( string $timeString ) : int {
 		$englishTime = str_ireplace(
 			array_values( self::MONTHS ),
 			array_keys( self::MONTHS ),
@@ -89,12 +89,12 @@ 
 	 * @param string $emptyText
 	 * @return string
 	 */
-	public static function commaList( array $data, string $emptyText = 'nessuno' ) : string {
+	public static function commaList ( array $data, string $emptyText = 'nessuno' ) : string {
 		if ( count( $data ) > 1 ) {
 			$last = array_pop( $data );
 			$ret = implode( ', ', $data ) . " e $last";
 		} elseif ( $data ) {
-			$ret = (string)$data[0];
+			$ret = (string)$data[ 0 ];
 		} else {
 			$ret = $emptyText;
 		}
@@ -102,7 +102,7 @@ 
 		return $ret;
 	}
 
-	public function __toString() {
+	public function __toString () {
 		return $this->text();
 	}
 }

includes/Task/Subtask/ArchivePages.php

Spacing +14 added lines, -14 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task\Subtask;
 
@@ -13,7 +13,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function runInternal() : int {
+	public function runInternal () : int {
 		$pages = $this->getDataProvider()->getPagesToClose();
 
 		if ( !$pages ) {
@@ -32,18 +32,18 @@ 
 	 * @param PageRiconferma[] $pages
 	 * @see OpenUpdates::addToMainPage()
 	 */
-	protected function removeFromMainPage( array $pages ) {
+	protected function removeFromMainPage ( array $pages ) {
 		$this->getLogger()->info(
 			'Removing from main: ' . implode( ', ', $pages )
 		);
 
 		$mainPage = $this->getPage( $this->getOpt( 'main-page-title' ) );
-		$remove = [];
+		$remove = [ ];
 		foreach ( $pages as $page ) {
 			// Order matters here. It's not guaranteed that there'll be a newline, but avoid
 			// regexps for that single character.
-			$remove[] = '{{' . $page->getTitle() . "}}\n";
-			$remove[] = '{{' . $page->getTitle() . '}}';
+			$remove[ ] = '{{' . $page->getTitle() . "}}\n";
+			$remove[ ] = '{{' . $page->getTitle() . '}}';
 		}
 
 		$newContent = str_replace( $remove, '', $mainPage->getContent() );
@@ -72,17 +72,17 @@ 
 	 *
 	 * @param PageRiconferma[] $pages
 	 */
-	protected function addToArchive( array $pages ) {
+	protected function addToArchive ( array $pages ) {
 		$this->getLogger()->info(
 			'Adding to archive: ' . implode( ', ', $pages )
 		);
 
-		$simple = $votes = [];
+		$simple = $votes = [ ];
 		foreach ( $pages as $page ) {
 			if ( $page->isVote() ) {
-				$votes[] = $page;
+				$votes[ ] = $page;
 			} else {
-				$simple[] = $page;
+				$simple[ ] = $page;
 			}
 		}
 
@@ -103,15 +103,15 @@ 
 	 * @param string $archiveTitle
 	 * @param PageRiconferma[] $pages
 	 */
-	private function reallyAddToArchive( string $archiveTitle, array $pages ) {
+	private function reallyAddToArchive ( string $archiveTitle, array $pages ) {
 		$archivePage = $this->getPage( "$archiveTitle/" . date( 'Y' ) );
 		$existed = $archivePage->exists();
 
 		$append = "\n";
-		$archivedList = [];
+		$archivedList = [ ];
 		foreach ( $pages as $page ) {
 			$append .= '{{' . $page->getTitle() . "}}\n";
-			$archivedList[] = $page->getUserNum();
+			$archivedList[ ] = $page->getUserNum();
 		}
 
 		$summary = $this->msg( 'close-archive-summary' )
@@ -132,7 +132,7 @@ 
 	 *
 	 * @param string $archiveTitle
 	 */
-	private function addArchiveYear( string $archiveTitle ) {
+	private function addArchiveYear ( string $archiveTitle ) {
 		$page = $this->getPage( $archiveTitle );
 		$year = date( 'Y' );
 

includes/Task/Subtask/SimpleUpdates.php

Spacing +23 added lines, -23 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task\Subtask;
 
@@ -16,7 +16,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function runInternal() : int {
+	public function runInternal () : int {
 		$pages = $this->getDataProvider()->getPagesToClose();
 
 		if ( !$pages ) {
@@ -38,15 +38,15 @@ 
 	 * @param PageRiconferma[] $pages
 	 * @see OpenUpdates::addToVotazioni()
 	 */
-	protected function updateVotazioni( array $pages ) {
+	protected function updateVotazioni ( array $pages ) {
 		$this->getLogger()->info(
 			'Updating votazioni: ' . implode( ', ', $pages )
 		);
 		$votePage = $this->getPage( $this->getOpt( 'vote-page-title' ) );
 
-		$users = [];
+		$users = [ ];
 		foreach ( $pages as $page ) {
-			$users[] = $page->getUser();
+			$users[ ] = $page->getUser();
 		}
 		$usersReg = Element::regexFromArray( $users );
 
@@ -67,7 +67,7 @@ 
 	 * @param array $pages
 	 * @see OpenUpdates::addToNews()
 	 */
-	protected function updateNews( array $pages ) {
+	protected function updateNews ( array $pages ) {
 		$simpleAmount = $voteAmount = 0;
 		foreach ( $pages as $page ) {
 			if ( $page->isVote() ) {
@@ -87,8 +87,8 @@ 
 		$simpleMatches = $newsPage->getMatch( $simpleReg );
 		$voteMatches = $newsPage->getMatch( $voteReg );
 
-		$newSimp = (int)$simpleMatches[2] - $simpleAmount ?: '';
-		$newVote = (int)$voteMatches[2] - $voteAmount ?: '';
+		$newSimp = (int)$simpleMatches[ 2 ] - $simpleAmount ?: '';
+		$newVote = (int)$voteMatches[ 2 ] - $voteAmount ?: '';
 		$newContent = preg_replace( $simpleReg, '${1}' . $newSimp, $newsPage->getContent() );
 		$newContent = preg_replace( $voteReg, '${1}' . $newVote, $newContent );
 
@@ -106,12 +106,12 @@ 
 	 *
 	 * @param bool[] $outcomes
 	 */
-	protected function updateAdminList( array $outcomes ) {
+	protected function updateAdminList ( array $outcomes ) {
 		$this->getLogger()->info( 'Updating admin list' );
 		$adminsPage = $this->getPage( $this->getOpt( 'admins-list-title' ) );
 		$newContent = $adminsPage->getContent();
 
-		$riconfNames = $removeNames = [];
+		$riconfNames = $removeNames = [ ];
 		foreach ( $outcomes as $username => $confirmed ) {
 			$user = $this->getUser( $username );
 			$userReg = $user->getRegex();
@@ -123,10 +123,10 @@ 
 					'${1}{{subst:#timel:Ymd}}|' . $nextDate . '$2',
 					$newContent
 				);
-				$riconfNames[] = $username;
+				$riconfNames[ ] = $username;
 			} else {
 				$newContent = preg_replace( $reg, '', $newContent );
-				$removeNames[] = $username;
+				$removeNames[ ] = $username;
 			}
 		}
 
@@ -149,12 +149,12 @@ 
 	 * @param User $user
 	 * @return int
 	 */
-	private function getNextTs( User $user ) : int {
+	private function getNextTs ( User $user ) : int {
 		$userInfo = $user->getUserInfo();
-		if ( isset( $userInfo['override-perm'] ) ) {
+		if ( isset( $userInfo[ 'override-perm' ] ) ) {
 			$date = \DateTime::createFromFormat(
 				'd/m/Y',
-				$userInfo['override-perm'] . '/' . date( 'Y' )
+				$userInfo[ 'override-perm' ] . '/' . date( 'Y' )
 			);
 			if ( $date < new \DateTime ) {
 				$date->modify( '+1 year' );
@@ -163,8 +163,8 @@ 
 		} else {
 			$ts = PageBotList::getValidFlagTimestamp( $userInfo );
 			$res = strtotime( date( 'Y', strtotime( '+1 year' ) ) . date( '-m-d', $ts ) );
-			if ( isset( $userInfo['override'] ) ) {
-				$date = \DateTime::createFromFormat( 'd/m/Y', $userInfo['override'] );
+			if ( isset( $userInfo[ 'override' ] ) ) {
+				$date = \DateTime::createFromFormat( 'd/m/Y', $userInfo[ 'override' ] );
 				if ( $date > new \DateTime ) {
 					$res = $date->getTimestamp();
 				}
@@ -176,21 +176,21 @@ 
 	/**
 	 * @param bool[] $outcomes
 	 */
-	protected function updateCUList( array $outcomes ) {
+	protected function updateCUList ( array $outcomes ) {
 		$this->getLogger()->info( 'Updating CU list.' );
 		$cuList = $this->getPage( $this->getOpt( 'cu-list-title' ) );
 		$newContent = $cuList->getContent();
 
-		$riconfNames = $removeNames = [];
+		$riconfNames = $removeNames = [ ];
 		foreach ( $outcomes as $user => $confirmed ) {
 			$userReg = $this->getUser( $user )->getRegex();
 			$reg = "!(\{\{ *Checkuser *\| *$userReg *\|[^}]+\| *)[\w \d]+(}}.*\n)!";
 			if ( $confirmed ) {
 				$newContent = preg_replace( $reg, '${1}{{subst:#time:j F Y}}$2', $newContent );
-				$riconfNames[] = $user;
+				$riconfNames[ ] = $user;
 			} else {
 				$newContent = preg_replace( $reg, '', $newContent );
-				$removeNames[] = $user;
+				$removeNames[ ] = $user;
 			}
 		}
 
@@ -214,8 +214,8 @@ 
 	 * @param PageRiconferma[] $pages
 	 * @return bool[]
 	 */
-	private function getGroupOutcomes( string $group, array $pages ) : array {
-		$ret = [];
+	private function getGroupOutcomes ( string $group, array $pages ) : array {
+		$ret = [ ];
 		foreach ( $pages as $page ) {
 			$user = $page->getUser();
 			if ( $user->inGroup( $group ) ) {

includes/TaskDataProvider.php

Spacing +15 added lines, -15 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -14,7 +14,7 @@ 
 	/** @var User[]|null */
 	private $processUsers;
 	/** @var PageRiconferma[] */
-	private $createdPages = [];
+	private $createdPages = [ ];
 	/** @var PageRiconferma[]|null */
 	private $openPages;
 	/** @var PageRiconferma[]|null */
@@ -25,9 +25,9 @@ 
 	 *
 	 * @return User[]
 	 */
-	public function getUsersToProcess() : array {
+	public function getUsersToProcess () : array {
 		if ( $this->processUsers === null ) {
-			$this->processUsers = [];
+			$this->processUsers = [ ];
 			foreach ( PageBotList::get( $this->getWiki() )->getAdminsList() as $name => $user ) {
 				if ( $this->shouldAddUser( $user ) ) {
 					$this->processUsers[ $name ] = $user;
@@ -44,7 +44,7 @@ 
 	 * @param User $user
 	 * @return bool
 	 */
-	private function shouldAddUser( User $user ) : bool {
+	private function shouldAddUser ( User $user ) : bool {
 		$timestamp = PageBotList::getOverrideTimestamp( $user->getUserInfo() );
 		$override = $timestamp !== null;
 
@@ -62,9 +62,9 @@ 
 	 *
 	 * @return PageRiconferma[]
 	 */
-	public function getOpenPages() : array {
+	public function getOpenPages () : array {
 		if ( $this->openPages === null ) {
-			$this->openPages = [];
+			$this->openPages = [ ];
 			$mainTitle = $this->getOpt( 'main-page-title' );
 			$params = [
 				'action' => 'query',
@@ -78,7 +78,7 @@ 
 			$pages = RequestBase::newFromParams( $params )->execute()->query->pages;
 			foreach ( reset( $pages )->templates as $page ) {
 				if ( preg_match( "!$titleReg/[^/]+/\d!", $page->title ) ) {
-					$this->openPages[] = new PageRiconferma( $page->title, $this->getWiki() );
+					$this->openPages[ ] = new PageRiconferma( $page->title, $this->getWiki() );
 				}
 			}
 		}
@@ -91,12 +91,12 @@ 
 	 *
 	 * @return PageRiconferma[]
 	 */
-	public function getPagesToClose() : array {
+	public function getPagesToClose () : array {
 		if ( $this->pagesToClose === null ) {
-			$this->pagesToClose = [];
+			$this->pagesToClose = [ ];
 			foreach ( $this->getOpenPages() as $page ) {
 				if ( time() > $page->getEndTimestamp() ) {
-					$this->pagesToClose[] = $page;
+					$this->pagesToClose[ ] = $page;
 				}
 			}
 		}
@@ -108,21 +108,21 @@ 
 	 *
 	 * @param string $name
 	 */
-	public function removeUser( string $name ) {
+	public function removeUser ( string $name ) {
 		unset( $this->processUsers[ $name ] );
 	}
 
 	/**
 	 * @return PageRiconferma[]
 	 */
-	public function getCreatedPages() : array {
+	public function getCreatedPages () : array {
 		return $this->createdPages;
 	}
 
 	/**
 	 * @param PageRiconferma $page
 	 */
-	public function addCreatedPage( PageRiconferma $page ) {
-		$this->createdPages[] = $page;
+	public function addCreatedPage ( PageRiconferma $page ) {
+		$this->createdPages[ ] = $page;
 	}
 }

includes/Task/UpdateList.php

Spacing +30 added lines, -30 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task;
 
@@ -19,15 +19,15 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	protected function getSubtasksMap(): array {
+	protected function getSubtasksMap (): array {
 		// Everything is done here.
-		return [];
+		return [ ];
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	public function runInternal() : int {
+	public function runInternal () : int {
 		$this->actualList = $this->getActualAdmins();
 		$pageBotList = PageBotList::get( $this->getWiki() );
 		$this->botList = $pageBotList->getDecodedContent();
@@ -54,7 +54,7 @@ 
 	/**
 	 * @return array
 	 */
-	protected function getActualAdmins() : array {
+	protected function getActualAdmins () : array {
 		$params = [
 			'action' => 'query',
 			'list' => 'allusers',
@@ -71,8 +71,8 @@ 
 	 * @param \stdClass $data
 	 * @return array
 	 */
-	protected function extractAdmins( \stdClass $data ) : array {
-		$ret = [];
+	protected function extractAdmins ( \stdClass $data ) : array {
+		$ret = [ ];
 		$blacklist = $this->getOpt( 'exclude-admins' );
 		foreach ( $data->query->allusers as $u ) {
 			if ( in_array( $u->name, $blacklist ) ) {
@@ -89,16 +89,16 @@ 
 	 *
 	 * @return array[]
 	 */
-	protected function getMissingGroups() : array {
-		$missing = [];
+	protected function getMissingGroups () : array {
+		$missing = [ ];
 		foreach ( $this->actualList as $adm => $groups ) {
-			$curMissing = array_diff( $groups, array_keys( $this->botList[$adm] ?? [] ) );
+			$curMissing = array_diff( $groups, array_keys( $this->botList[ $adm ] ?? [ ] ) );
 
 			foreach ( $curMissing as $group ) {
 				try {
 					$missing[ $adm ][ $group ] = $this->getFlagDate( $adm, $group );
 				} catch ( TaskException $e ) {
-					$this->errors[] = $e->getMessage();
+					$this->errors[ ] = $e->getMessage();
 				}
 			}
 		}
@@ -113,7 +113,7 @@ 
 	 * @return string
 	 * @throws TaskException
 	 */
-	protected function getFlagDate( string $admin, string $group ) : string {
+	protected function getFlagDate ( string $admin, string $group ) : string {
 		$this->getLogger()->info( "Retrieving $group flag date for $admin" );
 
 		$url = DEFAULT_URL;
@@ -149,7 +149,7 @@ 
 	 * @param string $group
 	 * @return string|null
 	 */
-	private function extractTimestamp( \stdClass $data, string $group ) : ?string {
+	private function extractTimestamp ( \stdClass $data, string $group ) : ?string {
 		$ts = null;
 		foreach ( $data->query->logevents as $entry ) {
 			if (
@@ -168,8 +168,8 @@ 
 	 *
 	 * @return array[]
 	 */
-	protected function getExtraGroups() : array {
-		$extra = [];
+	protected function getExtraGroups () : array {
+		$extra = [ ];
 		foreach ( $this->botList as $name => $groups ) {
 			$groups = array_diff_key( $groups, array_fill_keys( PageBotList::NON_GROUP_KEYS, 1 ) );
 			if ( !isset( $this->actualList[ $name ] ) ) {
@@ -185,7 +185,7 @@ 
 	 * @param string[] $names
 	 * @return \stdClass
 	 */
-	private function getRenameEntries( array $names ) : \stdClass {
+	private function getRenameEntries ( array $names ) : \stdClass {
 		$titles = array_map( function ( $x ) {
 			return "Utente:$x";
 		}, $names );
@@ -209,14 +209,14 @@ 
 	 * @param string[] $names
 	 * @return string[] [ old_name => new_name ]
 	 */
-	protected function getRenamedUsers( array $names ) : array {
+	protected function getRenamedUsers ( array $names ) : array {
 		if ( !$names ) {
-			return [];
+			return [ ];
 		}
 		$this->getLogger()->info( 'Checking rename for ' . implode( ', ', $names ) );
 
 		$data = $this->getRenameEntries( $names );
-		$ret = [];
+		$ret = [ ];
 		foreach ( $data->query->logevents as $entry ) {
 			// 1 month is arbitrary
 			if ( strtotime( $entry->timestamp ) > strtotime( '-1 month' ) ) {
@@ -234,18 +234,18 @@ 
 	 * @param array &$newContent
 	 * @param array $removed
 	 */
-	private function handleRenames( array &$newContent, array $removed ) : void {
+	private function handleRenames ( array &$newContent, array $removed ) : void {
 		$renameMap = $this->getRenamedUsers( array_keys( $removed ) );
 		foreach ( $removed as $oldName => $info ) {
 			if (
 				array_key_exists( $oldName, $renameMap ) &&
-				array_key_exists( $renameMap[$oldName], $newContent )
+				array_key_exists( $renameMap[ $oldName ], $newContent )
 			) {
 				// This user was renamed! Add this name as alias, if they're still listed
 				$newName = $renameMap[ $oldName ];
 				$this->getLogger()->info( "Found rename $oldName -> $newName" );
-				$aliases = array_unique( array_merge( $newContent[ $newName ]['aliases'], [ $oldName ] ) );
-				$newContent[ $newName ]['aliases'] = $aliases;
+				$aliases = array_unique( array_merge( $newContent[ $newName ][ 'aliases' ], [ $oldName ] ) );
+				$newContent[ $newName ][ 'aliases' ] = $aliases;
 				// Transfer overrides to the new name.
 				$overrides = array_diff_key( $info, [ 'override' => 1, 'override-perm' => 1 ] );
 				$newContent[ $newName ] = array_merge( $newContent[ $newName ], $overrides );
@@ -259,12 +259,12 @@ 
 	 * @param array[] $extra
 	 * @return string[] Removed users
 	 */
-	private function handleExtraAndMissing(
+	private function handleExtraAndMissing (
 		array &$newContent,
 		array $missing,
 		array $extra
 	) : array {
-		$removed = [];
+		$removed = [ ];
 		foreach ( $newContent as $user => $groups ) {
 			if ( isset( $missing[ $user ] ) ) {
 				$newContent[ $user ] = array_merge( $groups, $missing[ $user ] );
@@ -274,7 +274,7 @@ 
 				if ( array_diff_key( $newGroups, array_fill_keys( PageBotList::NON_GROUP_KEYS, 1 ) ) ) {
 					$newContent[ $user ] = $newGroups;
 				} else {
-					$removed[$user] = $newContent[$user];
+					$removed[ $user ] = $newContent[ $user ];
 					unset( $newContent[ $user ] );
 				}
 			}
@@ -291,7 +291,7 @@ 
 	 * @param array[] $extra
 	 * @return array[]
 	 */
-	protected function getNewContent( array $missing, array $extra ) : array {
+	protected function getNewContent ( array $missing, array $extra ) : array {
 		$newContent = $this->botList;
 
 		$removed = $this->handleExtraAndMissing( $newContent, $missing, $extra );
@@ -311,12 +311,12 @@ 
 	 *
 	 * @param array[] &$newContent
 	 */
-	protected function removeOverrides( array &$newContent ) : void {
-		$removed = [];
+	protected function removeOverrides ( array &$newContent ) : void {
+		$removed = [ ];
 		foreach ( $newContent as $user => $groups ) {
 			if ( PageBotList::isOverrideExpired( $groups ) ) {
 				unset( $newContent[ $user ][ 'override' ] );
-				$removed[] = $user;
+				$removed[ ] = $user;
 			}
 		}
 

includes/CLI.php

Spacing +12 added lines, -12 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -57,14 +57,14 @@ 
 	/**
 	 * @return bool
 	 */
-	public static function isCLI() : bool {
+	public static function isCLI () : bool {
 		return PHP_SAPI === 'cli';
 	}
 
 	/**
 	 * Populate options and check for required ones
 	 */
-	public function __construct() {
+	public function __construct () {
 		$opts = getopt( self::SHORT_OPTS, self::LONG_OPTS );
 		$this->checkRequired( $opts );
 		$this->canonicalize( $opts );
@@ -74,7 +74,7 @@ 
 	/**
 	 * @param array $opts
 	 */
-	private function checkRequired( array $opts ) : void {
+	private function checkRequired ( array $opts ) : void {
 		$missingOpts = array_diff( self::REQUIRED_OPTS, array_keys( $opts ) );
 		$hasPw = array_key_exists( 'password', $opts );
 		$hasPwFile = array_key_exists( 'use-password-file', $opts );
@@ -95,11 +95,11 @@ 
 	/**
 	 * @param array &$opts
 	 */
-	private function canonicalize( array &$opts ) : void {
+	private function canonicalize ( array &$opts ) : void {
 		if ( array_key_exists( 'use-password-file', $opts ) ) {
 			$pw = trim( file_get_contents( self::PASSWORD_FILE ) );
-			$opts['password'] = $pw;
-			unset( $opts['use-password-file'] );
+			$opts[ 'password' ] = $pw;
+			unset( $opts[ 'use-password-file' ] );
 		}
 	}
 
@@ -107,7 +107,7 @@ 
 	 * These are the options required by Config.
 	 * @return array
 	 */
-	public function getMainOpts() : array {
+	public function getMainOpts () : array {
 		return array_intersect_key(
 			$this->opts,
 			array_fill_keys( Config::REQUIRED_OPTS, true )
@@ -119,14 +119,14 @@ 
 	 * @param mixed|null $default
 	 * @return mixed
 	 */
-	public function getOpt( string $opt, $default = null ) {
-		return $this->opts[$opt] ?? $default;
+	public function getOpt ( string $opt, $default = null ) {
+		return $this->opts[ $opt ] ?? $default;
 	}
 
 	/**
 	 * @return array Either [ 'task' => taskname ] or [ 'subtask' => subtaskname ]
 	 */
-	public function getTaskOpt() : array {
+	public function getTaskOpt () : array {
 		return array_intersect_key(
 			$this->opts,
 			[ 'task' => true, 'subtask' => true ]
@@ -136,7 +136,7 @@ 
 	/**
 	 * @return string|null
 	 */
-	public function getURL() : ?string {
+	public function getURL () : ?string {
 		return $this->getOpt( 'force-url' );
 	}
 }