Daimona / BotRiconferme

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 ) {
+	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 );
 		} else {
 			$this->logger->error( "$base failed.\n$res" );
@@ -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/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 ) {
+	protected function getFormattedMessage ( string $level, string $message ) {
 		return sprintf( "%s [%s] - %s", date( 'd M H:i:s' ), $level, $message );
 	}
 }

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/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 = [] ) {
+	public function log ( $level, $message, array $context = [ ] ) {
 		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 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/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' );
 	}
 }