Daimona / BotRiconferme

includes/TaskManager.php

Spacing +7 added lines, -7 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -52,7 +52,7 @@ 
 	 * @param string|null $name Only used in MODE_TASK and MODE_SUBTASK
 	 * @return TaskResult
 	 */
-	public function run( string $mode, string $name = null ) : TaskResult {
+	public function run ( string $mode, string $name = null ) : TaskResult {
 		$this->provider = new TaskDataProvider;
 
 		if ( $mode === self::MODE_COMPLETE ) {
@@ -69,7 +69,7 @@ 
 	 *
 	 * @return TaskResult
 	 */
-	protected function runAllTasks() : TaskResult {
+	protected function runAllTasks () : TaskResult {
 		$orderedList = [
 			'update-list',
 			'start-new',
@@ -91,7 +91,7 @@ 
 	 * @param string $name
 	 * @return TaskResult
 	 */
-	protected function runTask( string $name ) : TaskResult {
+	protected function runTask ( string $name ) : TaskResult {
 		if ( !isset( self::TASKS_MAP[ $name ] ) ) {
 			throw new \InvalidArgumentException( "'$name' is not a valid task." );
 		}
@@ -106,7 +106,7 @@ 
 	 * @param string $name
 	 * @return TaskResult
 	 */
-	protected function runSubtask( string $name ) : TaskResult {
+	protected function runSubtask ( string $name ) : TaskResult {
 		if ( !isset( self::SUBTASKS_MAP[ $name ] ) ) {
 			throw new \InvalidArgumentException( "'$name' is not a valid subtask." );
 		}
@@ -121,7 +121,7 @@ 
 	 * @param string $class
 	 * @return Task
 	 */
-	private function getTaskInstance( string $class ) : Task {
+	private function getTaskInstance ( string $class ) : Task {
 		return new $class( $this->provider );
 	}
 
@@ -131,7 +131,7 @@ 
 	 * @param string $class
 	 * @return Subtask
 	 */
-	private function getSubtaskInstance( string $class ) : Subtask {
+	private function getSubtaskInstance ( string $class ) : Subtask {
 		return new $class( $this->provider );
 	}
 }

includes/Logger.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -11,7 +11,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function log( $level, $message, array $context = [] ) {
+	public function log ( $level, $message, array $context = [ ] ) {
 		printf( "%s [%s] - %s\n", date( 'd M H:i:s' ), $level, $message );
 	}
 }

includes/Message.php

Spacing +11 added lines, -11 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -28,7 +28,7 @@ 
 	/**
 	 * @param string $key
 	 */
-	public function __construct( string $key ) {
+	public function __construct ( string $key ) {
 		$this->key = $key;
 		$this->value = Config::getInstance()->getWikiMessage( $key );
 	}
@@ -37,7 +37,7 @@ 
 	 * @param array $args
 	 * @return self
 	 */
-	public function params( array $args ) : self {
+	public function params ( array $args ) : self {
 		$this->value = strtr( $this->value, $args );
 		return $this;
 	}
@@ -45,7 +45,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function text() : string {
+	public function text () : string {
 		$this->parsePlurals();
 		return $this->value;
 	}
@@ -53,7 +53,7 @@ 
 	/**
 	 * Replace {{$plur|<amount>|sing|plur}}
 	 */
-	protected function parsePlurals() {
+	protected function parsePlurals () {
 		$reg = '!\{\{\$plur\|(?P<amount>\d+)\|(?P<sing>[^}|]+)\|(?P<plur>[^|}]+)}}!';
 
 		if ( preg_match( $reg, $this->value ) === 0 ) {
@@ -62,7 +62,7 @@ 
 		$this->value = preg_replace_callback(
 			$reg,
 			function ( $matches ) {
-				return intval( $matches['amount'] ) > 1 ? trim( $matches['plur'] ) : trim( $matches['sing'] );
+				return intval( $matches[ 'amount' ] ) > 1 ? trim( $matches[ 'plur' ] ) : trim( $matches[ 'sing' ] );
 			},
 			$this->value
 		);
@@ -74,7 +74,7 @@ 
 	 * @param int $timestamp
 	 * @return string
 	 */
-	public static function getTimeWithArticle( int $timestamp ) : string {
+	public static function getTimeWithArticle ( int $timestamp ) : string {
 		$oldLoc = setlocale( LC_TIME, 'it_IT', 'Italian_Italy', 'Italian' );
 		$timeString = strftime( '%e %B alle %R', $timestamp );
 		// Remove the left space if day has a single digit
@@ -91,7 +91,7 @@ 
 	 * @param string $timeString
 	 * @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 ),
@@ -110,12 +110,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;
 		}
@@ -123,7 +123,7 @@ 
 		return $ret;
 	}
 
-	public function __toString() {
+	public function __toString () {
 		return $this->text();
 	}
 }

includes/TaskDataProvider.php

Spacing +15 added lines, -15 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -14,16 +14,16 @@ 
 	/** @var array[] */
 	private $processUsers;
 	/** @var PageRiconferma[] */
-	private $createdPages = [];
+	private $createdPages = [ ];
 
 	/**
 	 * Get a list of users to execute tasks on.
 	 *
 	 * @return array[]
 	 */
-	public function getUsersToProcess() : array {
+	public function getUsersToProcess () : array {
 		if ( $this->processUsers === null ) {
-			$this->processUsers = [];
+			$this->processUsers = [ ];
 			foreach ( PageBotList::get()->getAdminsList() as $user => $groups ) {
 				if ( $this->shouldAddUser( $groups ) ) {
 					$this->processUsers[ $user ] = $groups;
@@ -40,7 +40,7 @@ 
 	 * @param string[] $groups
 	 * @return bool
 	 */
-	private function shouldAddUser( array $groups ) : bool {
+	private function shouldAddUser ( array $groups ) : bool {
 		$override = true;
 		$timestamp = PageBotList::getOverrideTimestamp( $groups );
 
@@ -59,10 +59,10 @@ 
 	 *
 	 * @return PageRiconferma[]
 	 */
-	public function getOpenPages() : array {
+	public function getOpenPages () : array {
 		static $list = null;
 		if ( $list === null ) {
-			$list = [];
+			$list = [ ];
 			$mainTitle = $this->getConfig()->get( 'main-page-title' );
 			$params = [
 				'action' => 'query',
@@ -76,7 +76,7 @@ 
 			$pages = RequestBase::newFromParams( $params )->execute()->query->pages;
 			foreach ( reset( $pages )->templates as $page ) {
 				if ( preg_match( "!$titleReg\/[^\/]+\/\d!", $page->title ) ) {
-					$list[] = new PageRiconferma( $page->title );
+					$list[ ] = new PageRiconferma( $page->title );
 				}
 			}
 		}
@@ -89,13 +89,13 @@ 
 	 *
 	 * @return PageRiconferma[]
 	 */
-	public function getPagesToClose() : array {
+	public function getPagesToClose () : array {
 		static $list = null;
 		if ( $list === null ) {
-			$list = [];
+			$list = [ ];
 			foreach ( $this->getOpenPages() as $page ) {
 				if ( time() > $page->getEndTimestamp() ) {
-					$list[] = $page;
+					$list[ ] = $page;
 				}
 			}
 		}
@@ -107,21 +107,21 @@ 
 	 *
 	 * @param string $name
 	 */
-	public function removeUser( string $name ) {
+	public function removeUser ( string $name ) {
 		unset( $this->processUsers[ $name ] );
 	}
 
 	/**
 	 * @return PageRiconferma[]
 	 */
-	public function getCreatedPages() : array {
+	public function getCreatedPages () : array {
 		return $this->createdPages;
 	}
 
 	/**
 	 * @param PageRiconferma $page
 	 */
-	public function addCreatedPages( PageRiconferma $page ) {
-		$this->createdPages[] = $page;
+	public function addCreatedPages ( PageRiconferma $page ) {
+		$this->createdPages[ ] = $page;
 	}
 }

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/UpdateList.php

Spacing +20 added lines, -20 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task;
 
@@ -19,15 +19,15 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	protected function getSubtasksMap(): array {
+	protected function getSubtasksMap (): array {
 		// Everything is done here.
-		return [];
+		return [ ];
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	public function runInternal() : int {
+	public function runInternal () : int {
 		$this->actualList = $this->getActualAdmins();
 		$this->botList = PageBotList::get()->getAdminsList();
 
@@ -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 ) ) {
@@ -89,16 +89,16 @@ 
 	 *
 	 * @return array[]
 	 */
-	protected function getMissingGroups() : array {
-		$missing = [];
+	protected function getMissingGroups () : array {
+		$missing = [ ];
 		foreach ( $this->actualList as $adm => $groups ) {
-			$curMissing = array_diff( $groups, array_keys( $this->botList[$adm] ?? [] ) );
+			$curMissing = array_diff( $groups, array_keys( $this->botList[ $adm ] ?? [ ] ) );
 
 			foreach ( $curMissing as $group ) {
 				try {
 					$missing[ $adm ][ $group ] = $this->getFlagDate( $adm, $group );
 				} catch ( TaskException $e ) {
-					$this->errors[] = $e->getMessage();
+					$this->errors[ ] = $e->getMessage();
 				}
 			}
 		}
@@ -113,7 +113,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" );
 
 		$url = DEFAULT_URL;
@@ -148,7 +148,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 ) ) {
@@ -167,8 +167,8 @@ 
 	 *
 	 * @return array[]
 	 */
-	protected function getExtraGroups() : array {
-		$extra = [];
+	protected function getExtraGroups () : array {
+		$extra = [ ];
 		foreach ( $this->botList as $name => $groups ) {
 			// These are not groups
 			unset( $groups[ 'override' ], $groups[ 'override-perm' ] );
@@ -188,7 +188,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 ] ) ) {
@@ -213,15 +213,15 @@ 
 	 * @param array[] $newContent
 	 * @return array[]
 	 */
-	protected function removeOverrides( array $newContent ) : array {
-		$removed = [];
+	protected function removeOverrides ( array $newContent ) : array {
+		$removed = [ ];
 		foreach ( $newContent as $user => $groups ) {
 			$ts = PageBotList::getValidFlagTimestamp( $groups );
-			if ( isset( $groups['override'] ) && ( date( 'd/m', $ts ) ===
+			if ( isset( $groups[ 'override' ] ) && ( date( 'd/m', $ts ) ===
 				date( 'd/m', strtotime( '- 1 days' ) ) )
 			) {
 				unset( $newContent[ $user ][ 'override' ] );
-				$removed[] = $user;
+				$removed[ ] = $user;
 			}
 		}
 

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/Wiki/Controller.php

Spacing +12 added lines, -12 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki;
 
@@ -27,7 +27,7 @@ 
 	/**
 	 * @param string $domain The URL of the wiki, if different from default
 	 */
-	public function __construct( string $domain = DEFAULT_URL ) {
+	public function __construct ( string $domain = DEFAULT_URL ) {
 		$this->logger = new Logger;
 		$this->domain = $domain;
 	}
@@ -41,7 +41,7 @@ 
 	 * @throws MissingPageException
 	 * @throws MissingSectionException
 	 */
-	public function getPageContent( string $title, int $section = null ) : string {
+	public function getPageContent ( string $title, int $section = null ) : string {
 		$msg = "Retrieving content of page $title" . ( $section !== null ? ", section $section" : '' );
 		$this->logger->debug( $msg );
 		$params = [
@@ -53,7 +53,7 @@ 
 		];
 
 		if ( $section !== null ) {
-			$params['rvsection'] = $section;
+			$params[ 'rvsection' ] = $section;
 		}
 
 		$req = RequestBase::newFromParams( $params )->setUrl( $this->domain );
@@ -63,7 +63,7 @@ 
 			throw new MissingPageException( $title );
 		}
 
-		$mainSlot = $page->revisions[0]->slots->main;
+		$mainSlot = $page->revisions[ 0 ]->slots->main;
 
 		if ( $section !== null && isset( $mainSlot->nosuchsection ) ) {
 			throw new MissingSectionException( $title, $section );
@@ -77,7 +77,7 @@ 
 	 * @param array $params
 	 * @throws EditException
 	 */
-	public function editPage( array $params ) {
+	public function editPage ( array $params ) {
 		$this->login();
 
 		$params = [
@@ -104,7 +104,7 @@ 
 	 * Login wrapper. Checks if we're already logged in and clears tokens cache
 	 * @throws LoginException
 	 */
-	public function login() {
+	public function login () {
 		if ( self::$loggedIn ) {
 			return;
 		}
@@ -130,7 +130,7 @@ 
 
 		self::$loggedIn = true;
 		// Clear tokens cache
-		$this->tokens = [];
+		$this->tokens = [ ];
 		$this->logger->info( 'Login succeeded' );
 	}
 
@@ -140,7 +140,7 @@ 
 	 * @param string $type
 	 * @return string
 	 */
-	public function getToken( string $type ) : string {
+	public function getToken ( string $type ) : string {
 		if ( !isset( $this->tokens[ $type ] ) ) {
 			$params = [
 				'action' => 'query',
@@ -163,7 +163,7 @@ 
 	 * @param string $title
 	 * @return int
 	 */
-	public function getPageCreationTS( string $title ) : int {
+	public function getPageCreationTS ( string $title ) : int {
 		$params = [
 			'action' => 'query',
 			'prop' => 'revisions',
@@ -176,7 +176,7 @@ 
 
 		$res = RequestBase::newFromParams( $params )->setUrl( $this->domain )->execute();
 		$data = $res->query->pages;
-		return strtotime( reset( $data )->revisions[0]->timestamp );
+		return strtotime( reset( $data )->revisions[ 0 ]->timestamp );
 	}
 
 	/**
@@ -185,7 +185,7 @@ 
 	 * @param string $title
 	 * @param string $reason
 	 */
-	public function protectPage( string $title, string $reason ) {
+	public function protectPage ( string $title, string $reason ) {
 		$this->logger->info( "Protecting page $title" );
 		$this->login();
 

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 );