Daimona / BotRiconferme

includes/TaskResult.php

Spacing +9 added lines, -9 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -20,7 +20,7 @@ 
 	 * @param int $status One of the Task::STATUS_* constants
 	 * @param string[] $errors
 	 */
-	public function __construct( int $status, array $errors = [] ) {
+	public function __construct ( int $status, array $errors = [ ] ) {
 		$this->status = $status;
 		$this->errors = $errors;
 	}
@@ -28,21 +28,21 @@ 
 	/**
 	 * @return int
 	 */
-	public function getStatus() : int {
+	public function getStatus () : int {
 		return $this->status;
 	}
 
 	/**
 	 * @return string[]
 	 */
-	public function getErrors() {
+	public function getErrors () {
 		return $this->errors;
 	}
 
 	/**
 	 * @param TaskResult $that
 	 */
-	public function merge( TaskResult $that ) {
+	public function merge ( TaskResult $that ) {
 		$this->status |= $that->status;
 		$this->errors = array_merge( $this->errors, $that->errors );
 	}
@@ -50,15 +50,15 @@ 
 	/**
 	 * @return string
 	 */
-	public function __toString() {
+	public function __toString () {
 		if ( $this->isOK() ) {
 			$stat = 'OK';
 			$errs = "\tNo errors.";
 		} else {
 			$stat = 'ERROR';
-			$formattedErrs = [];
+			$formattedErrs = [ ];
 			foreach ( $this->errors as $err ) {
-				$formattedErrs[] = "\t - $err";
+				$formattedErrs[ ] = "\t - $err";
 			}
 			$errs = implode( "\n", $formattedErrs );
 		}
@@ -70,7 +70,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isOK() : bool {
+	public function isOK () : bool {
 		return $this->status === self::STATUS_OK;
 	}
 }

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;
 
@@ -11,7 +11,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	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.' );
@@ -53,10 +53,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/Request/RequestBase.php

Spacing +20 added lines, -20 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -29,7 +29,7 @@ 
 	/** @var string */
 	protected $method;
 	/** @var string[] */
-	protected $newCookies = [];
+	protected $newCookies = [ ];
 
 	/**
 	 * Use self::newFromParams, which will provide the right class to use
@@ -37,7 +37,7 @@ 
 	 * @param array $params
 	 * @param bool $isPOST
 	 */
-	protected function __construct( array $params, bool $isPOST = false ) {
+	protected function __construct ( array $params, bool $isPOST = false ) {
 		$this->params = [ 'format' => 'json' ] + $params;
 		$this->method = $isPOST ? 'POST' : 'GET';
 	}
@@ -49,7 +49,7 @@ 
 	 * @param bool $isPOST
 	 * @return self
 	 */
-	public static function newFromParams( array $params, bool $isPOST = false ) : self {
+	public static function newFromParams ( array $params, bool $isPOST = false ) : self {
 		if ( extension_loaded( 'curl' ) ) {
 			$ret = new CurlRequest( $params, $isPOST );
 		} else {
@@ -63,14 +63,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 ) ) {
@@ -88,9 +88,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 );
 
@@ -106,17 +106,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;
 		}
 	}
@@ -127,7 +127,7 @@ 
 	 * @param \stdClass $res
 	 * @throws APIRequestException
 	 */
-	protected function handleErrorAndWarnings( $res ) {
+	protected function handleErrorAndWarnings ( $res ) {
 		if ( isset( $res->error ) ) {
 			switch ( $res->error->code ) {
 				case 'missingtitle':
@@ -153,7 +153,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 );
 
@@ -170,7 +170,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;
@@ -193,14 +193,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;
 	}
@@ -211,7 +211,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/Request/NativeRequest.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;
 
@@ -9,7 +9,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	protected function reallyMakeRequest( string $params ) : string {
+	protected function reallyMakeRequest ( string $params ) : string {
 		$context = [
 			'http' => [
 				'method' => $this->method,
@@ -18,7 +18,7 @@ 
 		];
 		$url = self::$url;
 		if ( $this->method === 'POST' ) {
-			$context['http']['content'] = $params;
+			$context[ 'http' ][ 'content' ] = $params;
 		} else {
 			$url = "$url?$params";
 		}
@@ -27,8 +27,8 @@ 
 
 		foreach ( $http_response_header as $header ) {
 			$bits = explode( ':', $header, 2 );
-			if ( trim( $bits[0] ) === 'Set-Cookie' ) {
-				$this->newCookies[] = $bits[1];
+			if ( trim( $bits[ 0 ] ) === 'Set-Cookie' ) {
+				$this->newCookies[ ] = $bits[ 1 ];
 			}
 		}
 

includes/Config.php

Spacing +10 added lines, -10 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -12,12 +12,12 @@ 
 	/** @var self */
 	private static $instance;
 	/** @var array */
-	private $opts = [];
+	private $opts = [ ];
 
 	/**
 	 * Use self::init() and self::getInstance()
 	 */
-	private function __construct() {
+	private function __construct () {
 	}
 
 	/**
@@ -26,15 +26,15 @@ 
 	 * @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( 'username', $defaults['username'] );
-		$inst->set( 'password', $defaults['password'] );
+		$inst->set( 'list-title', $defaults[ 'list-title' ] );
+		$inst->set( 'username', $defaults[ 'username' ] );
+		$inst->set( 'password', $defaults[ 'password' ] );
 		self::$instance = $inst;
 
 		// On-wiki values
@@ -55,7 +55,7 @@ 
 	 * @param string $key
 	 * @param mixed $value
 	 */
-	protected function set( string $key, $value ) {
+	protected function set ( string $key, $value ) {
 		$this->opts[ $key ] = $value;
 	}
 
@@ -65,7 +65,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' );
 		}
@@ -79,7 +79,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 +4 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -11,14 +11,14 @@ 
 
 	const VERSION = 1.0;
 
-	public function __construct() {
+	public function __construct () {
 		$this->logger = new Logger;
 	}
 
 	/**
 	 * Entry point for the whole process
 	 */
-	public function run() {
+	public function run () {
 		$this->logger->info( 'Starting full process.' );
 		$manager = new TaskManager;
 		$res = $manager->run( TaskManager::MODE_COMPLETE );
@@ -35,7 +35,7 @@ 
 	 *
 	 * @param string $task
 	 */
-	public function runSingle( string $task ) {
+	public function runSingle ( string $task ) {
 		$this->logger->info( "Starting single task $task." );
 		$manager = new TaskManager;
 		$res = $manager->run( TaskManager::MODE_SINGLE, $task );

includes/Task/Task.php

Spacing +8 added lines, -8 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task;
 
@@ -14,7 +14,7 @@ 
 	const STATUS_OK = 0;
 	const STATUS_ERROR = 1;
 	/** @var string[] */
-	protected $errors = [];
+	protected $errors = [ ];
 	/** @var TaskDataProvider */
 	private $dataProvider;
 
@@ -23,14 +23,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();
 	}
@@ -40,7 +40,7 @@ 
 	 *
 	 * @return TaskResult
 	 */
-	abstract public function run() : TaskResult;
+	abstract public function run () : TaskResult;
 
 	/**
 	 * Exception handler.
@@ -48,7 +48,7 @@ 
 	 * @param \Throwable $ex
 	 * @protected
 	 */
-	public function handleException( \Throwable $ex ) {
+	public function handleException ( \Throwable $ex ) {
 		$this->getLogger()->error(
 			get_class( $ex ) . ': ' .
 			$ex->getMessage() . "\nTrace:\n" .
@@ -65,14 +65,14 @@ 
 	 * @param int $errline
 	 * @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/Exception/EditException.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/Task/UpdateList.php

Spacing +18 added lines, -18 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task;
 
@@ -18,7 +18,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function run() : TaskResult {
+	public function run () : TaskResult {
 		$this->getLogger()->info( 'Starting task UpdateList' );
 		$this->actualList = $this->getActualAdmins();
 		$this->botList = $this->getList();
@@ -53,7 +53,7 @@ 
 	/**
 	 * @return array
 	 */
-	protected function getActualAdmins() : array {
+	protected function getActualAdmins () : array {
 		$this->getLogger()->debug( 'Retrieving admins - API' );
 		$params = [
 			'action' => 'query',
@@ -71,8 +71,8 @@ 
 	 * @param \stdClass $data
 	 * @return array
 	 */
-	protected function extractAdmins( \stdClass $data ) : array {
-		$ret = [];
+	protected function extractAdmins ( \stdClass $data ) : array {
+		$ret = [ ];
 		$blacklist = $this->getConfig()->get( 'exclude-admins' );
 		foreach ( $data->query->allusers as $u ) {
 			if ( in_array( $u->name, $blacklist ) ) {
@@ -87,7 +87,7 @@ 
 	/**
 	 * @return array
 	 */
-	protected function getList() : array {
+	protected function getList () : array {
 		$this->getLogger()->debug( 'Retrieving admins - JSON list' );
 		$content = $this->getController()->getPageContent( $this->getConfig()->get( 'list-title' ) );
 
@@ -99,22 +99,22 @@ 
 	 *
 	 * @return array[]
 	 */
-	protected function getMissingGroups() : array {
-		$missing = [];
+	protected function getMissingGroups () : array {
+		$missing = [ ];
 		foreach ( $this->actualList as $adm => $groups ) {
-			$groupsList = [];
+			$groupsList = [ ];
 			if ( !isset( $this->botList[ $adm ] ) ) {
 				$groupsList = $groups;
-			} elseif ( count( $groups ) > count( $this->botList[$adm] ) ) {
+			} elseif ( count( $groups ) > count( $this->botList[ $adm ] ) ) {
 				// Only some groups are missing
-				$groupsList = array_diff_key( $groups, $this->botList[$adm] );
+				$groupsList = array_diff_key( $groups, $this->botList[ $adm ] );
 			}
 
 			foreach ( $groupsList as $group ) {
 				try {
 					$missing[ $adm ][ $group ] = $this->getFlagDate( $adm, $group );
 				} catch ( TaskException $e ) {
-					$this->errors[] = $e->getMessage();
+					$this->errors[ ] = $e->getMessage();
 				}
 			}
 		}
@@ -129,7 +129,7 @@ 
 	 * @return string
 	 * @throws TaskException
 	 */
-	protected function getFlagDate( string $admin, string $group ) : string {
+	protected function getFlagDate ( string $admin, string $group ) : string {
 		$this->getLogger()->info( "Retrieving $group flag date for $admin" );
 
 		if ( $group === 'checkuser' ) {
@@ -169,7 +169,7 @@ 
 	 * @param string $group
 	 * @return string|null
 	 */
-	private function extractTimestamp( \stdClass $data, string $group ) : ?string {
+	private function extractTimestamp ( \stdClass $data, string $group ) : ?string {
 		$ts = null;
 		foreach ( $data->query->logevents as $entry ) {
 			if ( !isset( $entry->params ) ) {
@@ -191,8 +191,8 @@ 
 	 *
 	 * @return array[]
 	 */
-	protected function getExtraGroups() : array {
-		$extra = [];
+	protected function getExtraGroups () : array {
+		$extra = [ ];
 		foreach ( $this->botList as $name => $groups ) {
 			if ( !isset( $this->actualList[ $name ] ) ) {
 				$extra[ $name ] = $groups;
@@ -208,7 +208,7 @@ 
 	 *
 	 * @param array $newContent
 	 */
-	protected function doUpdateList( array $newContent ) {
+	protected function doUpdateList ( array $newContent ) {
 		$this->getLogger()->info( 'Updating admin list' );
 
 		$params = [
@@ -227,7 +227,7 @@ 
 	 * @param array[] $extra
 	 * @return array[]
 	 */
-	protected function getNewContent( array $missing, array $extra ) : array {
+	protected function getNewContent ( array $missing, array $extra ) : array {
 		$newContent = $this->botList;
 		foreach ( $newContent as $user => $groups ) {
 			if ( isset( $missing[ $user ] ) ) {