Daimona / BotRiconferme

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 );

includes/TaskResult.php

Spacing +9 added lines, -9 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -21,7 +21,7 @@ 
 	 * @param int $status One of the Task::STATUS_* constants
 	 * @param string[] $errors
 	 */
-	public function __construct( int $status, array $errors = [] ) {
+	public function __construct ( int $status, array $errors = [ ] ) {
 		$this->status = $status;
 		$this->errors = $errors;
 	}
@@ -29,7 +29,7 @@ 
 	/**
 	 * @return int
 	 */
-	public function getStatus() : int {
+	public function getStatus () : int {
 		return $this->status;
 	}
 
@@ -37,14 +37,14 @@ 
 	 * @return string[]
 	 * @suppress PhanUnreferencedPublicMethod
 	 */
-	public function getErrors() {
+	public function getErrors () {
 		return $this->errors;
 	}
 
 	/**
 	 * @param TaskResult $that
 	 */
-	public function merge( TaskResult $that ) {
+	public function merge ( TaskResult $that ) {
 		$this->status |= $that->status;
 		$this->errors = array_merge( $this->errors, $that->errors );
 	}
@@ -52,15 +52,15 @@ 
 	/**
 	 * @return string
 	 */
-	public function __toString() {
+	public function __toString () {
 		if ( $this->isOK() ) {
 			$stat = 'OK';
 			$errs = "\tNo errors.";
 		} else {
 			$stat = 'ERROR';
-			$formattedErrs = [];
+			$formattedErrs = [ ];
 			foreach ( $this->errors as $err ) {
-				$formattedErrs[] = "\t - $err";
+				$formattedErrs[ ] = "\t - $err";
 			}
 			$errs = implode( "\n", $formattedErrs );
 		}
@@ -72,7 +72,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isOK() : bool {
+	public function isOK () : bool {
 		return ( $this->status | self::STATUS_GOOD ) === self::STATUS_GOOD;
 	}
 }

includes/Task/Subtask/OpenUpdates.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;
 
@@ -13,7 +13,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function runInternal() : int {
+	public function runInternal () : int {
 		$pages = $this->getDataProvider()->getCreatedPages();
 
 		if ( !$pages ) {
@@ -35,7 +35,7 @@ 
 	 *
 	 * @param PageRiconferma[] $pages
 	 */
-	protected function addToMainPage( array $pages ) {
+	protected function addToMainPage ( array $pages ) {
 		$this->getLogger()->info(
 			'Adding the following to main: ' . implode( ', ', $pages )
 		);
@@ -68,7 +68,7 @@ 
 	 *
 	 * @param PageRiconferma[] $pages
 	 */
-	protected function addToVotazioni( array $pages ) {
+	protected function addToVotazioni ( array $pages ) {
 		$this->getLogger()->info(
 			'Adding the following to votes: ' . implode( ', ', $pages )
 		);
@@ -105,7 +105,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 = $this->getPage( $this->getOpt( 'news-page-title' ) );
 
@@ -118,7 +118,7 @@ 
 
 		$matches = $newsPage->getMatch( $reg );
 
-		$newNum = (int)$matches[2] + $amount;
+		$newNum = (int)$matches[ 2 ] + $amount;
 		$newContent = preg_replace( $reg, '${1}' . $newNum, $content );
 
 		$summary = $this->msg( 'news-page-summary' )

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 Wiki $wiki
 	 */
-	public function __construct( Logger $logger, Wiki $wiki ) {
+	public function __construct ( Logger $logger, Wiki $wiki ) {
 		$this->logger = $logger;
 		$this->wiki = $wiki;
 		$this->provider = new TaskDataProvider( $this->logger, $this->wiki );
@@ -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->wiki, $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->wiki, $this->provider );
 	}
 }

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 Wiki */
 	private $wiki;
 
@@ -22,7 +22,7 @@ 
 	 *
 	 * @param Wiki $wiki
 	 */
-	private function __construct( Wiki $wiki ) {
+	private function __construct ( Wiki $wiki ) {
 		$this->wiki = $wiki;
 	}
 
@@ -33,16 +33,16 @@ 
 	 * @param Wiki $wiki
 	 * @throws ConfigException
 	 */
-	public static function init( array $defaults, Wiki $wiki ) {
+	public static function init ( array $defaults, Wiki $wiki ) {
 		if ( self::$instance ) {
 			throw new ConfigException( 'Config was already initialized' );
 		}
 
 		$inst = new self( $wiki );
-		$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/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 Wiki $wiki
 	 */
-	public function __construct( Logger $logger, Wiki $wiki ) {
+	public function __construct ( Logger $logger, Wiki $wiki ) {
 		$this->logger = $logger;
 		$this->wiki = $wiki;
 	}
@@ -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->wiki );
@@ -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/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 Wiki $wiki
 	 */
-	public function __construct( Logger $logger, Wiki $wiki ) {
+	public function __construct ( Logger $logger, Wiki $wiki ) {
 		$this->setLogger( $logger );
 		$this->setConfig( Config::getInstance() );
 		$this->setWiki( $wiki );
@@ -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 Wiki
 	 */
-	protected function getWiki() : Wiki {
+	protected function getWiki () : Wiki {
 		return $this->wiki;
 	}
 
 	/**
 	 * @param Wiki $wiki
 	 */
-	protected function setWiki( Wiki $wiki ) {
+	protected function setWiki ( Wiki $wiki ) {
 		$this->wiki = $wiki;
 	}
 
@@ -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->getWiki() );
 	}
 }