Daimona / BotRiconferme

includes/MessageProvider.php

Spacing +5 added lines, -5 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types = 1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -20,7 +20,7 @@ 
 	 * @param Wiki $wiki
 	 * @param string $msgTitle
 	 */
-	public function __construct( Wiki $wiki, string $msgTitle ) {
+	public function __construct ( Wiki $wiki, string $msgTitle ) {
 		$this->wiki = $wiki;
 		$this->msgTitle = $msgTitle;
 	}
@@ -28,7 +28,7 @@ 
 	/**
 	 * @throws MessagesPageDoesNotExistException
 	 */
-	private function grabWikiMessages() : void {
+	private function grabWikiMessages () : void {
 		if ( self::$messages !== null ) {
 			return;
 		}
@@ -45,12 +45,12 @@ 
 	 * @return Message
 	 * @throws MessageNotFoundException
 	 */
-	public function getMessage( string $key ) : Message {
+	public function getMessage ( string $key ) : Message {
 		$this->grabWikiMessages();
 		if ( !isset( self::$messages[ $key ] ) ) {
 			throw new MessageNotFoundException( "Message '$key' does not exist." );
 		}
 		// @phan-suppress-next-line PhanTypeArraySuspiciousNullable
-		return new Message( self::$messages[$key] );
+		return new Message( self::$messages[ $key ] );
 	}
 }

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/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/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' );
 	}
 }

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;
 
@@ -11,12 +11,12 @@ 
 	/** @var self */
 	private static $instance;
 	/** @var array */
-	private $opts = [];
+	private $opts = [ ];
 
 	/**
 	 * Use self::init() and self::getInstance()
 	 */
-	private function __construct() {
+	private function __construct () {
 	}
 
 	/**
@@ -25,7 +25,7 @@ 
 	 * @param array $confValues
 	 * @throws ConfigException
 	 */
-	public static function init( array $confValues ) : void {
+	public static function init ( array $confValues ) : void {
 		if ( self::$instance ) {
 			throw new ConfigException( 'Config was already initialized' );
 		}
@@ -44,7 +44,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;
 	}
 
@@ -54,7 +54,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' );
 		}
@@ -68,7 +68,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/Task/Subtask/UserNotice.php

Spacing +4 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task\Subtask;
 
@@ -12,7 +12,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function runInternal() : int {
+	public function runInternal () : int {
 		$pages = $this->getDataProvider()->getCreatedPages();
 		$users = $this->getDataProvider()->getUsersToProcess();
 
@@ -20,7 +20,7 @@ 
 			return TaskResult::STATUS_NOTHING;
 		}
 
-		$ricNums = [];
+		$ricNums = [ ];
 		foreach ( $pages as $page ) {
 			$ricNums[ $page->getUserName() ] = $page->getNum();
 		}
@@ -38,7 +38,7 @@ 
 	 * @param User $user
 	 * @param int $ricNum
 	 */
-	protected function addMsg( User $user, int $ricNum ) : void {
+	protected function addMsg ( User $user, int $ricNum ) : void {
 		$this->getLogger()->info( "Leaving msg to $user" );
 		$msg = $this->msg( 'user-notice-msg' )->params( [ '$num' => $ricNum ] )->text();
 

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;
 
@@ -18,15 +18,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 = $this->getBotList();
 		$this->botList = $pageBotList->getDecodedContent();
@@ -53,7 +53,7 @@ 
 	/**
 	 * @return array
 	 */
-	protected function getActualAdmins() : array {
+	protected function getActualAdmins () : array {
 		$params = [
 			'action' => 'query',
 			'list' => 'allusers',
@@ -70,8 +70,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, true ) ) {
@@ -88,16 +88,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();
 				}
 			}
 		}
@@ -112,7 +112,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" );
 
 		$wiki = $this->getWiki();
@@ -147,7 +147,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 (
@@ -166,8 +166,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 ] ) ) {
@@ -183,7 +183,7 @@ 
 	 * @param string[] $names
 	 * @return \stdClass
 	 */
-	private function getRenameEntries( array $names ) : \stdClass {
+	private function getRenameEntries ( array $names ) : \stdClass {
 		$titles = array_map( static function ( $x ) {
 			return "Utente:$x";
 		}, $names );
@@ -207,14 +207,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' ) ) {
@@ -232,18 +232,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 );
@@ -257,12 +257,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 ] );
@@ -272,7 +272,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 ] );
 				}
 			}
@@ -289,7 +289,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 );
@@ -309,12 +309,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/Task/TaskBase.php

Spacing +7 added lines, -7 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task;
 
@@ -15,7 +15,7 @@ 
  */
 abstract class TaskBase extends ContextSource {
 	/** @var string[] */
-	protected $errors = [];
+	protected $errors = [ ];
 	/** @var TaskDataProvider */
 	protected $dataProvider;
 
@@ -28,7 +28,7 @@ 
 	 * @param MessageProvider $mp
 	 * @param PageBotList $pbl
 	 */
-	final public function __construct(
+	final public function __construct (
 		LoggerInterface $logger,
 		WikiGroup $wikiGroup,
 		TaskDataProvider $dataProvider,
@@ -44,7 +44,7 @@ 
 	 *
 	 * @return TaskResult
 	 */
-	final public function run() : TaskResult {
+	final public function run () : TaskResult {
 		$class = ( new \ReflectionClass( $this ) )->getShortName();
 		$opName = $this->getOperationName();
 		$this->getLogger()->info( "Starting $opName $class" );
@@ -75,19 +75,19 @@ 
 	 *
 	 * @return int One of the STATUS_* constants
 	 */
-	abstract protected function runInternal() : int;
+	abstract protected function runInternal () : int;
 
 	/**
 	 * How this operation should be called in logs
 	 *
 	 * @return string
 	 */
-	abstract public function getOperationName() : string;
+	abstract public function getOperationName () : string;
 
 	/**
 	 * @return TaskDataProvider
 	 */
-	protected function getDataProvider() : TaskDataProvider {
+	protected function getDataProvider () : TaskDataProvider {
 		return $this->dataProvider;
 	}
 }

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;
 
@@ -62,7 +62,7 @@ 
 	 * @param MessageProvider $mp
 	 * @param PageBotList $pbl
 	 */
-	public function __construct(
+	public function __construct (
 		LoggerInterface $logger,
 		WikiGroup $wikiGroup,
 		MessageProvider $mp,
@@ -87,7 +87,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 ) {
@@ -102,7 +102,7 @@ 
 	 *
 	 * @return TaskResult
 	 */
-	protected function runAllTasks() : TaskResult {
+	protected function runAllTasks () : TaskResult {
 		$orderedList = [
 			'update-list',
 			'start-new',
@@ -124,7 +124,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." );
 		}
@@ -138,7 +138,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." );
 		}
@@ -153,7 +153,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(
@@ -172,7 +172,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,