Daimona / BotRiconferme

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;
 
@@ -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,16 +26,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
@@ -54,7 +54,7 @@ 
 	 * @param string $key
 	 * @return string
 	 */
-	public function getWikiMessage( string $key ) : string {
+	public function getWikiMessage ( string $key ) : string {
 		static $messages = null;
 		if ( $messages === null ) {
 			try {
@@ -65,7 +65,7 @@ 
 			}
 		}
 		// @phan-suppress-next-line PhanTypeArraySuspiciousNullable
-		return $messages[$key];
+		return $messages[ $key ];
 	}
 	/**
 	 * Set a config value.
@@ -73,7 +73,7 @@ 
 	 * @param string $key
 	 * @param mixed $value
 	 */
-	protected function set( string $key, $value ) {
+	protected function set ( string $key, $value ) {
 		$this->opts[ $key ] = $value;
 	}
 
@@ -83,7 +83,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' );
 		}
@@ -97,7 +97,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/Request/RequestBase.php

Spacing +22 added lines, -22 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -29,14 +29,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;
 	}
@@ -47,7 +47,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 {
@@ -61,7 +61,7 @@ 
 	 *
 	 * @return self For chaining
 	 */
-	public function setPost() : self {
+	public function setPost () : self {
 		$this->method = 'POST';
 		return $this;
 	}
@@ -72,7 +72,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;
 	}
@@ -82,14 +82,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 ) ) {
@@ -107,9 +107,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 );
 
@@ -125,17 +125,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;
 		}
 	}
@@ -146,7 +146,7 @@ 
 	 * @param \stdClass $res
 	 * @throws APIRequestException
 	 */
-	protected function handleErrorAndWarnings( $res ) {
+	protected function handleErrorAndWarnings ( $res ) {
 		if ( isset( $res->error ) ) {
 			switch ( $res->error->code ) {
 				case 'missingtitle':
@@ -172,7 +172,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 );
 
@@ -189,7 +189,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;
@@ -207,14 +207,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;
 	}
@@ -225,7 +225,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 = $this->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/Task/Subtask/Subtask.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task\Subtask;
 

includes/Task/Task.php

Spacing +4 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task;
 
@@ -14,13 +14,13 @@ 
 	 *
 	 * @return string[]
 	 */
-	abstract protected function getSubtasksMap() : array;
+	abstract protected function getSubtasksMap () : array;
 
 	/**
 	 * @param string $subtask Defined in self::SUBTASKS_MAP
 	 * @return TaskResult
 	 */
-	protected function runSubtask( string $subtask ) : TaskResult {
+	protected function runSubtask ( string $subtask ) : TaskResult {
 		$map = $this->getSubtasksMap();
 		if ( !isset( $map[ $subtask ] ) ) {
 			throw new \InvalidArgumentException( "'$subtask' is not a valid task." );
@@ -36,7 +36,7 @@ 
 	 * @param string $class
 	 * @return Subtask
 	 */
-	private function getSubtaskInstance( string $class ) : Subtask {
+	private function getSubtaskInstance ( string $class ) : Subtask {
 		return new $class( $this->getDataProvider() );
 	}
 }

includes/Bot.php

Spacing +5 added lines, -5 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 runTask( string $task ) {
+	public function runTask ( string $task ) {
 		$this->logger->info( "Starting single task $task." );
 		$manager = new TaskManager;
 		$res = $manager->run( TaskManager::MODE_TASK, $task );
@@ -52,7 +52,7 @@ 
 	 *
 	 * @param string $subtask
 	 */
-	public function runSubtask( string $subtask ) {
+	public function runSubtask ( string $subtask ) {
 		$this->logger->info( "Starting single subtask $subtask." );
 		$manager = new TaskManager;
 		$res = $manager->run( TaskManager::MODE_SUBTASK, $subtask );

includes/TaskManager.php

Spacing +9 added lines, -9 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -47,7 +47,7 @@ 
 	 * @param string|null $name Only used in MODE_TASK and MODE_SUBTASK
 	 * @return TaskResult
 	 */
-	public function run( int $mode, string $name = null ) : TaskResult {
+	public function run ( int $mode, string $name = null ) : TaskResult {
 		$this->provider = new TaskDataProvider;
 
 		if ( $mode === self::MODE_COMPLETE ) {
@@ -64,7 +64,7 @@ 
 	 *
 	 * @return TaskResult
 	 */
-	protected function runAllTasks() : TaskResult {
+	protected function runAllTasks () : TaskResult {
 		if ( self::getLastFullRunDate() === date( 'd/m/Y' ) ) {
 			// Really avoid executing twice the same day
 			return new TaskResult( TaskResult::STATUS_ERROR, [ 'A full run was already executed today.' ] );
@@ -95,7 +95,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." );
 		}
@@ -110,7 +110,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." );
 		}
@@ -124,7 +124,7 @@ 
 	 * @return string|null d/m/Y or null if no last run registered
 	 * @fixme Is this even necessary?
 	 */
-	public static function getLastFullRunDate() : ?string {
+	public static function getLastFullRunDate () : ?string {
 		if ( file_exists( self::LOG_FILE ) ) {
 			return file_get_contents( self::LOG_FILE ) ?: null;
 		} else {
@@ -138,7 +138,7 @@ 
 	 * @param string $class
 	 * @return Task
 	 */
-	private function getTaskInstance( string $class ) : Task {
+	private function getTaskInstance ( string $class ) : Task {
 		return new $class( $this->provider );
 	}
 
@@ -148,11 +148,11 @@ 
 	 * @param string $class
 	 * @return Subtask
 	 */
-	private function getSubtaskInstance( string $class ) : Subtask {
+	private function getSubtaskInstance ( string $class ) : Subtask {
 		return new $class( $this->provider );
 	}
 
-	public static function setLastFullRunDate() {
+	public static function setLastFullRunDate () {
 		file_put_contents( self::LOG_FILE, date( 'd/m/Y' ) );
 	}
 }

run.php

Spacing +4 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 /**
  * Entry point for the bot, called by CLI
  */
@@ -37,7 +37,7 @@ 
 
 /* URL (for debugging purpose) */
 $urlParam = getopt( '', [ 'force-url:' ] );
-$url = $urlParam['force-url'] ?? 'https://it.wikipedia.org/w/api.php';
+$url = $urlParam[ 'force-url' ] ?? 'https://it.wikipedia.org/w/api.php';
 
 define( 'DEFAULT_URL', $url );
 
@@ -87,9 +87,9 @@ 
 
 if ( count( $taskOpts ) === 2 ) {
 	throw new InvalidArgumentException( 'Cannot specify both task and subtask.' );
-} elseif ( isset( $taskOpts['task'] ) ) {
+} elseif ( isset( $taskOpts[ 'task' ] ) ) {
 	$bot->runTask( $taskOpts[ 'task' ] );
-} elseif ( isset( $taskOpts['subtask'] ) ) {
+} elseif ( isset( $taskOpts[ 'subtask' ] ) ) {
 	$bot->runSubtask( $taskOpts[ 'subtask' ] );
 } else {
 	$bot->run();

includes/TaskDataProvider.php

Spacing +18 added lines, -20 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -15,14 +15,14 @@ 
 	/** @var array[] */
 	private $allUsers;
 	/** @var PageRiconferma[] */
-	private $createdPages = [];
+	private $createdPages = [ ];
 
 	/**
 	 * Get the full content of the JSON users list
 	 *
 	 * @return array[]
 	 */
-	public function getUsersList() : array {
+	public function getUsersList () : array {
 		if ( $this->allUsers === null ) {
 			$this->getLogger()->debug( 'Retrieving users list' );
 			$this->allUsers = PageBotList::get()->getAdminsList();
@@ -36,9 +36,9 @@ 
 	 *
 	 * @return array[]
 	 */
-	public function getUsersToProcess() : array {
+	public function getUsersToProcess () : array {
 		if ( $this->processUsers === null ) {
-			$this->processUsers = [];
+			$this->processUsers = [ ];
 			foreach ( $this->getUsersList() as $user => $groups ) {
 				$timestamp = $this->getValidTimestamp( $groups );
 
@@ -60,13 +60,11 @@ 
 	 * @param array $groups
 	 * @return int
 	 */
-	private function getValidTimestamp( array $groups ) : int {
+	private function getValidTimestamp ( array $groups ) : int {
 		$checkuser = isset( $groups[ 'checkuser' ] ) ?
-			\DateTime::createFromFormat( 'd/m/Y', $groups[ 'checkuser' ] )->getTimestamp() :
-			0;
+			\DateTime::createFromFormat( 'd/m/Y', $groups[ 'checkuser' ] )->getTimestamp() : 0;
 		$bureaucrat = isset( $groups[ 'bureaucrat' ] ) ?
-			\DateTime::createFromFormat( 'd/m/Y', $groups[ 'bureaucrat' ] )->getTimestamp() :
-			0;
+			\DateTime::createFromFormat( 'd/m/Y', $groups[ 'bureaucrat' ] )->getTimestamp() : 0;
 
 		$timestamp = max( $bureaucrat, $checkuser );
 		if ( $timestamp === 0 ) {
@@ -80,7 +78,7 @@ 
 	 *
 	 * @return PageRiconferma[]
 	 */
-	public function getOpenPages() : array {
+	public function getOpenPages () : array {
 		static $list = null;
 		if ( $list === null ) {
 			$baseTitle = $this->getConfig()->get( 'ric-main-page' );
@@ -94,10 +92,10 @@ 
 
 			$res = RequestBase::newFromParams( $params )->execute();
 			$pages = $res->query->pages;
-			$list = [];
+			$list = [ ];
 			foreach ( reset( $pages )->templates as $page ) {
 				if ( preg_match( "!$baseTitle\/[^\/]+\/\d!", $page->title ) !== false ) {
-					$list[] = new PageRiconferma( $page->title );
+					$list[ ] = new PageRiconferma( $page->title );
 				}
 			}
 		}
@@ -110,14 +108,14 @@ 
 	 *
 	 * @return PageRiconferma[]
 	 */
-	public function getPagesToClose() : array {
+	public function getPagesToClose () : array {
 		static $list = null;
 		if ( $list === null ) {
 			$allPages = $this->getOpenPages();
-			$list = [];
+			$list = [ ];
 			foreach ( $allPages as $page ) {
 				if ( time() > $page->getEndTimestamp() ) {
-					$list[] = $page;
+					$list[ ] = $page;
 				}
 			}
 		}
@@ -129,21 +127,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;
 	}
 }