Daimona / BotRiconferme

includes/Logger/MultiLogger.php

Spacing +5 added lines, -5 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Logger;
 
@@ -10,12 +10,12 @@ 
  */
 class MultiLogger extends AbstractLogger implements IFlushingAwareLogger {
 	/** @var IFlushingAwareLogger[] */
-	private $loggers = [];
+	private $loggers = [ ];
 
 	/**
 	 * @param IFlushingAwareLogger ...$loggers
 	 */
-	public function __construct( IFlushingAwareLogger ...$loggers ) {
+	public function __construct ( IFlushingAwareLogger ...$loggers ) {
 		$this->loggers = $loggers;
 	}
 
@@ -23,7 +23,7 @@ 
 	 * @inheritDoc
 	 * @suppress PhanUnusedPublicMethodParameter
 	 */
-	public function log( $level, $message, array $context = [] ) {
+	public function log ( $level, $message, array $context = [ ] ) {
 		foreach ( $this->loggers as $logger ) {
 			$logger->log( $level, $message );
 		}
@@ -32,7 +32,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function flush() : void {
+	public function flush () : void {
 		foreach ( $this->loggers as $logger ) {
 			$logger->flush();
 		}

includes/Logger/SimpleLogger.php

Spacing +4 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Logger;
 
@@ -17,7 +17,7 @@ 
 	/**
 	 * @param string $minlevel
 	 */
-	public function __construct( $minlevel = LogLevel::INFO ) {
+	public function __construct ( $minlevel = LogLevel::INFO ) {
 		$this->minLevel = $this->levelToInt( $minlevel );
 	}
 
@@ -25,7 +25,7 @@ 
 	 * @inheritDoc
 	 * @suppress PhanUnusedPublicMethodParameter
 	 */
-	public function log( $level, $message, array $context = [] ) {
+	public function log ( $level, $message, array $context = [ ] ) {
 		if ( $this->levelToInt( $level ) >= $this->minLevel ) {
 			echo $this->getFormattedMessage( $level, $message ) . "\n";
 		}
@@ -34,7 +34,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function flush() : void {
+	public function flush () : void {
 		// Everything else is printed immediately
 		echo "\n" . str_repeat( '-', 80 ) . "\n\n";
 	}

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;
 
@@ -13,7 +13,7 @@ 
  */
 abstract class TaskBase extends ContextSource {
 	/** @var string[] */
-	protected $errors = [];
+	protected $errors = [ ];
 	/** @var TaskDataProvider */
 	protected $dataProvider;
 
@@ -24,7 +24,7 @@ 
 	 * @param Wiki $wiki
 	 * @param TaskDataProvider $dataProvider
 	 */
-	final public function __construct(
+	final public function __construct (
 		LoggerInterface $logger,
 		Wiki $wiki,
 		TaskDataProvider $dataProvider
@@ -38,7 +38,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" );
@@ -69,19 +69,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/Logger/IFlushingAwareLogger.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Logger;
 
@@ -8,5 +8,5 @@ 
  * Logger aware of flushing. Can be declared empty if the buffer is flushed immediately.
  */
 interface IFlushingAwareLogger extends LoggerInterface {
-	public function flush() : void;
+	public function flush () : void;
 }

run.php

Spacing +3 added lines, -3 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 /**
  * Entry point for the bot, called by CLI
  */
@@ -54,9 +54,9 @@ 
 $type = current( array_keys( $taskOpt ) );
 try {
 	if ( $type === 'task' ) {
-		$bot->runTask( $taskOpt['task'] );
+		$bot->runTask( $taskOpt[ 'task' ] );
 	} elseif ( $type === 'subtask' ) {
-		$bot->runSubtask( $taskOpt['subtask'] );
+		$bot->runSubtask( $taskOpt[ 'subtask' ] );
 	} else {
 		$bot->runAll();
 	}

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 ) {
+	private function checkRequired ( array $opts ) {
 		foreach ( self::REQUIRED_OPTS as $opt ) {
 			if ( !array_key_exists( $opt, $opts ) ) {
 				exit( "Required option $opt missing." );
@@ -105,11 +105,11 @@ 
 	/**
 	 * @param array &$opts
 	 */
-	private function canonicalize( array &$opts ) {
+	private function canonicalize ( array &$opts ) {
 		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' ] );
 		}
 	}
 
@@ -117,7 +117,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 )
@@ -129,14 +129,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 ]
@@ -146,7 +146,7 @@ 
 	/**
 	 * @return string|null
 	 */
-	public function getURL() : ?string {
+	public function getURL () : ?string {
 		return $this->getOpt( 'force-url' );
 	}
 }

includes/Request/RequestBase.php

Spacing +23 added lines, -23 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -30,14 +30,14 @@ 
 	/** @var string */
 	protected $method = 'GET';
 	/** @var string[] */
-	protected $newCookies = [];
+	protected $newCookies = [ ];
 
 	/**
 	 * Use self::newFromParams, which will provide the right class to use
 	 *
 	 * @param array $params
 	 */
-	protected function __construct( array $params ) {
+	protected function __construct ( array $params ) {
 		$this->params = [ 'format' => 'json' ] + $params;
 		$this->url = DEFAULT_URL;
 	}
@@ -48,7 +48,7 @@ 
 	 * @param array $params
 	 * @return self
 	 */
-	public static function newFromParams( array $params ) : self {
+	public static function newFromParams ( array $params ) : self {
 		if ( extension_loaded( 'curl' ) ) {
 			$ret = new CurlRequest( $params );
 		} else {
@@ -62,7 +62,7 @@ 
 	 *
 	 * @return self For chaining
 	 */
-	public function setPost() : self {
+	public function setPost () : self {
 		$this->method = 'POST';
 		return $this;
 	}
@@ -73,7 +73,7 @@ 
 	 * @param string $url
 	 * @return self for chaining
 	 */
-	public function setUrl( string $url ) : self {
+	public function setUrl ( string $url ) : self {
 		$this->url = $url;
 		return $this;
 	}
@@ -85,14 +85,14 @@ 
 	 * @todo Return an iterable object which automatically continues the query only if the last
 	 *   entry available is reached.
 	 */
-	public function execute() : \stdClass {
+	public function execute () : \stdClass {
 		$curParams = $this->params;
-		$sets = [];
+		$sets = [ ];
 		do {
 			$res = $this->makeRequestInternal( $curParams );
 
 			$this->handleErrorAndWarnings( $res );
-			$sets[] = $res;
+			$sets[ ] = $res;
 
 			$finished = true;
 			if ( isset( $res->continue ) ) {
@@ -110,9 +110,9 @@ 
 	 * @param array $params
 	 * @return \stdClass
 	 */
-	private function makeRequestInternal( array $params ) : \stdClass {
+	private function makeRequestInternal ( array $params ) : \stdClass {
 		if ( $this->method === 'POST' ) {
-			$params['maxlag'] = self::MAXLAG;
+			$params[ 'maxlag' ] = self::MAXLAG;
 		}
 		$params = http_build_query( $params );
 
@@ -128,17 +128,17 @@ 
 	 * @param string $params
 	 * @return string
 	 */
-	abstract protected function reallyMakeRequest( string $params ) : string;
+	abstract protected function reallyMakeRequest ( string $params ) : string;
 
 	/**
 	 * After a request, set cookies for the next ones
 	 *
 	 * @param array $cookies
 	 */
-	protected function setCookies( array $cookies ) {
+	protected function setCookies ( array $cookies ) {
 		foreach ( $cookies as $cookie ) {
 			$bits = explode( ';', $cookie );
-			list( $name, $value ) = explode( '=', $bits[0] );
+			list( $name, $value ) = explode( '=', $bits[ 0 ] );
 			self::$cookiesToSet[ $name ] = $value;
 		}
 	}
@@ -149,7 +149,7 @@ 
 	 * @param \stdClass $res
 	 * @return APIRequestException
 	 */
-	private function getException( \stdClass $res ) : APIRequestException {
+	private function getException ( \stdClass $res ) : APIRequestException {
 		switch ( $res->error->code ) {
 			case 'missingtitle':
 				$ex = new MissingPageException;
@@ -172,7 +172,7 @@ 
 	 * @param \stdClass $res
 	 * @throws APIRequestException
 	 */
-	protected function handleErrorAndWarnings( \stdClass $res ) {
+	protected function handleErrorAndWarnings ( \stdClass $res ) {
 		if ( isset( $res->error ) ) {
 			throw $this->getException( $res );
 		} elseif ( isset( $res->warnings ) ) {
@@ -188,7 +188,7 @@ 
 	 * @param \stdClass[] $sets
 	 * @return \stdClass
 	 */
-	private function mergeSets( array $sets ) : \stdClass {
+	private function mergeSets ( array $sets ) : \stdClass {
 		// Use the first set as template
 		$ret = array_shift( $sets );
 
@@ -205,7 +205,7 @@ 
 	 * @param array|\stdClass $second
 	 * @return array|\stdClass array
 	 */
-	private function recursiveMerge( $first, $second ) {
+	private function recursiveMerge ( $first, $second ) {
 		$ret = $first;
 		if ( is_array( $second ) ) {
 			$ret = is_array( $first ) ? array_merge_recursive( $first, $second ) : $second;
@@ -223,14 +223,14 @@ 
 	 *
 	 * @return array
 	 */
-	protected function getHeaders() :array {
+	protected function getHeaders () :array {
 		$ret = self::HEADERS;
 		if ( self::$cookiesToSet ) {
-			$cookies = [];
+			$cookies = [ ];
 			foreach ( self::$cookiesToSet as $cname => $cval ) {
-				$cookies[] = trim( "$cname=$cval" );
+				$cookies[ ] = trim( "$cname=$cval" );
 			}
-			$ret[] = 'Cookie: ' . implode( '; ', $cookies );
+			$ret[ ] = 'Cookie: ' . implode( '; ', $cookies );
 		}
 		return $ret;
 	}
@@ -241,7 +241,7 @@ 
 	 * @param array $headers
 	 * @return string
 	 */
-	protected function buildHeadersString( array $headers ) : string {
+	protected function buildHeadersString ( array $headers ) : string {
 		$ret = '';
 		foreach ( $headers as $header ) {
 			$ret .= "$header\r\n";

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 = new User( $username, $this->getWiki() );
 			$userReg = $user->getRegex();
@@ -123,10 +123,10 @@ 
 					'${1}' . date( '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 = ( new User( $user, $this->getWiki() ) )->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/Wiki/Wiki.php

Spacing +14 added lines, -14 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki;
 
@@ -28,7 +28,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;
 	}
@@ -42,7 +42,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 = [
@@ -54,7 +54,7 @@ 
 		];
 
 		if ( $section !== null ) {
-			$params['rvsection'] = $section;
+			$params[ 'rvsection' ] = $section;
 		}
 
 		$req = $this->buildRequest( $params );
@@ -64,7 +64,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 );
@@ -78,7 +78,7 @@ 
 	 * @param array $params
 	 * @throws EditException
 	 */
-	public function editPage( array $params ) {
+	public function editPage ( array $params ) {
 		$this->login();
 
 		$params = [
@@ -87,7 +87,7 @@ 
 		] + $params;
 
 		if ( Config::getInstance()->get( 'bot-edits' ) ) {
-			$params['bot'] = 1;
+			$params[ 'bot' ] = 1;
 		}
 
 		$res = $this->buildRequest( $params )->setPost()->execute();
@@ -105,7 +105,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;
 		}
@@ -132,7 +132,7 @@ 
 
 		self::$loggedIn = true;
 		// Clear tokens cache
-		$this->tokens = [];
+		$this->tokens = [ ];
 		$this->logger->info( 'Login succeeded' );
 	}
 
@@ -142,7 +142,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',
@@ -165,7 +165,7 @@ 
 	 * @param string $title
 	 * @return int
 	 */
-	public function getPageCreationTS( string $title ) : int {
+	public function getPageCreationTS ( string $title ) : int {
 		$params = [
 			'action' => 'query',
 			'prop' => 'revisions',
@@ -178,7 +178,7 @@ 
 
 		$res = $this->buildRequest( $params )->execute();
 		$data = $res->query->pages;
-		return strtotime( reset( $data )->revisions[0]->timestamp );
+		return strtotime( reset( $data )->revisions[ 0 ]->timestamp );
 	}
 
 	/**
@@ -187,7 +187,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();
 
@@ -208,7 +208,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 );
 	}
 }