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;
 
@@ -65,14 +65,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 );
@@ -83,7 +83,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 ) );
@@ -105,7 +105,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 . ')' );
@@ -126,7 +126,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'" );
 		}
@@ -135,23 +135,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" );
 	}
 
@@ -160,14 +160,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 [ 'task' => taskname ] or [ 'subtask' => subtaskname ]
 	 */
-	public function getTaskOpt() : array {
+	public function getTaskOpt () : array {
 		return array_intersect_key(
 			$this->opts,
 			[ 'task' => true, 'subtask' => true ]
@@ -177,7 +177,7 @@ 
 	/**
 	 * @return string|null
 	 */
-	public function getURL() : ?string {
+	public function getURL () : ?string {
 		return $this->getOpt( 'force-url' );
 	}
 }

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

includes/Logger/MultiLogger.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;
 
@@ -14,7 +14,7 @@ 
 	/**
 	 * @param IFlushingAwareLogger ...$loggers
 	 */
-	public function __construct( IFlushingAwareLogger ...$loggers ) {
+	public function __construct ( IFlushingAwareLogger ...$loggers ) {
 		$this->loggers = $loggers;
 	}
 
@@ -22,7 +22,7 @@ 
 	 * @inheritDoc
 	 * @suppress PhanUnusedPublicMethodParameter,PhanPluginUnknownArrayMethodParamType
 	 */
-	public function log( $level, $message, array $context = [] ) :void {
+	public function log ( $level, $message, array $context = [ ] ) :void {
 		foreach ( $this->loggers as $logger ) {
 			$logger->log( $level, $message );
 		}
@@ -31,7 +31,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,PhanPluginUnknownArrayMethodParamType
 	 */
-	public function log( $level, $message, array $context = [] ) : void {
+	public function log ( $level, $message, array $context = [ ] ) : void {
 		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/Message/Message.php

Spacing +10 added lines, -10 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Message;
 
@@ -23,7 +23,7 @@ 
 	/**
 	 * @param string $value
 	 */
-	public function __construct( string $value ) {
+	public function __construct ( string $value ) {
 		$this->value = $value;
 	}
 
@@ -32,7 +32,7 @@ 
 	 * @phan-param list<int|string> $args
 	 * @return self
 	 */
-	public function params( array $args ) : self {
+	public function params ( array $args ) : self {
 		$this->value = strtr( $this->value, $args );
 		return $this;
 	}
@@ -40,7 +40,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function text() : string {
+	public function text () : string {
 		$this->parsePlurals();
 		return $this->value;
 	}
@@ -48,7 +48,7 @@ 
 	/**
 	 * Replace {{$plur|<amount>|sing|plur}}
 	 */
-	protected function parsePlurals() : void {
+	protected function parsePlurals () : void {
 		$reg = '!\{\{\$plur\|(?P<amount>\d+)\|(?P<sing>[^}|]+)\|(?P<plur>[^|}]+)}}!';
 
 		if ( preg_match( $reg, $this->value ) === 0 ) {
@@ -61,7 +61,7 @@ 
 			 * @return string
 			 */
 			static function ( array $matches ) : string {
-				return (int)$matches['amount'] > 1 ? trim( $matches['plur'] ) : trim( $matches['sing'] );
+				return (int)$matches[ 'amount' ] > 1 ? trim( $matches[ 'plur' ] ) : trim( $matches[ 'sing' ] );
 			},
 			$this->value
 		);
@@ -73,7 +73,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 ),
@@ -92,12 +92,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;
 		}
@@ -105,7 +105,7 @@ 
 		return $ret;
 	}
 
-	public function __toString() {
+	public function __toString () {
 		return $this->text();
 	}
 }

includes/Config.php

Spacing +7 added lines, -7 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -11,12 +11,12 @@ 
 	/** @var self */
 	private static $instance;
 	/** @var string[] */
-	private $opts = [];
+	private $opts = [ ];
 
 	/**
 	 * Use self::init() and self::getInstance()
 	 */
-	private function __construct() {
+	private function __construct () {
 	}
 
 	/**
@@ -25,7 +25,7 @@ 
 	 * @param string[] $confValues
 	 * @throws ConfigException
 	 */
-	public static function init( array $confValues ) : void {
+	public static function init ( array $confValues ) : void {
 		if ( self::$instance ) {
 			throw new ConfigException( 'Config was already initialized' );
 		}
@@ -44,7 +44,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;
 	}
 
@@ -54,7 +54,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' );
 		}
@@ -68,7 +68,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." );
 		}