Daimona / BotRiconferme

includes/Logger/LoggerTrait.php

Spacing +3 added lines, -3 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Logger;
 
@@ -11,7 +11,7 @@ 
 	 * @param string $level
 	 * @return int
 	 */
-	protected function levelToInt( string $level ) : int {
+	protected function levelToInt ( string $level ) : int {
 		// Order matters
 		$mapping = [
 			LogLevel::DEBUG,
@@ -31,7 +31,7 @@ 
 	 * @param string $message
 	 * @return string
 	 */
-	protected function getFormattedMessage( string $level, string $message ) : string {
+	protected function getFormattedMessage ( string $level, string $message ) : string {
 		return sprintf( '%s [%s] - %s', date( 'd M H:i:s' ), $level, $message );
 	}
 }

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;
 
@@ -26,7 +26,7 @@ 
 	 * @param Page $logPage
 	 * @param string $minlevel
 	 */
-	public function __construct( Page $logPage, $minlevel = LogLevel::INFO ) {
+	public function __construct ( Page $logPage, $minlevel = LogLevel::INFO ) {
 		$this->minLevel = $this->levelToInt( $minlevel );
 		$this->logPage = $logPage;
 	}
@@ -35,16 +35,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";
 	}
@@ -52,7 +52,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function flush() : void {
+	public function flush () : void {
 		if ( $this->buffer ) {
 			$this->logPage->edit( [
 				'appendtext' => $this->getOutput(),

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;
 
@@ -20,7 +20,7 @@ 
 	 * @param LoggerInterface $logger
 	 * @param Wiki $wiki
 	 */
-	public function __construct( LoggerInterface $logger, Wiki $wiki ) {
+	public function __construct ( LoggerInterface $logger, Wiki $wiki ) {
 		$this->logger = $logger;
 		$this->wiki = $wiki;
 	}
@@ -31,7 +31,7 @@ 
 	 * @param string $mode
 	 * @param string|null $name
 	 */
-	private function run( string $mode = TaskManager::MODE_COMPLETE, string $name = null ) : void {
+	private function run ( string $mode = TaskManager::MODE_COMPLETE, string $name = null ) : void {
 		$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 );
 		} else {
 			$this->logger->error( "$base failed.\n$res" );
@@ -50,7 +49,7 @@ 
 	/**
 	 * Entry point for the whole process
 	 */
-	public function runAll() : void {
+	public function runAll () : void {
 		$this->run();
 	}
 
@@ -59,7 +58,7 @@ 
 	 *
 	 * @param string $task
 	 */
-	public function runTask( string $task ) : void {
+	public function runTask ( string $task ) : void {
 		$this->run( TaskManager::MODE_TASK, $task );
 	}
 
@@ -68,7 +67,7 @@ 
 	 *
 	 * @param string $subtask
 	 */
-	public function runSubtask( string $subtask ) : void {
+	public function runSubtask ( string $subtask ) : void {
 		$this->run( TaskManager::MODE_SUBTASK, $subtask );
 	}
 }

includes/CLI.php

Spacing +13 added lines, -13 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' ] );
 		}
 	}
 
@@ -120,7 +120,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 )
@@ -132,14 +132,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 ]
@@ -149,7 +149,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;
 		}
 		$query = 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 ) : void {
+	protected function setCookies ( array $cookies ) : void {
 		foreach ( $cookies as $cookie ) {
 			$bits = explode( ';', $cookie );
-			[ $name, $value ] = explode( '=', $bits[0] );
+			[ $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 ) : void {
+	protected function handleErrorAndWarnings ( \stdClass $res ) : void {
 		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/Exception/MissingMatchException.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Exception;
 

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;
 
@@ -21,7 +21,7 @@ 
 	/** @var self */
 	private static $instance;
 	/** @var array */
-	private $opts = [];
+	private $opts = [ ];
 	/** @var array|null Lazy-loaded to avoid unnecessary requests */
 	private $messages;
 	/** @var Wiki */
@@ -32,7 +32,7 @@ 
 	 *
 	 * @param Wiki $wiki
 	 */
-	private function __construct( Wiki $wiki ) {
+	private function __construct ( Wiki $wiki ) {
 		$this->wiki = $wiki;
 	}
 
@@ -43,16 +43,16 @@ 
 	 * @param Wiki $wiki
 	 * @throws ConfigException
 	 */
-	public static function init( array $defaults, Wiki $wiki ) : void {
+	public static function init ( array $defaults, Wiki $wiki ) : void {
 		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' ] );
 
 		// On-wiki values
 		try {
@@ -72,7 +72,7 @@ 
 	 * @return string
 	 * @throws ConfigException
 	 */
-	public function getWikiMessage( string $key ) : string {
+	public function getWikiMessage ( string $key ) : string {
 		if ( $this->messages === null ) {
 			try {
 				$cont = $this->wiki->getPageContent( $this->opts[ 'msg-title' ] );
@@ -84,7 +84,7 @@ 
 		if ( !isset( $this->messages[ $key ] ) ) {
 			throw new ConfigException( "Message '$key' does not exist." );
 		}
-		return $this->messages[$key];
+		return $this->messages[ $key ];
 	}
 
 	/**
@@ -93,7 +93,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;
 	}
 
@@ -103,7 +103,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' );
 		}
@@ -117,7 +117,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." );
 		}