Daimona / BotRiconferme

includes/Wiki/Element.php

Spacing +5 added lines, -5 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki;
 
@@ -11,7 +11,7 @@ 
 	 *
 	 * @return string
 	 */
-	abstract public function getRegex() : string;
+	abstract public function getRegex () : string;
 
 	/**
 	 * Get a regex matching any element in the given array
@@ -20,10 +20,10 @@ 
 	 * @return string
 	 * @todo Is this the right place?
 	 */
-	public static function regexFromArray( array $elements ) : string {
-		$bits = [];
+	public static function regexFromArray ( array $elements ) : string {
+		$bits = [ ];
 		foreach ( $elements as $el ) {
-			$bits[] = $el->getRegex();
+			$bits[ ] = $el->getRegex();
 		}
 		return '(?:' . implode( '|', $bits ) . ')';
 	}

includes/Task/UpdateList.php

Spacing +20 added lines, -20 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();
 		$this->botList = PageBotList::get()->getAdminsList();
 
@@ -53,7 +53,7 @@ 
 	/**
 	 * @return array
 	 */
-	protected function getActualAdmins() : array {
+	protected function getActualAdmins () : array {
 		$this->getLogger()->debug( 'Retrieving admins - API' );
 		$params = [
 			'action' => 'query',
@@ -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->getConfig()->get( '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;
@@ -148,7 +148,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 ( isset( $entry->params ) ) {
@@ -167,8 +167,8 @@ 
 	 *
 	 * @return array[]
 	 */
-	protected function getExtraGroups() : array {
-		$extra = [];
+	protected function getExtraGroups () : array {
+		$extra = [ ];
 		foreach ( $this->botList as $name => $groups ) {
 			// These are not groups
 			unset( $groups[ 'override' ], $groups[ 'override-perm' ] );
@@ -188,7 +188,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;
 		foreach ( $newContent as $user => $groups ) {
 			if ( isset( $missing[ $user ] ) ) {
@@ -213,15 +213,15 @@ 
 	 * @param array[] $newContent
 	 * @return array[]
 	 */
-	protected function removeOverrides( array $newContent ) : array {
-		$removed = [];
+	protected function removeOverrides ( array $newContent ) : array {
+		$removed = [ ];
 		foreach ( $newContent as $user => $groups ) {
 			$ts = PageBotList::getValidFlagTimestamp( $groups );
-			if ( isset( $groups['override'] ) && ( date( 'd/m', $ts ) ===
+			if ( isset( $groups[ 'override' ] ) && ( date( 'd/m', $ts ) ===
 				date( 'd/m', strtotime( '- 1 days' ) ) )
 			) {
 				unset( $newContent[ $user ][ 'override' ] );
-				$removed[] = $user;
+				$removed[ ] = $user;
 			}
 		}
 

includes/Task/TaskBase.php

Spacing +10 added lines, -10 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task;
 
@@ -11,7 +11,7 @@ 
  */
 abstract class TaskBase extends ContextSource {
 	/** @var string[] */
-	protected $errors = [];
+	protected $errors = [ ];
 	/** @var TaskDataProvider */
 	protected $dataProvider;
 
@@ -20,14 +20,14 @@ 
 	 *
 	 * @param TaskDataProvider $dataProvider
 	 */
-	final public function __construct( TaskDataProvider $dataProvider ) {
+	final public function __construct ( TaskDataProvider $dataProvider ) {
 		set_exception_handler( [ $this, 'handleException' ] );
 		set_error_handler( [ $this, 'handleError' ] );
 		parent::__construct();
 		$this->dataProvider = $dataProvider;
 	}
 
-	public function __destruct() {
+	public function __destruct () {
 		restore_error_handler();
 		restore_exception_handler();
 	}
@@ -37,7 +37,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" );
@@ -68,14 +68,14 @@ 
 	 *
 	 * @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;
 
 	/**
 	 * Exception handler.
@@ -83,7 +83,7 @@ 
 	 * @param \Throwable $ex
 	 * @protected
 	 */
-	public function handleException( \Throwable $ex ) {
+	public function handleException ( \Throwable $ex ) {
 		$this->getLogger()->error(
 			( new \ReflectionClass( $ex ) )->getShortName() . ': ' .
 			$ex->getMessage() . "\nin " . $ex->getFile() . ' line ' .
@@ -101,14 +101,14 @@ 
 	 * @throws \ErrorException
 	 * @protected
 	 */
-	public function handleError( $errno, $errstr, $errfile, $errline ) {
+	public function handleError ( $errno, $errstr, $errfile, $errline ) {
 		throw new \ErrorException( $errstr, 0, $errno, $errfile, $errline );
 	}
 
 	/**
 	 * @return TaskDataProvider
 	 */
-	protected function getDataProvider() : TaskDataProvider {
+	protected function getDataProvider () : TaskDataProvider {
 		return $this->dataProvider;
 	}
 }

includes/Wiki/Controller.php

Spacing +12 added lines, -12 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki;
 
@@ -27,7 +27,7 @@ 
 	/**
 	 * @param string $domain The URL of the wiki, if different from default
 	 */
-	public function __construct( string $domain = DEFAULT_URL ) {
+	public function __construct ( string $domain = DEFAULT_URL ) {
 		$this->logger = new Logger;
 		$this->domain = $domain;
 	}
@@ -41,7 +41,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 page $title" . ( $section !== null ? ", section $section" : '' );
 		$this->logger->debug( $msg );
 		$params = [
@@ -53,7 +53,7 @@ 
 		];
 
 		if ( $section !== null ) {
-			$params['rvsection'] = $section;
+			$params[ 'rvsection' ] = $section;
 		}
 
 		$req = RequestBase::newFromParams( $params )->setUrl( $this->domain );
@@ -63,7 +63,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 );
@@ -77,7 +77,7 @@ 
 	 * @param array $params
 	 * @throws EditException
 	 */
-	public function editPage( array $params ) {
+	public function editPage ( array $params ) {
 		$this->login();
 
 		$params = [
@@ -104,7 +104,7 @@ 
 	 * Login wrapper. Checks if we're already logged in and clears tokens cache
 	 * @throws LoginException
 	 */
-	public function login() {
+	public function login () {
 		if ( self::$loggedIn ) {
 			return;
 		}
@@ -130,7 +130,7 @@ 
 
 		self::$loggedIn = true;
 		// Clear tokens cache
-		$this->tokens = [];
+		$this->tokens = [ ];
 		$this->logger->info( 'Login succeeded' );
 	}
 
@@ -140,7 +140,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',
@@ -163,7 +163,7 @@ 
 	 * @param string $title
 	 * @return int
 	 */
-	public function getPageCreationTS( string $title ) : int {
+	public function getPageCreationTS ( string $title ) : int {
 		$params = [
 			'action' => 'query',
 			'prop' => 'revisions',
@@ -176,7 +176,7 @@ 
 
 		$res = RequestBase::newFromParams( $params )->setUrl( $this->domain )->execute();
 		$data = $res->query->pages;
-		return strtotime( reset( $data )->revisions[0]->timestamp );
+		return strtotime( reset( $data )->revisions[ 0 ]->timestamp );
 	}
 
 	/**
@@ -185,7 +185,7 @@ 
 	 * @param string $title
 	 * @param string $reason
 	 */
-	public function protectPage( string $title, string $reason ) {
+	public function protectPage ( string $title, string $reason ) {
 		$this->logger->info( "Protecting page $title" );
 		$this->login();
 

includes/Request/CurlRequest.php

Spacing +5 added lines, -5 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -12,7 +12,7 @@ 
 	 * @inheritDoc
 	 * @throws APIRequestException
 	 */
-	protected function reallyMakeRequest( string $params ) : string {
+	protected function reallyMakeRequest ( string $params ) : string {
 		$curl = curl_init();
 		if ( $curl === false ) {
 			throw new APIRequestException( 'Cannot open cURL handler.' );
@@ -54,10 +54,10 @@ 
 	 * @return int
 	 * @internal Only used as CB for cURL
 	 */
-	public function headersHandler( $ch, string $header ) : int {
+	public function headersHandler ( $ch, string $header ) : int {
 		$bits = explode( ':', $header, 2 );
-		if ( trim( $bits[0] ) === 'Set-Cookie' ) {
-			$this->newCookies[] = $bits[1];
+		if ( trim( $bits[ 0 ] ) === 'Set-Cookie' ) {
+			$this->newCookies[ ] = $bits[ 1 ];
 		}
 		// @phan-suppress-next-line PhanTypeMismatchReturn WTF? Why does phan thinks this is a string?
 		return strlen( $header );

includes/Config.php

Spacing +13 added lines, -13 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -13,12 +13,12 @@ 
 	/** @var self */
 	private static $instance;
 	/** @var array */
-	private $opts = [];
+	private $opts = [ ];
 
 	/**
 	 * Use self::init() and self::getInstance()
 	 */
-	private function __construct() {
+	private function __construct () {
 	}
 
 	/**
@@ -27,16 +27,16 @@ 
 	 * @param array $defaults
 	 * @throws ConfigException
 	 */
-	public static function init( array $defaults ) {
+	public static function init ( array $defaults ) {
 		if ( self::$instance ) {
 			throw new ConfigException( 'Config was already initialized' );
 		}
 
 		$inst = new self;
-		$inst->set( 'list-title', $defaults['list-title'] );
-		$inst->set( 'msg-title', $defaults['msg-title'] );
-		$inst->set( 'username', $defaults['username'] );
-		$inst->set( 'password', $defaults['password'] );
+		$inst->set( 'list-title', $defaults[ 'list-title' ] );
+		$inst->set( 'msg-title', $defaults[ 'msg-title' ] );
+		$inst->set( 'username', $defaults[ 'username' ] );
+		$inst->set( 'password', $defaults[ 'password' ] );
 		self::$instance = $inst;
 
 		// On-wiki values
@@ -56,7 +56,7 @@ 
 	 * @return string
 	 * @throws ConfigException
 	 */
-	public function getWikiMessage( string $key ) : string {
+	public function getWikiMessage ( string $key ) : string {
 		static $messages = null;
 		if ( $messages === null ) {
 			try {
@@ -69,7 +69,7 @@ 
 		if ( !isset( $messages[ $key ] ) ) {
 			throw new ConfigException( "Message '$key' does not exist." );
 		}
-		return $messages[$key];
+		return $messages[ $key ];
 	}
 	/**
 	 * Set a config value.
@@ -77,7 +77,7 @@ 
 	 * @param string $key
 	 * @param mixed $value
 	 */
-	protected function set( string $key, $value ) {
+	protected function set ( string $key, $value ) {
 		$this->opts[ $key ] = $value;
 	}
 
@@ -87,7 +87,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' );
 		}
@@ -101,7 +101,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/Bot.php

Spacing +6 added lines, -6 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -11,7 +11,7 @@ 
 
 	const VERSION = '1.0';
 
-	public function __construct() {
+	public function __construct () {
 		$this->logger = new Logger;
 	}
 
@@ -21,7 +21,7 @@ 
 	 * @param string $mode
 	 * @param string|null $name
 	 */
-	private function run( string $mode = TaskManager::MODE_COMPLETE, string $name = null ) {
+	private function run ( string $mode = TaskManager::MODE_COMPLETE, string $name = null ) {
 		$activity = $mode === TaskManager::MODE_COMPLETE ? TaskManager::MODE_COMPLETE : "$mode $name";
 		$this->logger->info( "Running $activity" );
 		$manager = new TaskManager;
@@ -37,7 +37,7 @@ 
 	/**
 	 * Entry point for the whole process
 	 */
-	public function runAll() {
+	public function runAll () {
 		$this->run();
 	}
 
@@ -46,7 +46,7 @@ 
 	 *
 	 * @param string $task
 	 */
-	public function runTask( string $task ) {
+	public function runTask ( string $task ) {
 		$this->run( TaskManager::MODE_TASK, $task );
 	}
 
@@ -55,7 +55,7 @@ 
 	 *
 	 * @param string $subtask
 	 */
-	public function runSubtask( string $subtask ) {
+	public function runSubtask ( string $subtask ) {
 		$this->run( TaskManager::MODE_SUBTASK, $subtask );
 	}
 }

includes/Task/Subtask/UpdatesAround.php

Spacing +6 added lines, -6 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task\Subtask;
 
@@ -14,7 +14,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function runInternal() : int {
+	public function runInternal () : int {
 		$pages = $this->getDataProvider()->getCreatedPages();
 
 		if ( !$pages ) {
@@ -36,7 +36,7 @@ 
 	 *
 	 * @param PageRiconferma[] $pages
 	 */
-	protected function addToMainPage( array $pages ) {
+	protected function addToMainPage ( array $pages ) {
 		$this->getLogger()->info(
 			'Adding the following to main: ' . implode( ', ', $pages )
 		);
@@ -63,7 +63,7 @@ 
 	 *
 	 * @param PageRiconferma[] $pages
 	 */
-	protected function addToVotazioni( array $pages ) {
+	protected function addToVotazioni ( array $pages ) {
 		$this->getLogger()->info(
 			'Adding the following to votes: ' . implode( ', ', $pages )
 		);
@@ -96,7 +96,7 @@ 
 	 * @param int $amount
 	 * @throws TaskException
 	 */
-	protected function addToNews( int $amount ) {
+	protected function addToNews ( int $amount ) {
 		$this->getLogger()->info( "Increasing the news counter by $amount" );
 		$newsPage = new Page( $this->getConfig()->get( 'news-page-title' ) );
 
@@ -109,7 +109,7 @@ 
 			throw new TaskException( 'Param not found in news page' );
 		}
 
-		$newNum = (int)$matches[2] + $amount;
+		$newNum = (int)$matches[ 2 ] + $amount;
 		$newContent = preg_replace( $reg, '${1}' . $newNum, $content );
 
 		$summary = $this->msg( 'news-page-summary' )

includes/Task/Subtask/SimpleUpdates.php

Spacing +18 added lines, -18 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 UpdatesAround::addToVotazioni()
 	 */
-	protected function updateVotazioni( array $pages ) {
+	protected function updateVotazioni ( array $pages ) {
 		$this->getLogger()->info(
 			'Updating votazioni: ' . implode( ', ', $pages )
 		);
 		$votePage = new Page( $this->getConfig()->get( '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 UpdatesAround::addToNews()
 	 */
-	protected function updateNews( array $pages ) {
+	protected function updateNews ( array $pages ) {
 		$simpleAmount = $voteAmount = 0;
 		foreach ( $pages as $page ) {
 			if ( $page->isVote() ) {
@@ -90,8 +90,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, $content );
 		$newContent = preg_replace( $voteReg, '${1}' . $newVote, $newContent );
 
@@ -109,21 +109,21 @@ 
 	 *
 	 * @param bool[] $outcomes
 	 */
-	protected function updateAdminList( array $outcomes ) {
+	protected function updateAdminList ( array $outcomes ) {
 		$this->getLogger()->info( 'Updating admin list' );
 		$adminsPage = new Page( $this->getConfig()->get( 'admins-list-title' ) );
 		$newContent = $adminsPage->getContent();
 
-		$riconfNames = $removeNames = [];
+		$riconfNames = $removeNames = [ ];
 		foreach ( $outcomes as $user => $confirmed ) {
 			$userReg = ( new User( $user ) )->getRegex();
 			$reg = "!(\{\{Amministratore\/riga\|$userReg.+\| *)\d+( *\|[ \w]*\}\}.*\n)!";
 			if ( $confirmed ) {
 				$newContent = preg_replace( $reg, '${1}{{subst:#time:Ymd|+1 year}}$2', $newContent );
-				$riconfNames[] = $user;
+				$riconfNames[ ] = $user;
 			} else {
 				$newContent = preg_replace( $reg, '', $newContent );
-				$removeNames[] = $user;
+				$removeNames[ ] = $user;
 			}
 		}
 
@@ -143,21 +143,21 @@ 
 	/**
 	 * @param bool[] $outcomes
 	 */
-	protected function updateCUList( array $outcomes ) {
+	protected function updateCUList ( array $outcomes ) {
 		$this->getLogger()->info( 'Updating CU list.' );
 		$cuList = new Page( $this->getConfig()->get( 'cu-list-title' ) );
 		$newContent = $cuList->getContent();
 
-		$riconfNames = $removeNames = [];
+		$riconfNames = $removeNames = [ ];
 		foreach ( $outcomes as $user => $confirmed ) {
 			$userReg = ( new User( $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;
 			}
 		}
 
@@ -181,8 +181,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 ) ) {