Daimona / BotRiconferme

includes/Wiki/LoginInfo.php

Spacing +4 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki;
 
@@ -15,7 +15,7 @@ 
 	 * @param string $username
 	 * @param string $password
 	 */
-	public function __construct( string $username, string $password ) {
+	public function __construct ( string $username, string $password ) {
 		$this->username = $username;
 		$this->password = $password;
 	}
@@ -23,14 +23,14 @@ 
 	/**
 	 * @return string
 	 */
-	public function getUsername() : string {
+	public function getUsername () : string {
 		return $this->username;
 	}
 
 	/**
 	 * @return string
 	 */
-	public function getPassword() : string {
+	public function getPassword () : string {
 		return $this->password;
 	}
 }

includes/Wiki/Wiki.php

Spacing +18 added lines, -18 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki;
 
@@ -32,7 +32,7 @@ 
 	 * @param LoggerInterface $logger
 	 * @param string $domain The URL of the wiki, if different from default
 	 */
-	public function __construct( LoggerInterface $logger, string $domain = DEFAULT_URL ) {
+	public function __construct ( LoggerInterface $logger, string $domain = DEFAULT_URL ) {
 		$this->logger = $logger;
 		$this->domain = $domain;
 	}
@@ -40,7 +40,7 @@ 
 	/**
 	 * @param LoginInfo $li
 	 */
-	public function setLoginInfo( LoginInfo $li ) : void {
+	public function setLoginInfo ( LoginInfo $li ) : void {
 		// FIXME This should be in the constructor, and it should not depend on config
 		$this->loginInfo = $li;
 	}
@@ -48,14 +48,14 @@ 
 	/**
 	 * @return LoginInfo
 	 */
-	public function getLoginInfo() : LoginInfo {
+	public function getLoginInfo () : LoginInfo {
 		return $this->loginInfo;
 	}
 
 	/**
 	 * @param bool $bot
 	 */
-	public function setEditsAsBot( bool $bot ) : void {
+	public function setEditsAsBot ( bool $bot ) : void {
 		// FIXME same as setLoginInfo
 		$this->botEdits = $bot;
 	}
@@ -63,7 +63,7 @@ 
 	/**
 	 * @return bool
 	 */
-	public function getEditsAsBot() : bool {
+	public function getEditsAsBot () : bool {
 		return $this->botEdits;
 	}
 
@@ -76,7 +76,7 @@ 
 	 * @throws MissingPageException
 	 * @throws MissingSectionException
 	 */
-	public function getPageContent( string $title, int $section = null ) : string {
+	public function getPageContent ( string $title, int $section = null ) : string {
 		$msg = "Retrieving content of $title" . ( $section !== null ? ", section $section" : '' );
 		$this->logger->debug( $msg );
 		$params = [
@@ -88,7 +88,7 @@ 
 		];
 
 		if ( $section !== null ) {
-			$params['rvsection'] = $section;
+			$params[ 'rvsection' ] = $section;
 		}
 
 		$req = $this->buildRequest( $params );
@@ -98,7 +98,7 @@ 
 			throw new MissingPageException( $title );
 		}
 
-		$mainSlot = $page->revisions[0]->slots->main;
+		$mainSlot = $page->revisions[ 0 ]->slots->main;
 
 		if ( $section !== null && isset( $mainSlot->nosuchsection ) ) {
 			throw new MissingSectionException( $title, $section );
@@ -112,7 +112,7 @@ 
 	 * @param array $params
 	 * @throws EditException
 	 */
-	public function editPage( array $params ) : void {
+	public function editPage ( array $params ) : void {
 		$this->login();
 
 		$params = [
@@ -121,7 +121,7 @@ 
 		] + $params;
 
 		if ( $this->getEditsAsBot() ) {
-			$params['bot'] = 1;
+			$params[ 'bot' ] = 1;
 		}
 
 		$res = $this->buildRequest( $params )->setPost()->execute();
@@ -139,7 +139,7 @@ 
 	 * Login wrapper. Checks if we're already logged in and clears tokens cache
 	 * @throws LoginException
 	 */
-	public function login() : void {
+	public function login () : void {
 		if ( $this->loginInfo === null ) {
 			throw new CannotLoginException( 'Missing login data' );
 		}
@@ -169,7 +169,7 @@ 
 
 		self::$loggedIn = true;
 		// Clear tokens cache
-		$this->tokens = [];
+		$this->tokens = [ ];
 		$this->logger->info( 'Login succeeded' );
 	}
 
@@ -179,7 +179,7 @@ 
 	 * @param string $type
 	 * @return string
 	 */
-	public function getToken( string $type ) : string {
+	public function getToken ( string $type ) : string {
 		if ( !isset( $this->tokens[ $type ] ) ) {
 			$params = [
 				'action' => 'query',
@@ -202,7 +202,7 @@ 
 	 * @param string $title
 	 * @return int
 	 */
-	public function getPageCreationTS( string $title ) : int {
+	public function getPageCreationTS ( string $title ) : int {
 		$params = [
 			'action' => 'query',
 			'prop' => 'revisions',
@@ -215,7 +215,7 @@ 
 
 		$res = $this->buildRequest( $params )->execute();
 		$data = $res->query->pages;
-		return strtotime( reset( $data )->revisions[0]->timestamp );
+		return strtotime( reset( $data )->revisions[ 0 ]->timestamp );
 	}
 
 	/**
@@ -224,7 +224,7 @@ 
 	 * @param string $title
 	 * @param string $reason
 	 */
-	public function protectPage( string $title, string $reason ) : void {
+	public function protectPage ( string $title, string $reason ) : void {
 		$this->logger->info( "Protecting page $title" );
 		$this->login();
 
@@ -245,7 +245,7 @@ 
 	 * @param array $params
 	 * @return RequestBase
 	 */
-	private function buildRequest( array $params ) : RequestBase {
+	private function buildRequest ( array $params ) : RequestBase {
 		return RequestBase::newFromParams( $params )->setUrl( $this->domain );
 	}
 }

includes/Logger/WikiLogger.php

Spacing +6 added lines, -6 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Logger;
 
@@ -29,7 +29,7 @@ 
 	 * @param string $summary
 	 * @param string $minlevel
 	 */
-	public function __construct( Page $logPage, string $summary, $minlevel = LogLevel::INFO ) {
+	public function __construct ( Page $logPage, string $summary, $minlevel = LogLevel::INFO ) {
 		$this->minLevel = $this->levelToInt( $minlevel );
 		$this->logPage = $logPage;
 		$this->summary = $summary;
@@ -39,16 +39,16 @@ 
 	 * @inheritDoc
 	 * @suppress PhanUnusedPublicMethodParameter
 	 */
-	public function log( $level, $message, array $context = [] ) :void {
+	public function log ( $level, $message, array $context = [ ] ) :void {
 		if ( $this->levelToInt( $level ) >= $this->minLevel ) {
-			$this->buffer[] = $this->getFormattedMessage( $level, $message );
+			$this->buffer[ ] = $this->getFormattedMessage( $level, $message );
 		}
 	}
 
 	/**
 	 * @return string
 	 */
-	protected function getOutput() : string {
+	protected function getOutput () : string {
 		$line = str_repeat( '-', 80 );
 		return "\n\n" . implode( "\n", $this->buffer ) . "\n$line\n\n";
 	}
@@ -56,7 +56,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function flush() : void {
+	public function flush () : void {
 		if ( $this->buffer ) {
 			$this->logPage->edit( [
 				'appendtext' => $this->getOutput(),

includes/ContextSource.php

Spacing +14 added lines, -14 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -29,7 +29,7 @@ 
 	 * @param Wiki $wiki
 	 * @param MessageProvider $mp
 	 */
-	public function __construct( LoggerInterface $logger, Wiki $wiki, MessageProvider $mp ) {
+	public function __construct ( LoggerInterface $logger, Wiki $wiki, MessageProvider $mp ) {
 		$this->setLogger( $logger );
 		$this->setConfig( Config::getInstance() );
 		$this->setWiki( $wiki );
@@ -39,14 +39,14 @@ 
 	/**
 	 * @return LoggerInterface
 	 */
-	protected function getLogger() : LoggerInterface {
+	protected function getLogger () : LoggerInterface {
 		return $this->logger;
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	public function setLogger( LoggerInterface $logger ) : void {
+	public function setLogger ( LoggerInterface $logger ) : void {
 		$this->logger = $logger;
 	}
 
@@ -56,49 +56,49 @@ 
 	 * @param string $optname
 	 * @return mixed
 	 */
-	protected function getOpt( string $optname ) {
+	protected function getOpt ( string $optname ) {
 		return $this->getConfig()->get( $optname );
 	}
 
 	/**
 	 * @return Config
 	 */
-	protected function getConfig() : Config {
+	protected function getConfig () : Config {
 		return $this->config;
 	}
 
 	/**
 	 * @param Config $cfg
 	 */
-	protected function setConfig( Config $cfg ) : void {
+	protected function setConfig ( Config $cfg ) : void {
 		$this->config = $cfg;
 	}
 
 	/**
 	 * @return Wiki
 	 */
-	protected function getWiki() : Wiki {
+	protected function getWiki () : Wiki {
 		return $this->wiki;
 	}
 
 	/**
 	 * @param Wiki $wiki
 	 */
-	protected function setWiki( Wiki $wiki ) : void {
+	protected function setWiki ( Wiki $wiki ) : void {
 		$this->wiki = $wiki;
 	}
 
 	/**
 	 * @return MessageProvider
 	 */
-	protected function getMessageProvider() : MessageProvider {
+	protected function getMessageProvider () : MessageProvider {
 		return $this->messageProvider;
 	}
 
 	/**
 	 * @param MessageProvider $mp
 	 */
-	protected function setMessageProvider( MessageProvider $mp ) : void {
+	protected function setMessageProvider ( MessageProvider $mp ) : void {
 		$this->messageProvider = $mp;
 	}
 
@@ -108,7 +108,7 @@ 
 	 * @param string $key
 	 * @return Message
 	 */
-	protected function msg( string $key ) : Message {
+	protected function msg ( string $key ) : Message {
 		return $this->messageProvider->getMessage( $key );
 	}
 
@@ -118,7 +118,7 @@ 
 	 * @param string $title
 	 * @return Page
 	 */
-	protected function getPage( string $title ) : Page {
+	protected function getPage ( string $title ) : Page {
 		return new Page( $title, $this->getWiki() );
 	}
 
@@ -128,7 +128,7 @@ 
 	 * @param string $name
 	 * @return User
 	 */
-	protected function getUser( string $name ) : User {
+	protected function getUser ( string $name ) : User {
 		return new User( $name, $this->getWiki() );
 	}
 }

includes/TaskManager.php

Spacing +8 added lines, -8 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -58,7 +58,7 @@ 
 	 * @param Wiki $wiki
 	 * @param MessageProvider $mp
 	 */
-	public function __construct( LoggerInterface $logger, Wiki $wiki, MessageProvider $mp ) {
+	public function __construct ( LoggerInterface $logger, Wiki $wiki, MessageProvider $mp ) {
 		$this->logger = $logger;
 		$this->wiki = $wiki;
 		$this->messageProvider = $mp;
@@ -72,7 +72,7 @@ 
 	 * @param string|null $name Only used in MODE_TASK and MODE_SUBTASK
 	 * @return TaskResult
 	 */
-	public function run( string $mode, string $name = null ) : TaskResult {
+	public function run ( string $mode, string $name = null ) : TaskResult {
 		if ( $mode === self::MODE_COMPLETE ) {
 			return $this->runAllTasks();
 		} elseif ( $name === null ) {
@@ -87,7 +87,7 @@ 
 	 *
 	 * @return TaskResult
 	 */
-	protected function runAllTasks() : TaskResult {
+	protected function runAllTasks () : TaskResult {
 		$orderedList = [
 			'update-list',
 			'start-new',
@@ -109,7 +109,7 @@ 
 	 * @param string $name
 	 * @return TaskResult
 	 */
-	protected function runTask( string $name ) : TaskResult {
+	protected function runTask ( string $name ) : TaskResult {
 		if ( !isset( self::TASKS_MAP[ $name ] ) ) {
 			throw new \InvalidArgumentException( "'$name' is not a valid task." );
 		}
@@ -123,7 +123,7 @@ 
 	 * @param string $name
 	 * @return TaskResult
 	 */
-	protected function runSubtask( string $name ) : TaskResult {
+	protected function runSubtask ( string $name ) : TaskResult {
 		if ( !isset( self::SUBTASKS_MAP[ $name ] ) ) {
 			throw new \InvalidArgumentException( "'$name' is not a valid subtask." );
 		}
@@ -138,7 +138,7 @@ 
 	 * @param string $name
 	 * @return Task
 	 */
-	private function getTaskInstance( string $name ) : Task {
+	private function getTaskInstance ( string $name ) : Task {
 		$class = self::TASKS_MAP[ $name ];
 		/** @var Task $ret */
 		$ret = new $class( $this->logger, $this->wiki, $this->provider, $this->messageProvider );
@@ -151,7 +151,7 @@ 
 	 * @param string $class
 	 * @return Subtask
 	 */
-	private function getSubtaskInstance( string $class ) : Subtask {
+	private function getSubtaskInstance ( string $class ) : Subtask {
 		/** @var Subtask $ret */
 		$ret = new $class( $this->logger, $this->wiki, $this->provider, $this->messageProvider );
 		return $ret;

includes/Bot.php

Spacing +7 added lines, -8 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -21,7 +21,7 @@ 
 	 * @param Wiki $wiki
 	 * @param MessageProvider $mp
 	 */
-	public function __construct( LoggerInterface $logger, Wiki $wiki, MessageProvider $mp ) {
+	public function __construct ( LoggerInterface $logger, Wiki $wiki, MessageProvider $mp ) {
 		$this->logger = $logger;
 		$this->wiki = $wiki;
 		$this->messageProvider = $mp;
@@ -33,7 +33,7 @@ 
 	 * @param string $mode
 	 * @param string|null $name
 	 */
-	private function run( string $mode = TaskManager::MODE_COMPLETE, string $name = null ) : void {
+	private function run ( string $mode = TaskManager::MODE_COMPLETE, string $name = null ) : void {
 		$activity = $mode === TaskManager::MODE_COMPLETE ? TaskManager::MODE_COMPLETE : "$mode $name";
 		$this->logger->info( "Running $activity" );
 		$manager = new TaskManager( $this->logger, $this->wiki, $this->messageProvider );
@@ -41,8 +41,7 @@ 
 		$base = "Execution of $activity";
 		if ( $res->isOK() ) {
 			$msg = $res->getStatus() === TaskResult::STATUS_NOTHING ?
-				': nothing to do' :
-				' completed successfully';
+				': nothing to do' : ' completed successfully';
 			$this->logger->info( $base . $msg );
 		} else {
 			$this->logger->error( "$base failed.\n$res" );
@@ -52,7 +51,7 @@ 
 	/**
 	 * Entry point for the whole process
 	 */
-	public function runAll() : void {
+	public function runAll () : void {
 		$this->run();
 	}
 
@@ -61,7 +60,7 @@ 
 	 *
 	 * @param string $task
 	 */
-	public function runTask( string $task ) : void {
+	public function runTask ( string $task ) : void {
 		$this->run( TaskManager::MODE_TASK, $task );
 	}
 
@@ -70,7 +69,7 @@ 
 	 *
 	 * @param string $subtask
 	 */
-	public function runSubtask( string $subtask ) : void {
+	public function runSubtask ( string $subtask ) : void {
 		$this->run( TaskManager::MODE_SUBTASK, $subtask );
 	}
 }

includes/Config.php

Spacing +7 added lines, -7 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -13,7 +13,7 @@ 
 	/** @var self */
 	private static $instance;
 	/** @var array */
-	private $opts = [];
+	private $opts = [ ];
 	/** @var Wiki */
 	private $wiki;
 
@@ -22,7 +22,7 @@ 
 	 *
 	 * @param Wiki $wiki
 	 */
-	private function __construct( Wiki $wiki ) {
+	private function __construct ( Wiki $wiki ) {
 		$this->wiki = $wiki;
 	}
 
@@ -33,7 +33,7 @@ 
 	 * @param Wiki $wiki
 	 * @throws ConfigException
 	 */
-	public static function init( string $configTitle, Wiki $wiki ) : void {
+	public static function init ( string $configTitle, Wiki $wiki ) : void {
 		if ( self::$instance ) {
 			throw new ConfigException( 'Config was already initialized' );
 		}
@@ -59,7 +59,7 @@ 
 	 * @param string $key
 	 * @param mixed $value
 	 */
-	protected function set( string $key, $value ) : void {
+	protected function set ( string $key, $value ) : void {
 		$this->opts[ $key ] = $value;
 	}
 
@@ -69,7 +69,7 @@ 
 	 * @return self
 	 * @throws ConfigException
 	 */
-	public static function getInstance() : self {
+	public static function getInstance () : self {
 		if ( !self::$instance ) {
 			throw new ConfigException( 'Config not yet initialized' );
 		}
@@ -83,7 +83,7 @@ 
 	 * @return mixed
 	 * @throws ConfigException
 	 */
-	public function get( string $opt ) {
+	public function get ( string $opt ) {
 		if ( !isset( $this->opts[ $opt ] ) ) {
 			throw new ConfigException( "Config option '$opt' not set." );
 		}

includes/Wiki/Page/PageBotList.php

Spacing +18 added lines, -20 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki\Page;
 
@@ -18,7 +18,7 @@ 
 	 * @private Use self::get()
 	 * @param Wiki $wiki
 	 */
-	public function __construct( Wiki $wiki ) {
+	public function __construct ( Wiki $wiki ) {
 		// phpcs:ignore MediaWiki.NamingConventions.ValidGlobalName.allowedPrefix
 		global $globalListTitle;
 		parent::__construct( $globalListTitle, $wiki );
@@ -30,7 +30,7 @@ 
 	 * @param Wiki $wiki
 	 * @return self
 	 */
-	public static function get( Wiki $wiki ) : self {
+	public static function get ( Wiki $wiki ) : self {
 		static $instance = null;
 		if ( $instance === null ) {
 			$instance = new self( $wiki );
@@ -42,16 +42,16 @@ 
 	 * @param string[] $groups
 	 * @return int|null
 	 */
-	public static function getOverrideTimestamp( array $groups ) : ?int {
+	public static function getOverrideTimestamp ( array $groups ) : ?int {
 		if ( !array_intersect_key( $groups, [ 'override-perm' => true, 'override' => true ] ) ) {
 			return null;
 		}
 
 		// A one-time override takes precedence
 		if ( array_key_exists( 'override', $groups ) ) {
-			$date = $groups['override'];
+			$date = $groups[ 'override' ];
 		} else {
-			$date = $groups['override-prem'] . '/' . date( 'Y' );
+			$date = $groups[ 'override-prem' ] . '/' . date( 'Y' );
 		}
 		return \DateTime::createFromFormat( 'd/m/Y', $date )->getTimestamp();
 	}
@@ -62,17 +62,15 @@ 
 	 * @param array $groups
 	 * @return int
 	 */
-	public static function getValidFlagTimestamp( array $groups ): int {
-		$checkuser = isset( $groups['checkuser'] ) ?
-			\DateTime::createFromFormat( 'd/m/Y', $groups['checkuser'] )->getTimestamp() :
-			0;
-		$bureaucrat = isset( $groups['bureaucrat'] ) ?
-			\DateTime::createFromFormat( 'd/m/Y', $groups['bureaucrat'] )->getTimestamp() :
-			0;
+	public static function getValidFlagTimestamp ( array $groups ): int {
+		$checkuser = isset( $groups[ 'checkuser' ] ) ?
+			\DateTime::createFromFormat( 'd/m/Y', $groups[ 'checkuser' ] )->getTimestamp() : 0;
+		$bureaucrat = isset( $groups[ 'bureaucrat' ] ) ?
+			\DateTime::createFromFormat( 'd/m/Y', $groups[ 'bureaucrat' ] )->getTimestamp() : 0;
 
 		$timestamp = max( $bureaucrat, $checkuser );
 		if ( $timestamp === 0 ) {
-			$timestamp = \DateTime::createFromFormat( 'd/m/Y', $groups['sysop'] )->getTimestamp();
+			$timestamp = \DateTime::createFromFormat( 'd/m/Y', $groups[ 'sysop' ] )->getTimestamp();
 		}
 		return $timestamp;
 	}
@@ -81,14 +79,14 @@ 
 	 * @param array $groups
 	 * @return bool
 	 */
-	public static function isOverrideExpired( array $groups ) : bool {
-		if ( !isset( $groups['override'] ) ) {
+	public static function isOverrideExpired ( array $groups ) : bool {
+		if ( !isset( $groups[ 'override' ] ) ) {
 			return false;
 		}
 
 		$flagTS = self::getValidFlagTimestamp( $groups );
 		$usualTS = strtotime( date( 'Y' ) . '-' . date( 'm-d', $flagTS ) );
-		$overrideTS = \DateTime::createFromFormat( 'd/m/Y', $groups['override'] )->getTimestamp();
+		$overrideTS = \DateTime::createFromFormat( 'd/m/Y', $groups[ 'override' ] )->getTimestamp();
 		$delay = 60 * 60 * 24 * 3;
 
 		return time() > $usualTS + $delay && time() > $overrideTS + $delay;
@@ -99,9 +97,9 @@ 
 	 *
 	 * @return User[]
 	 */
-	public function getAdminsList() : array {
+	public function getAdminsList () : array {
 		if ( $this->adminsList === null ) {
-			$this->adminsList = [];
+			$this->adminsList = [ ];
 			foreach ( $this->getDecodedContent() as $user => $info ) {
 				$userObj = new User( $user, $this->wiki );
 				$userObj->setInfo( $info );
@@ -116,7 +114,7 @@ 
 	 *
 	 * @return array[]
 	 */
-	public function getDecodedContent() : array {
+	public function getDecodedContent () : array {
 		return json_decode( $this->getContent(), true );
 	}
 }

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->checkRequiredOpts( $opts );
 		$this->checkConflictingOpts( $opts );
@@ -75,7 +75,7 @@ 
 	/**
 	 * @param array $opts
 	 */
-	private function checkRequiredOpts( array $opts ) : void {
+	private function checkRequiredOpts ( array $opts ) : void {
 		$missingOpts = array_diff( self::REQUIRED_OPTS, array_keys( $opts ) );
 		if ( $missingOpts ) {
 			exit( 'Required options missing: ' . implode( ', ', $missingOpts ) );
@@ -91,7 +91,7 @@ 
 	/**
 	 * @param array $opts
 	 */
-	private function checkConflictingOpts( array $opts ) : void {
+	private function checkConflictingOpts ( array $opts ) : void {
 		$hasPw = array_key_exists( 'password', $opts );
 		$hasPwFile = array_key_exists( 'use-password-file', $opts );
 		if ( $hasPw && $hasPwFile ) {
@@ -108,11 +108,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' ] );
 		}
 	}
 
@@ -121,14 +121,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 ]
@@ -138,7 +138,7 @@ 
 	/**
 	 * @return string|null
 	 */
-	public function getURL() : ?string {
+	public function getURL () : ?string {
 		return $this->getOpt( 'force-url' );
 	}
 }