Daimona / BotRiconferme

includes/TaskManager.php

Spacing +8 added lines, -8 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -62,7 +62,7 @@ 
 	 * @param MessageProvider $mp
 	 * @param PageBotList $pbl
 	 */
-	public function __construct(
+	public function __construct (
 		LoggerInterface $logger,
 		WikiGroup $wikiGroup,
 		MessageProvider $mp,
@@ -87,7 +87,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 {
 		if ( $mode === self::MODE_COMPLETE ) {
 			return $this->runAllTasks();
 		} elseif ( $name === null ) {
@@ -102,7 +102,7 @@ 
 	 *
 	 * @return TaskResult
 	 */
-	protected function runAllTasks() : TaskResult {
+	protected function runAllTasks () : TaskResult {
 		$orderedList = [
 			'update-list',
 			'start-new',
@@ -124,7 +124,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." );
 		}
@@ -138,7 +138,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." );
 		}
@@ -153,7 +153,7 @@ 
 	 * @param string $name
 	 * @return Task
 	 */
-	private function getTaskInstance( string $name ) : Task {
+	private function getTaskInstance ( string $name ) : Task {
 		$class = self::TASKS_MAP[ $name ];
 		/** @var Task $ret */
 		$ret = new $class(
@@ -172,7 +172,7 @@ 
 	 * @param string $class
 	 * @return Subtask
 	 */
-	private function getSubtaskInstance( string $class ) : Subtask {
+	private function getSubtaskInstance ( string $class ) : Subtask {
 		/** @var Subtask $ret */
 		$ret = new $class(
 			$this->logger,

includes/Request/RequestFactory.php

Spacing +3 added lines, -3 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -9,7 +9,7 @@ 
 	/**
 	 * @param string $domain
 	 */
-	public function __construct( string $domain ) {
+	public function __construct ( string $domain ) {
 		$this->domain = $domain;
 	}
 
@@ -17,7 +17,7 @@ 
 	 * @param array $params
 	 * @return RequestBase
 	 */
-	public function newFromParams( array $params ) : RequestBase {
+	public function newFromParams ( array $params ) : RequestBase {
 		if ( extension_loaded( 'curl' ) ) {
 			$ret = new CurlRequest( $params, $this->domain );
 		} else {

includes/ContextSource.php

Spacing +17 added lines, -17 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -36,7 +36,7 @@ 
 	 * @param MessageProvider $mp
 	 * @param PageBotList $pbl
 	 */
-	public function __construct(
+	public function __construct (
 		LoggerInterface $logger,
 		WikiGroup $wikiGroup,
 		MessageProvider $mp,
@@ -52,14 +52,14 @@ 
 	/**
 	 * @return LoggerInterface
 	 */
-	protected function getLogger() : LoggerInterface {
+	protected function getLogger () : LoggerInterface {
 		return $this->logger;
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	public function setLogger( LoggerInterface $logger ) : void {
+	public function setLogger ( LoggerInterface $logger ) : void {
 		$this->logger = $logger;
 	}
 
@@ -69,21 +69,21 @@ 
 	 * @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 ) : void {
+	protected function setConfig ( Config $cfg ) : void {
 		$this->config = $cfg;
 	}
 
@@ -91,35 +91,35 @@ 
 	 * Shorthand
 	 * @return Wiki
 	 */
-	protected function getWiki() : Wiki {
+	protected function getWiki () : Wiki {
 		return $this->getWikiGroup()->getMainWiki();
 	}
 
 	/**
 	 * @return WikiGroup
 	 */
-	protected function getWikiGroup() : WikiGroup {
+	protected function getWikiGroup () : WikiGroup {
 		return $this->wikiGroup;
 	}
 
 	/**
 	 * @param WikiGroup $wikiGroup
 	 */
-	protected function setWikiGroup( WikiGroup $wikiGroup ) : void {
+	protected function setWikiGroup ( WikiGroup $wikiGroup ) : void {
 		$this->wikiGroup = $wikiGroup;
 	}
 
 	/**
 	 * @return MessageProvider
 	 */
-	protected function getMessageProvider() : MessageProvider {
+	protected function getMessageProvider () : MessageProvider {
 		return $this->messageProvider;
 	}
 
 	/**
 	 * @param MessageProvider $mp
 	 */
-	protected function setMessageProvider( MessageProvider $mp ) : void {
+	protected function setMessageProvider ( MessageProvider $mp ) : void {
 		$this->messageProvider = $mp;
 	}
 
@@ -129,21 +129,21 @@ 
 	 * @param string $key
 	 * @return Message
 	 */
-	protected function msg( string $key ) : Message {
+	protected function msg ( string $key ) : Message {
 		return $this->messageProvider->getMessage( $key );
 	}
 
 	/**
 	 * @return PageBotList
 	 */
-	public function getBotList() : PageBotList {
+	public function getBotList () : PageBotList {
 		return $this->pageBotList;
 	}
 
 	/**
 	 * @return RequestFactory
 	 */
-	public function getRequestFactory() : RequestFactory {
+	public function getRequestFactory () : RequestFactory {
 		return $this->getWiki()->getRequestFactory();
 	}
 
@@ -153,7 +153,7 @@ 
 	 * @param string $title
 	 * @return Page
 	 */
-	protected function getPage( string $title ) : Page {
+	protected function getPage ( string $title ) : Page {
 		return new Page( $title, $this->getWiki() );
 	}
 
@@ -163,7 +163,7 @@ 
 	 * @param string $name
 	 * @return User
 	 */
-	protected function getUser( string $name ) : User {
+	protected function getUser ( string $name ) : User {
 		$ui = $this->getBotList()->getUserInfo( $name );
 		return new User( $ui, $this->getWiki() );
 	}

includes/Wiki/UserInfo.php

Spacing +8 added lines, -8 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki;
 
@@ -17,7 +17,7 @@ 
 	 * @param string $name
 	 * @param array $info
 	 */
-	public function __construct( string $name, array $info ) {
+	public function __construct ( string $name, array $info ) {
 		$this->name = $name;
 		$this->info = $info;
 	}
@@ -25,35 +25,35 @@ 
 	/**
 	 * @return string
 	 */
-	public function getName() : string {
+	public function getName () : string {
 		return $this->name;
 	}
 
 	/**
 	 * @return array
 	 */
-	public function getInfo() : array {
+	public function getInfo () : array {
 		return $this->info;
 	}
 
 	/**
 	 * @return array
 	 */
-	public function extractGroups() : array {
+	public function extractGroups () : array {
 		return array_keys( $this->extractGroupsWithDates() );
 	}
 
 	/**
 	 * @return array
 	 */
-	public function extractGroupsWithDates() : array {
+	public function extractGroupsWithDates () : array {
 		return array_intersect_key( $this->getInfo(), array_fill_keys( self::GROUP_KEYS, 1 ) );
 	}
 
 	/**
 	 * @return array
 	 */
-	public function getAliases() : array {
-		return $this->getInfo()['aliases'] ?? [];
+	public function getAliases () : array {
+		return $this->getInfo()[ 'aliases' ] ?? [ ];
 	}
 }

includes/Wiki/Page/Page.php

Spacing +17 added lines, -17 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki\Page;
 
@@ -21,7 +21,7 @@ 
 	 * @param string $title
 	 * @param Wiki $wiki For the site where the page lives
 	 */
-	public function __construct( string $title, Wiki $wiki ) {
+	public function __construct ( string $title, Wiki $wiki ) {
 		$this->wiki = $wiki;
 		$this->title = $title;
 	}
@@ -29,7 +29,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function getTitle() : string {
+	public function getTitle () : string {
 		return $this->title;
 	}
 
@@ -39,7 +39,7 @@ 
 	 * @param int|null $section A section number to retrieve the content of that section
 	 * @return string
 	 */
-	public function getContent( int $section = null ) : string {
+	public function getContent ( int $section = null ) : string {
 		if ( $this->content === null ) {
 			$this->content = $this->wiki->getPageContent( $this->title, $section );
 		}
@@ -52,18 +52,18 @@ 
 	 * @param array $params
 	 * @throws \LogicException
 	 */
-	public function edit( array $params ) : void {
+	public function edit ( array $params ) : void {
 		$params = [
 			'title' => $this->getTitle()
 		] + $params;
 
 		$this->wiki->editPage( $params );
-		if ( isset( $params['text'] ) ) {
-			$this->content = $params['text'];
-		} elseif ( isset( $params['appendtext'] ) ) {
-			$this->content .= $params['appendtext'];
-		} elseif ( isset( $params['prependtext'] ) ) {
-			$this->content = $params['prependtext'] . $this->content;
+		if ( isset( $params[ 'text' ] ) ) {
+			$this->content = $params[ 'text' ];
+		} elseif ( isset( $params[ 'appendtext' ] ) ) {
+			$this->content .= $params[ 'appendtext' ];
+		} elseif ( isset( $params[ 'prependtext' ] ) ) {
+			$this->content = $params[ 'prependtext' ] . $this->content;
 		} else {
 			throw new \LogicException(
 				'Unrecognized text param for edit. Params: ' . var_export( $params, true )
@@ -76,7 +76,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function exists() : bool {
+	public function exists () : bool {
 		$res = $this->wiki->getRequestFactory()->newFromParams( [
 			'action' => 'query',
 			'titles' => $this->getTitle()
@@ -91,7 +91,7 @@ 
 	 * @param string $regex
 	 * @return bool
 	 */
-	public function matches( string $regex ) : bool {
+	public function matches ( string $regex ) : bool {
 		return (bool)preg_match( $regex, $this->getContent() );
 	}
 
@@ -103,8 +103,8 @@ 
 	 * @return string[]
 	 * @throws MissingMatchException
 	 */
-	public function getMatch( string $regex ) : array {
-		$ret = [];
+	public function getMatch ( string $regex ) : array {
+		$ret = [ ];
 		if ( preg_match( $regex, $this->getContent(), $ret ) === 0 ) {
 			throw new MissingMatchException( "The content of $this does not match the given regex $regex" );
 		}
@@ -116,7 +116,7 @@ 
 	 *
 	 * @inheritDoc
 	 */
-	public function getRegex( string $delimiter = '/' ) : string {
+	public function getRegex ( string $delimiter = '/' ) : string {
 		return str_replace( ' ', '[ _]', preg_quote( $this->title, $delimiter ) );
 	}
 
@@ -125,7 +125,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function __toString() {
+	public function __toString () {
 		return $this->getTitle();
 	}
 }

includes/Wiki/Page/PageBotList.php

Spacing +25 added lines, -27 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki\Page;
 
@@ -19,7 +19,7 @@ 
 	 * @param string $listTitle
 	 * @param Wiki $wiki
 	 */
-	public function __construct( string $listTitle, Wiki $wiki ) {
+	public function __construct ( string $listTitle, Wiki $wiki ) {
 		parent::__construct( $listTitle, $wiki );
 	}
 
@@ -30,7 +30,7 @@ 
 	 * @param string $listTitle
 	 * @return self
 	 */
-	public static function get( Wiki $wiki, string $listTitle ) : self {
+	public static function get ( Wiki $wiki, string $listTitle ) : self {
 		static $instance = null;
 		if ( $instance === null ) {
 			$instance = new self( $listTitle, $wiki );
@@ -42,7 +42,7 @@ 
 	 * @param UserInfo $ui
 	 * @return int|null
 	 */
-	public function getOverrideTimestamp( UserInfo $ui ) : ?int {
+	public function getOverrideTimestamp ( UserInfo $ui ) : ?int {
 		$info = $ui->getInfo();
 		if ( !array_intersect_key( $info, [ 'override-perm' => true, 'override' => true ] ) ) {
 			return null;
@@ -50,9 +50,9 @@ 
 
 		// A one-time override takes precedence
 		if ( array_key_exists( 'override', $info ) ) {
-			$date = $info['override'];
+			$date = $info[ 'override' ];
 		} else {
-			$date = $info['override-prem'] . '/' . date( 'Y' );
+			$date = $info[ 'override-prem' ] . '/' . date( 'Y' );
 		}
 		return \DateTime::createFromFormat( 'd/m/Y', $date )->getTimestamp();
 	}
@@ -63,17 +63,17 @@ 
 	 * @param string $user
 	 * @return int
 	 */
-	public function getNextTimestamp( string $user ) : int {
+	public function getNextTimestamp ( string $user ) : int {
 		$userInfo = $this->getUserInfo( $user )->getInfo();
-		if ( isset( $userInfo['override-perm'] ) ) {
+		if ( isset( $userInfo[ 'override-perm' ] ) ) {
 			$date = \DateTime::createFromFormat(
 				'd/m/Y',
-				$userInfo['override-perm'] . '/' . date( 'Y' )
+				$userInfo[ 'override-perm' ] . '/' . date( 'Y' )
 			);
 		} else {
 			$date = null;
-			if ( isset( $userInfo['override'] ) ) {
-				$date = \DateTime::createFromFormat( 'd/m/Y', $userInfo['override'] );
+			if ( isset( $userInfo[ 'override' ] ) ) {
+				$date = \DateTime::createFromFormat( 'd/m/Y', $userInfo[ 'override' ] );
 			}
 			if ( !$date || $date <= new \DateTime ) {
 				$ts = self::getValidFlagTimestamp( $userInfo );
@@ -92,17 +92,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;
 	}
@@ -111,14 +109,14 @@ 
 	 * @param array $groups
 	 * @return bool
 	 */
-	public static function isOverrideExpired( array $groups ) : bool {
-		if ( !isset( $groups['override'] ) ) {
+	public static function isOverrideExpired ( array $groups ) : bool {
+		if ( !isset( $groups[ 'override' ] ) ) {
 			return false;
 		}
 
 		$flagTS = self::getValidFlagTimestamp( $groups );
 		$usualTS = strtotime( date( 'Y' ) . '-' . date( 'm-d', $flagTS ) );
-		$overrideTS = \DateTime::createFromFormat( 'd/m/Y', $groups['override'] )->getTimestamp();
+		$overrideTS = \DateTime::createFromFormat( 'd/m/Y', $groups[ 'override' ] )->getTimestamp();
 		$delay = 60 * 60 * 24 * 3;
 
 		return time() > $usualTS + $delay && time() > $overrideTS + $delay;
@@ -129,9 +127,9 @@ 
 	 *
 	 * @return UserInfo[]
 	 */
-	public function getAdminsList() : array {
+	public function getAdminsList () : array {
 		if ( $this->adminsList === null ) {
-			$this->adminsList = [];
+			$this->adminsList = [ ];
 			foreach ( $this->getDecodedContent() as $user => $info ) {
 				$this->adminsList[ $user ] = new UserInfo( $user, $info );
 			}
@@ -143,8 +141,8 @@ 
 	 * @param string $user
 	 * @return UserInfo
 	 */
-	public function getUserInfo( string $user ) : UserInfo {
-		return $this->getAdminsList()[$user];
+	public function getUserInfo ( string $user ) : UserInfo {
+		return $this->getAdminsList()[ $user ];
 	}
 
 	/**
@@ -152,7 +150,7 @@ 
 	 *
 	 * @return array[]
 	 */
-	public function getDecodedContent() : array {
+	public function getDecodedContent () : array {
 		return json_decode( $this->getContent(), true );
 	}
 }

includes/Wiki/User.php

Spacing +13 added lines, -13 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki;
 
@@ -21,7 +21,7 @@ 
 	 * @param UserInfo $ui
 	 * @param Wiki $wiki
 	 */
-	public function __construct( UserInfo $ui, Wiki $wiki ) {
+	public function __construct ( UserInfo $ui, Wiki $wiki ) {
 		$this->wiki = $wiki;
 		$this->name = $ui->getName();
 		$this->ui = $ui;
@@ -30,7 +30,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function getName() : string {
+	public function getName () : string {
 		return $this->name;
 	}
 
@@ -39,7 +39,7 @@ 
 	 *
 	 * @return string[]
 	 */
-	public function getGroups() : array {
+	public function getGroups () : array {
 		return $this->ui->extractGroups();
 	}
 
@@ -48,7 +48,7 @@ 
 	 *
 	 * @return string[] [ group => date ]
 	 */
-	public function getGroupsWithDates() : array {
+	public function getGroupsWithDates () : array {
 		return $this->ui->extractGroupsWithDates();
 	}
 
@@ -58,7 +58,7 @@ 
 	 * @param string $groupName
 	 * @return bool
 	 */
-	public function inGroup( string $groupName ) : bool {
+	public function inGroup ( string $groupName ) : bool {
 		return in_array( $groupName, $this->getGroups(), true );
 	}
 
@@ -67,9 +67,9 @@ 
 	 *
 	 * @inheritDoc
 	 */
-	public function getRegex( string $delimiter = '/' ) : string {
+	public function getRegex ( string $delimiter = '/' ) : string {
 		$bits = $this->getAliases();
-		$bits[] = $this->name;
+		$bits[ ] = $this->name;
 		$regexify = static function ( $el ) use ( $delimiter ) {
 			return str_replace( ' ', '[ _]', preg_quote( $el, $delimiter ) );
 		};
@@ -81,14 +81,14 @@ 
 	 *
 	 * @return string[]
 	 */
-	public function getAliases() : array {
+	public function getAliases () : array {
 		return $this->ui->getAliases();
 	}
 
 	/**
 	 * @return Page
 	 */
-	public function getTalkPage() : Page {
+	public function getTalkPage () : Page {
 		return new Page( "User talk:{$this->name}", $this->wiki );
 	}
 
@@ -96,7 +96,7 @@ 
 	 * Get the default base page, e.g. WP:A/Riconferma annuale/XXX
 	 * @return Page
 	 */
-	public function getBasePage() : Page {
+	public function getBasePage () : Page {
 		$prefix = Config::getInstance()->get( 'main-page-title' );
 		return new Page( "$prefix/$this", $this->wiki );
 	}
@@ -108,7 +108,7 @@ 
 	 * @throws MissingPageException
 	 * @return Page
 	 */
-	public function getExistingBasePage() : Page {
+	public function getExistingBasePage () : Page {
 		$basePage = $this->getBasePage();
 		if ( !$basePage->exists() ) {
 			$basePage = null;
@@ -132,7 +132,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function __toString() {
+	public function __toString () {
 		return $this->name;
 	}
 }

includes/Utils/IRegexAble.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Utils;
 
@@ -9,5 +9,5 @@ 
 	 * @param string $delimiter
 	 * @return string
 	 */
-	public function getRegex( string $delimiter ) : string;
+	public function getRegex ( string $delimiter ) : string;
 }

includes/Utils/RegexUtils.php

Spacing +4 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Utils;
 
@@ -10,13 +10,13 @@ 
 	 * @param IRegexAble ...$elements
 	 * @return string
 	 */
-	public static function regexFromArray(
+	public static function regexFromArray (
 		string $delimiter = '/',
 		IRegexAble ...$elements
 	) : string {
-		$bits = [];
+		$bits = [ ];
 		foreach ( $elements as $el ) {
-			$bits[] = $el->getRegex( $delimiter );
+			$bits[ ] = $el->getRegex( $delimiter );
 		}
 		return '(?:' . implode( '|', $bits ) . ')';
 	}