Daimona / BotRiconferme

includes/Wiki/Element.php

Spacing +5 added lines, -5 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki;
 
@@ -11,7 +11,7 @@ 
 	 *
 	 * @return string
 	 */
-	abstract public function getRegex() : string;
+	abstract public function getRegex () : string;
 
 	/**
 	 * Get a regex matching any element in the given array
@@ -20,10 +20,10 @@ 
 	 * @return string
 	 * @todo Is this the right place?
 	 */
-	public static function regexFromArray( array $elements ) : string {
-		$bits = [];
+	public static function regexFromArray ( array $elements ) : string {
+		$bits = [ ];
 		foreach ( $elements as $el ) {
-			$bits[] = $el->getRegex();
+			$bits[ ] = $el->getRegex();
 		}
 		return '(?:' . implode( '|', $bits ) . ')';
 	}

includes/Task/TaskBase.php

Spacing +10 added lines, -10 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task;
 
@@ -11,7 +11,7 @@ 
  */
 abstract class TaskBase extends ContextSource {
 	/** @var string[] */
-	protected $errors = [];
+	protected $errors = [ ];
 	/** @var TaskDataProvider */
 	protected $dataProvider;
 
@@ -20,14 +20,14 @@ 
 	 *
 	 * @param TaskDataProvider $dataProvider
 	 */
-	final public function __construct( TaskDataProvider $dataProvider ) {
+	final public function __construct ( TaskDataProvider $dataProvider ) {
 		set_exception_handler( [ $this, 'handleException' ] );
 		set_error_handler( [ $this, 'handleError' ] );
 		parent::__construct();
 		$this->dataProvider = $dataProvider;
 	}
 
-	public function __destruct() {
+	public function __destruct () {
 		restore_error_handler();
 		restore_exception_handler();
 	}
@@ -37,7 +37,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" );
@@ -68,14 +68,14 @@ 
 	 *
 	 * @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;
 
 	/**
 	 * Exception handler.
@@ -83,7 +83,7 @@ 
 	 * @param \Throwable $ex
 	 * @protected
 	 */
-	public function handleException( \Throwable $ex ) {
+	public function handleException ( \Throwable $ex ) {
 		$this->getLogger()->error(
 			( new \ReflectionClass( $ex ) )->getShortName() . ': ' .
 			$ex->getMessage() . "\nin " . $ex->getFile() . ' line ' .
@@ -101,14 +101,14 @@ 
 	 * @throws \ErrorException
 	 * @protected
 	 */
-	public function handleError( $errno, $errstr, $errfile, $errline ) {
+	public function handleError ( $errno, $errstr, $errfile, $errline ) {
 		throw new \ErrorException( $errstr, 0, $errno, $errfile, $errline );
 	}
 
 	/**
 	 * @return TaskDataProvider
 	 */
-	protected function getDataProvider() : TaskDataProvider {
+	protected function getDataProvider () : TaskDataProvider {
 		return $this->dataProvider;
 	}
 }

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.' );
@@ -54,10 +54,10 @@ 
 	 * @return int
 	 * @internal Only used as CB for cURL
 	 */
-	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 ];
 		}
 		// @phan-suppress-next-line PhanTypeMismatchReturn WTF? Why does phan thinks this is a string?
 		return strlen( $header );

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,12 +13,12 @@ 
 	/** @var self */
 	private static $instance;
 	/** @var array */
-	private $opts = [];
+	private $opts = [ ];
 
 	/**
 	 * Use self::init() and self::getInstance()
 	 */
-	private function __construct() {
+	private function __construct () {
 	}
 
 	/**
@@ -27,16 +27,16 @@ 
 	 * @param array $defaults
 	 * @throws ConfigException
 	 */
-	public static function init( array $defaults ) {
+	public static function init ( array $defaults ) {
 		if ( self::$instance ) {
 			throw new ConfigException( 'Config was already initialized' );
 		}
 
 		$inst = new self;
-		$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
@@ -56,7 +56,7 @@ 
 	 * @return string
 	 * @throws ConfigException
 	 */
-	public function getWikiMessage( string $key ) : string {
+	public function getWikiMessage ( string $key ) : string {
 		static $messages = null;
 		if ( $messages === null ) {
 			try {
@@ -69,7 +69,7 @@ 
 		if ( !isset( $messages[ $key ] ) ) {
 			throw new ConfigException( "Message '$key' does not exist." );
 		}
-		return $messages[$key];
+		return $messages[ $key ];
 	}
 	/**
 	 * Set a config value.
@@ -77,7 +77,7 @@ 
 	 * @param string $key
 	 * @param mixed $value
 	 */
-	protected function set( string $key, $value ) {
+	protected function set ( string $key, $value ) {
 		$this->opts[ $key ] = $value;
 	}
 
@@ -87,7 +87,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' );
 		}
@@ -101,7 +101,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 +6 added lines, -6 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -11,7 +11,7 @@ 
 
 	const VERSION = '1.0';
 
-	public function __construct() {
+	public function __construct () {
 		$this->logger = new Logger;
 	}
 
@@ -21,7 +21,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;
@@ -37,7 +37,7 @@ 
 	/**
 	 * Entry point for the whole process
 	 */
-	public function runAll() {
+	public function runAll () {
 		$this->run();
 	}
 
@@ -46,7 +46,7 @@ 
 	 *
 	 * @param string $task
 	 */
-	public function runTask( string $task ) {
+	public function runTask ( string $task ) {
 		$this->run( TaskManager::MODE_TASK, $task );
 	}
 
@@ -55,7 +55,7 @@ 
 	 *
 	 * @param string $subtask
 	 */
-	public function runSubtask( string $subtask ) {
+	public function runSubtask ( string $subtask ) {
 		$this->run( TaskManager::MODE_SUBTASK, $subtask );
 	}
 }

includes/Exception/PermissionDeniedException.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/Wiki/Page/PageBotList.php

Spacing +11 added lines, -13 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki\Page;
 
@@ -11,7 +11,7 @@ 
 	/**
 	 * @private Use self::get()
 	 */
-	public function __construct() {
+	public function __construct () {
 		parent::__construct( Config::getInstance()->get( 'list-title' ) );
 	}
 
@@ -20,7 +20,7 @@ 
 	 *
 	 * @return self
 	 */
-	public static function get() : self {
+	public static function get () : self {
 		static $instance = null;
 		if ( $instance === null ) {
 			$instance = new self;
@@ -32,7 +32,7 @@ 
 	 * @param string[] $groups
 	 * @return int|null
 	 */
-	public static function getOverrideTimestamp( array $groups ) : ?int {
+	public static function getOverrideTimestamp ( array $groups ) : ?int {
 		if ( array_intersect_key( $groups, [ 'override-perm' => true, 'override' => true ] ) ) {
 			// A one-time override takes precedence
 			$day = $groups[ 'override' ] ?? $groups[ 'override-perm' ];
@@ -48,17 +48,15 @@ 
 	 * @param array $groups
 	 * @return int
 	 */
-	public static function getValidFlagTimestamp( array $groups ): int {
-		$checkuser = isset( $groups['checkuser'] ) ?
-			\DateTime::createFromFormat( 'd/m/Y', $groups['checkuser'] )->getTimestamp() :
-			0;
-		$bureaucrat = isset( $groups['bureaucrat'] ) ?
-			\DateTime::createFromFormat( 'd/m/Y', $groups['bureaucrat'] )->getTimestamp() :
-			0;
+	public static function getValidFlagTimestamp ( array $groups ): int {
+		$checkuser = isset( $groups[ 'checkuser' ] ) ?
+			\DateTime::createFromFormat( 'd/m/Y', $groups[ 'checkuser' ] )->getTimestamp() : 0;
+		$bureaucrat = isset( $groups[ 'bureaucrat' ] ) ?
+			\DateTime::createFromFormat( 'd/m/Y', $groups[ 'bureaucrat' ] )->getTimestamp() : 0;
 
 		$timestamp = max( $bureaucrat, $checkuser );
 		if ( $timestamp === 0 ) {
-			$timestamp = \DateTime::createFromFormat( 'd/m/Y', $groups['sysop'] )->getTimestamp();
+			$timestamp = \DateTime::createFromFormat( 'd/m/Y', $groups[ 'sysop' ] )->getTimestamp();
 		}
 		return $timestamp;
 	}
@@ -68,7 +66,7 @@ 
 	 *
 	 * @return array[]
 	 */
-	public function getAdminsList() : array {
+	public function getAdminsList () : array {
 		return json_decode( $this->getContent(), true );
 	}
 }

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;
 	}
@@ -83,14 +83,14 @@ 
 	 *
 	 * @return \stdClass
 	 */
-	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 ) ) {
@@ -108,9 +108,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;
 		}
 		$params = http_build_query( $params );
 
@@ -126,17 +126,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 ) {
+	protected function setCookies ( array $cookies ) {
 		foreach ( $cookies as $cookie ) {
 			$bits = explode( ';', $cookie );
-			list( $name, $value ) = explode( '=', $bits[0] );
+			list( $name, $value ) = explode( '=', $bits[ 0 ] );
 			self::$cookiesToSet[ $name ] = $value;
 		}
 	}
@@ -147,7 +147,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;
@@ -170,7 +170,7 @@ 
 	 * @param \stdClass $res
 	 * @throws APIRequestException
 	 */
-	protected function handleErrorAndWarnings( \stdClass $res ) {
+	protected function handleErrorAndWarnings ( \stdClass $res ) {
 		if ( isset( $res->error ) ) {
 			throw $this->getException( $res );
 		} elseif ( isset( $res->warnings ) ) {
@@ -186,7 +186,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 );
 
@@ -203,7 +203,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;
@@ -221,14 +221,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;
 	}
@@ -239,7 +239,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/ContextSource.php

Spacing +10 added lines, -10 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -19,7 +19,7 @@ 
 	/** @var Controller */
 	private $controller;
 
-	public function __construct() {
+	public function __construct () {
 		$this->setLogger( new Logger );
 		$this->setConfig( Config::getInstance() );
 		$this->setController( new Controller );
@@ -28,14 +28,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;
 	}
 
@@ -45,35 +45,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 Controller
 	 */
-	protected function getController() : Controller {
+	protected function getController () : Controller {
 		return $this->controller;
 	}
 
 	/**
 	 * @param Controller $controller
 	 */
-	protected function setController( Controller $controller ) {
+	protected function setController ( Controller $controller ) {
 		$this->controller = $controller;
 	}
 
@@ -83,7 +83,7 @@ 
 	 * @param string $key
 	 * @return Message
 	 */
-	protected function msg( string $key ) : Message {
+	protected function msg ( string $key ) : Message {
 		return new Message( $key );
 	}
 }