Daimona / BotRiconferme

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;
 
@@ -13,16 +13,16 @@ 
 	/** @var array[] */
 	private $processUsers;
 	/** @var PageRiconferma[] */
-	private $createdPages = [];
+	private $createdPages = [ ];
 
 	/**
 	 * Get a list of users to execute tasks on.
 	 *
 	 * @return array[]
 	 */
-	public function getUsersToProcess() : array {
+	public function getUsersToProcess () : array {
 		if ( $this->processUsers === null ) {
-			$this->processUsers = [];
+			$this->processUsers = [ ];
 			foreach ( PageBotList::get( $this->getController() )->getAdminsList() as $user => $groups ) {
 				if ( $this->shouldAddUser( $groups ) ) {
 					$this->processUsers[ $user ] = $groups;
@@ -39,7 +39,7 @@ 
 	 * @param string[] $groups
 	 * @return bool
 	 */
-	private function shouldAddUser( array $groups ) : bool {
+	private function shouldAddUser ( array $groups ) : bool {
 		$override = true;
 		$timestamp = PageBotList::getOverrideTimestamp( $groups );
 
@@ -58,10 +58,10 @@ 
 	 *
 	 * @return PageRiconferma[]
 	 */
-	public function getOpenPages() : array {
+	public function getOpenPages () : array {
 		static $list = null;
 		if ( $list === null ) {
-			$list = [];
+			$list = [ ];
 			$mainTitle = $this->getOpt( 'main-page-title' );
 			$params = [
 				'action' => 'query',
@@ -75,7 +75,7 @@ 
 			$pages = RequestBase::newFromParams( $params )->execute()->query->pages;
 			foreach ( reset( $pages )->templates as $page ) {
 				if ( preg_match( "!$titleReg\/[^\/]+\/\d!", $page->title ) ) {
-					$list[] = new PageRiconferma( $page->title, $this->getController() );
+					$list[ ] = new PageRiconferma( $page->title, $this->getController() );
 				}
 			}
 		}
@@ -88,13 +88,13 @@ 
 	 *
 	 * @return PageRiconferma[]
 	 */
-	public function getPagesToClose() : array {
+	public function getPagesToClose () : array {
 		static $list = null;
 		if ( $list === null ) {
-			$list = [];
+			$list = [ ];
 			foreach ( $this->getOpenPages() as $page ) {
 				if ( time() > $page->getEndTimestamp() ) {
-					$list[] = $page;
+					$list[ ] = $page;
 				}
 			}
 		}
@@ -106,21 +106,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 addCreatedPages( PageRiconferma $page ) {
-		$this->createdPages[] = $page;
+	public function addCreatedPages ( PageRiconferma $page ) {
+		$this->createdPages[ ] = $page;
 	}
 }

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;
 
@@ -54,7 +54,7 @@ 
 	 * @param Logger $logger
 	 * @param Controller $controller
 	 */
-	public function __construct( Logger $logger, Controller $controller ) {
+	public function __construct ( Logger $logger, Controller $controller ) {
 		$this->logger = $logger;
 		$this->controller = $controller;
 		$this->provider = new TaskDataProvider( $this->logger, $this->controller );
@@ -67,7 +67,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 ) {
@@ -82,7 +82,7 @@ 
 	 *
 	 * @return TaskResult
 	 */
-	protected function runAllTasks() : TaskResult {
+	protected function runAllTasks () : TaskResult {
 		$orderedList = [
 			'update-list',
 			'start-new',
@@ -104,7 +104,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." );
 		}
@@ -119,7 +119,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." );
 		}
@@ -134,7 +134,7 @@ 
 	 * @param string $class
 	 * @return Task
 	 */
-	private function getTaskInstance( string $class ) : Task {
+	private function getTaskInstance ( string $class ) : Task {
 		return new $class( $this->logger, $this->controller, $this->provider );
 	}
 
@@ -144,7 +144,7 @@ 
 	 * @param string $class
 	 * @return Subtask
 	 */
-	private function getSubtaskInstance( string $class ) : Subtask {
+	private function getSubtaskInstance ( string $class ) : Subtask {
 		return new $class( $this->logger, $this->controller, $this->provider );
 	}
 }

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;
 
@@ -19,7 +19,7 @@ 
 	 * @param Logger $logger
 	 * @param Controller $controller
 	 */
-	public function __construct( Logger $logger, Controller $controller ) {
+	public function __construct ( Logger $logger, Controller $controller ) {
 		$this->logger = $logger;
 		$this->controller = $controller;
 	}
@@ -30,7 +30,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( $this->logger, $this->controller );
@@ -39,8 +39,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 . ".\n$line\n\n" );
 		} else {
 			$this->logger->error( "$base failed.\n$res\n$line\n\n" );
@@ -50,7 +49,7 @@ 
 	/**
 	 * Entry point for the whole process
 	 */
-	public function runAll() {
+	public function runAll () {
 		$this->run();
 	}
 
@@ -59,7 +58,7 @@ 
 	 *
 	 * @param string $task
 	 */
-	public function runTask( string $task ) {
+	public function runTask ( string $task ) {
 		$this->run( TaskManager::MODE_TASK, $task );
 	}
 
@@ -68,7 +67,7 @@ 
 	 *
 	 * @param string $subtask
 	 */
-	public function runSubtask( string $subtask ) {
+	public function runSubtask ( string $subtask ) {
 		$this->run( TaskManager::MODE_SUBTASK, $subtask );
 	}
 }

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,7 +13,7 @@ 
 	/** @var self */
 	private static $instance;
 	/** @var array */
-	private $opts = [];
+	private $opts = [ ];
 	/** @var Controller */
 	private $controller;
 
@@ -22,7 +22,7 @@ 
 	 *
 	 * @param Controller $controller
 	 */
-	private function __construct( Controller $controller ) {
+	private function __construct ( Controller $controller ) {
 		$this->controller = $controller;
 	}
 
@@ -33,16 +33,16 @@ 
 	 * @param Controller $controller
 	 * @throws ConfigException
 	 */
-	public static function init( array $defaults, Controller $controller ) {
+	public static function init ( array $defaults, Controller $controller ) {
 		if ( self::$instance ) {
 			throw new ConfigException( 'Config was already initialized' );
 		}
 
 		$inst = new self( $controller );
-		$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
@@ -62,7 +62,7 @@ 
 	 * @return string
 	 * @throws ConfigException
 	 */
-	public function getWikiMessage( string $key ) : string {
+	public function getWikiMessage ( string $key ) : string {
 		static $messages = null;
 		if ( $messages === null ) {
 			try {
@@ -75,7 +75,7 @@ 
 		if ( !isset( $messages[ $key ] ) ) {
 			throw new ConfigException( "Message '$key' does not exist." );
 		}
-		return $messages[$key];
+		return $messages[ $key ];
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	 * @param string $key
 	 * @param mixed $value
 	 */
-	protected function set( string $key, $value ) {
+	protected function set ( string $key, $value ) {
 		$this->opts[ $key ] = $value;
 	}
 
@@ -94,7 +94,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' );
 		}
@@ -108,7 +108,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/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;
 
@@ -13,7 +13,7 @@ 
  */
 abstract class TaskBase extends ContextSource {
 	/** @var string[] */
-	protected $errors = [];
+	protected $errors = [ ];
 	/** @var TaskDataProvider */
 	protected $dataProvider;
 
@@ -24,7 +24,7 @@ 
 	 * @param Controller $controller
 	 * @param TaskDataProvider $dataProvider
 	 */
-	final public function __construct(
+	final public function __construct (
 		Logger $logger,
 		Controller $controller,
 		TaskDataProvider $dataProvider
@@ -35,7 +35,7 @@ 
 		$this->dataProvider = $dataProvider;
 	}
 
-	public function __destruct() {
+	public function __destruct () {
 		restore_error_handler();
 		restore_exception_handler();
 	}
@@ -45,7 +45,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" );
@@ -76,14 +76,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.
@@ -91,7 +91,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 ' .
@@ -109,14 +109,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/ContextSource.php

Spacing +11 added lines, -11 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -24,7 +24,7 @@ 
 	 * @param Logger $logger
 	 * @param Controller $controller
 	 */
-	public function __construct( Logger $logger, Controller $controller ) {
+	public function __construct ( Logger $logger, Controller $controller ) {
 		$this->setLogger( $logger );
 		$this->setConfig( Config::getInstance() );
 		$this->setController( $controller );
@@ -33,14 +33,14 @@ 
 	/**
 	 * @return LoggerInterface
 	 */
-	protected function getLogger() : LoggerInterface {
+	protected function getLogger () : LoggerInterface {
 		return $this->logger;
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	public function setLogger( LoggerInterface $logger ) {
+	public function setLogger ( LoggerInterface $logger ) {
 		$this->logger = $logger;
 	}
 
@@ -50,35 +50,35 @@ 
 	 * @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 ) {
+	protected function setConfig ( Config $cfg ) {
 		$this->config = $cfg;
 	}
 
 	/**
 	 * @return Controller
 	 */
-	protected function getController() : Controller {
+	protected function getController () : Controller {
 		return $this->controller;
 	}
 
 	/**
 	 * @param Controller $controller
 	 */
-	protected function setController( Controller $controller ) {
+	protected function setController ( Controller $controller ) {
 		$this->controller = $controller;
 	}
 
@@ -88,7 +88,7 @@ 
 	 * @param string $key
 	 * @return Message
 	 */
-	protected function msg( string $key ) : Message {
+	protected function msg ( string $key ) : Message {
 		return new Message( $key );
 	}
 
@@ -98,7 +98,7 @@ 
 	 * @param string $title
 	 * @return Page
 	 */
-	protected function getPage( string $title ) : Page {
+	protected function getPage ( string $title ) : Page {
 		return new Page( $title, $this->getController() );
 	}
 }

includes/Logger.php

Spacing +4 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -15,7 +15,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 @@ 
 	 * @param string $level
 	 * @return int
 	 */
-	private function levelToInt( string $level ) : int {
+	private function levelToInt ( string $level ) : int {
 		// Order matters
 		$mapping = [
 			LogLevel::DEBUG,
@@ -44,7 +44,7 @@ 
 	 * @inheritDoc
 	 * @suppress PhanUnusedPublicMethodParameter
 	 */
-	public function log( $level, $message, array $context = [] ) {
+	public function log ( $level, $message, array $context = [ ] ) {
 		if ( $this->levelToInt( $level ) >= $this->minLevel ) {
 			printf( "%s [%s] - %s\n", date( 'd M H:i:s' ), $level, $message );
 		}

includes/Message.php

Spacing +11 added lines, -11 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
 		);
@@ -73,7 +73,7 @@ 
 	 * @suppress PhanUnreferencedPublicMethod
 	 * @fixme Is this necessary?
 	 */
-	public static function getTimeWithArticle( int $timestamp ) : string {
+	public static function getTimeWithArticle ( int $timestamp ) : string {
 		$oldLoc = setlocale( LC_TIME, 'it_IT', 'Italian_Italy', 'Italian' );
 		$timeString = strftime( '%e %B alle %R', $timestamp );
 		// Remove the left space if day has a single digit
@@ -90,7 +90,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 ),
@@ -108,12 +108,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;
 		}
@@ -121,7 +121,7 @@ 
 		return $ret;
 	}
 
-	public function __toString() {
+	public function __toString () {
 		return $this->text();
 	}
 }

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.' );
@@ -55,10 +55,10 @@ 
 	 * @internal Only used as CB for cURL (CURLOPT_HEADERFUNCTION)
 	 * @suppress PhanUnreferencedPublicMethod,PhanUnusedPublicNoOverrideMethodParameter
 	 */
-	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 ];
 		}
 
 		return strlen( $header );