Daimona / BotRiconferme

includes/CLI.php

Spacing +16 added lines, -16 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -66,14 +66,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 );
@@ -84,7 +84,7 @@ 
 	/**
 	 * @param string[] $opts
 	 */
-	private function checkRequiredOpts( array $opts ) : void {
+	private function checkRequiredOpts ( array $opts ) : void {
 		$missingOpts = array_diff( self::REQUIRED_OPTS, array_keys( $opts ) );
 		if ( $missingOpts ) {
 			$this->fatal( 'Required options missing: ' . implode( ', ', $missingOpts ) );
@@ -106,7 +106,7 @@ 
 	/**
 	 * @param string[] $opts
 	 */
-	private function checkConflictingOpts( array $opts ) : void {
+	private function checkConflictingOpts ( array $opts ) : void {
 		$this->checkNotBothSet( $opts, 'password', 'use-password-file' );
 		if ( array_key_exists( 'use-password-file', $opts ) && !file_exists( self::PASSWORD_FILE ) ) {
 			$this->fatal( 'Please create the password file (' . self::PASSWORD_FILE . ')' );
@@ -127,7 +127,7 @@ 
 	 * @param string $first
 	 * @param string $second
 	 */
-	private function checkNotBothSet( array $opts, string $first, string $second ) : void {
+	private function checkNotBothSet ( array $opts, string $first, string $second ) : void {
 		if ( array_key_exists( $first, $opts ) && array_key_exists( $second, $opts ) ) {
 			$this->fatal( "Can only use one of '$first' and '$second'" );
 		}
@@ -136,23 +136,23 @@ 
 	/**
 	 * @param string[] &$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' ] );
 		}
 		if ( array_key_exists( 'use-private-password-file', $opts ) ) {
 			$pw = trim( file_get_contents( self::PRIVATE_PASSWORD_FILE ) );
-			$opts['private-password'] = $pw;
-			unset( $opts['use-private-password-file'] );
+			$opts[ 'private-password' ] = $pw;
+			unset( $opts[ 'use-private-password-file' ] );
 		}
 	}
 
 	/**
 	 * @param string $msg
 	 */
-	private function fatal( string $msg ) : void {
+	private function fatal ( string $msg ) : void {
 		exit( $msg . "\n" );
 	}
 
@@ -161,14 +161,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 string[] Either [ 'tasks' => name1,... ] or [ 'subtasks' => name1,... ]
 	 */
-	public function getTaskOpt() : array {
+	public function getTaskOpt () : array {
 		return array_intersect_key(
 			$this->opts,
 			[ 'tasks' => true, 'subtasks' => true ]
@@ -178,7 +178,7 @@ 
 	/**
 	 * @return string|null
 	 */
-	public function getURL() : ?string {
+	public function getURL () : ?string {
 		return $this->getOpt( 'force-url' );
 	}
 }

includes/Bot.php

Spacing +12 added lines, -13 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -33,7 +33,7 @@ 
 	/**
 	 * @param CLI $cli
 	 */
-	public function __construct( CLI $cli ) {
+	public function __construct ( CLI $cli ) {
 		$this->cli = $cli;
 		$this->initialize();
 	}
@@ -41,7 +41,7 @@ 
 	/**
 	 * Initialize all members.
 	 */
-	private function initialize() : void {
+	private function initialize () : void {
 		$simpleLogger = new SimpleLogger();
 		$this->createWikiGroup( $simpleLogger );
 		$this->messageProvider = new MessageProvider(
@@ -55,14 +55,14 @@ 
 	/**
 	 * Main entry point
 	 */
-	public function run() : void {
+	public function run () : void {
 		$taskOpt = $this->cli->getTaskOpt();
 		$type = current( array_keys( $taskOpt ) );
 		try {
 			if ( $type === 'task' ) {
-				$this->runInternal( TaskManager::MODE_TASK, explode( ',', $taskOpt['tasks'] ) );
+				$this->runInternal( TaskManager::MODE_TASK, explode( ',', $taskOpt[ 'tasks' ] ) );
 			} elseif ( $type === 'subtask' ) {
-				$this->runInternal( TaskManager::MODE_SUBTASK, explode( ',', $taskOpt['subtasks'] ) );
+				$this->runInternal( TaskManager::MODE_SUBTASK, explode( ',', $taskOpt[ 'subtasks' ] ) );
 			} else {
 				$this->runInternal();
 			}
@@ -76,7 +76,7 @@ 
 	/**
 	 * @param LoggerInterface $baseLogger
 	 */
-	private function createWikiGroup( LoggerInterface $baseLogger ) : void {
+	private function createWikiGroup ( LoggerInterface $baseLogger ) : void {
 		// FIXME Hardcoded
 		$url = $this->cli->getURL() ?? 'https://it.wikipedia.org/w/api.php';
 		$localUserIdentifier = '@itwiki';
@@ -114,7 +114,7 @@ 
 	 *
 	 * @param IFlushingAwareLogger $baseLogger
 	 */
-	private function createMainLogger( IFlushingAwareLogger $baseLogger ) : void {
+	private function createMainLogger ( IFlushingAwareLogger $baseLogger ) : void {
 		$mainWiki = $this->wikiGroup->getMainWiki();
 		$mp = $this->messageProvider;
 		$errTitle = $this->cli->getOpt( 'error-title' );
@@ -141,7 +141,7 @@ 
 	/**
 	 * Create the Config
 	 */
-	private function initConfig() : void {
+	private function initConfig () : void {
 		$wiki = $this->wikiGroup->getMainWiki();
 		try {
 			$confValues = json_decode( $wiki->getPageContent( $this->cli->getOpt( 'config-title' ) ), true );
@@ -158,9 +158,9 @@ 
 	 * @param string $mode
 	 * @param string[] $taskNames
 	 */
-	private function runInternal(
+	private function runInternal (
 		string $mode = TaskManager::MODE_COMPLETE,
-		array $taskNames = []
+		array $taskNames = [ ]
 	) : void {
 		$activity = $mode === TaskManager::MODE_COMPLETE
 			? TaskManager::MODE_COMPLETE
@@ -180,8 +180,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->mainLogger->info( $base . $msg );
 		} else {
 			$this->mainLogger->error( "$base failed.\n$res" );