Daimona / BotRiconferme

includes/Wiki/Wiki.php

Spacing +21 added lines, -21 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki;
 
@@ -36,7 +36,7 @@ 
 	 * @param LoggerInterface $logger
 	 * @param RequestFactory $requestFactory
 	 */
-	public function __construct(
+	public function __construct (
 		LoginInfo $li,
 		LoggerInterface $logger,
 		RequestFactory $requestFactory
@@ -49,35 +49,35 @@ 
 	/**
 	 * @return LoginInfo
 	 */
-	public function getLoginInfo() : LoginInfo {
+	public function getLoginInfo () : LoginInfo {
 		return $this->loginInfo;
 	}
 
 	/**
 	 * @return RequestFactory
 	 */
-	public function getRequestFactory() : RequestFactory {
+	public function getRequestFactory () : RequestFactory {
 		return $this->requestFactory;
 	}
 
 	/**
 	 * @param string $prefix
 	 */
-	public function setPagePrefix( string $prefix ) : void {
+	public function setPagePrefix ( string $prefix ) : void {
 		$this->pagePrefix = $prefix;
 	}
 
 	/**
 	 * @param string $ident
 	 */
-	public function setLocalUserIdentifier( string $ident ) : void {
+	public function setLocalUserIdentifier ( string $ident ) : void {
 		$this->localUserIdentifier = $ident;
 	}
 
 	/**
 	 * @return string
 	 */
-	public function getLocalUserIdentifier() : string {
+	public function getLocalUserIdentifier () : string {
 		return $this->localUserIdentifier;
 	}
 
@@ -85,7 +85,7 @@ 
 	 * @param string $title
 	 * @param int|null $section
 	 */
-	private function logRead( string $title, int $section = null ) : void {
+	private function logRead ( string $title, int $section = null ) : void {
 		$fullTitle = $this->pagePrefix . $title;
 		$msg = "Retrieving content of $fullTitle" . ( $section !== null ? ", section $section" : '' );
 		$this->logger->info( $msg );
@@ -100,7 +100,7 @@ 
 	 * @throws MissingPageException
 	 * @throws MissingSectionException
 	 */
-	public function getPageContent( string $title, int $section = null ) : string {
+	public function getPageContent ( string $title, int $section = null ) : string {
 		$this->logRead( $title, $section );
 		$params = [
 			'action' => 'query',
@@ -111,7 +111,7 @@ 
 		];
 
 		if ( $section !== null ) {
-			$params['rvsection'] = $section;
+			$params[ 'rvsection' ] = $section;
 		}
 
 		$req = $this->buildRequest( $params );
@@ -120,7 +120,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 );
@@ -135,7 +135,7 @@ 
 	 * @phan-param array<int|string|bool> $params
 	 * @throws EditException
 	 */
-	public function editPage( array $params ) : void {
+	public function editPage ( array $params ) : void {
 		$this->login();
 
 		$params = [
@@ -144,7 +144,7 @@ 
 		] + $params;
 
 		if ( BOT_EDITS === true ) {
-			$params['bot'] = 1;
+			$params[ 'bot' ] = 1;
 		}
 
 		$res = $this->buildRequest( $params )->setPost()->executeSingle();
@@ -162,7 +162,7 @@ 
 	 * Login wrapper. Checks if we're already logged in and clears tokens cache
 	 * @throws LoginException
 	 */
-	public function login() : void {
+	public function login () : void {
 		if ( $this->loginInfo === null ) {
 			throw new CannotLoginException( 'Missing login data' );
 		}
@@ -192,7 +192,7 @@ 
 
 		$this->loggedIn = true;
 		// Clear tokens cache
-		$this->tokens = [];
+		$this->tokens = [ ];
 		$this->logger->info( 'Login succeeded' );
 	}
 
@@ -202,7 +202,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',
@@ -222,7 +222,7 @@ 
 	 * @param string $title
 	 * @return int
 	 */
-	public function getPageCreationTS( string $title ) : int {
+	public function getPageCreationTS ( string $title ) : int {
 		$params = [
 			'action' => 'query',
 			'prop' => 'revisions',
@@ -234,7 +234,7 @@ 
 		];
 
 		$page = $this->buildRequest( $params )->executeAsQuery()->current();
-		return strtotime( $page->revisions[0]->timestamp );
+		return strtotime( $page->revisions[ 0 ]->timestamp );
 	}
 
 	/**
@@ -243,7 +243,7 @@ 
 	 * @param string $title
 	 * @param string $reason
 	 */
-	public function protectPage( string $title, string $reason ) : void {
+	public function protectPage ( string $title, string $reason ) : void {
 		$fullTitle = $this->pagePrefix . $title;
 		$this->logger->info( "Protecting page $fullTitle" );
 		$this->login();
@@ -266,7 +266,7 @@ 
 	 * @param string $username
 	 * @param string $reason
 	 */
-	public function blockUser( string $username, string $reason ) : void {
+	public function blockUser ( string $username, string $reason ) : void {
 		$this->logger->info( "Blocking user $username" );
 		$this->login();
 
@@ -293,7 +293,7 @@ 
 	 * @phan-param array<int|string|bool> $params
 	 * @return RequestBase
 	 */
-	private function buildRequest( array $params ) : RequestBase {
+	private function buildRequest ( array $params ) : RequestBase {
 		return $this->requestFactory->newFromParams( $params );
 	}
 }

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();
 	}
@@ -64,17 +64,17 @@ 
 	 * @return int
 	 * @suppress PhanPluginComparisonObjectOrdering DateTime objects can be compared (phan issue #2907)
 	 */
-	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 );
@@ -94,17 +94,15 @@ 
 	 * @param string[] $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;
 	}
@@ -118,14 +116,14 @@ 
 	 * @param string[] $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;
@@ -136,9 +134,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 );
 			}
@@ -150,8 +148,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 ];
 	}
 
 	/**
@@ -159,7 +157,7 @@ 
 	 *
 	 * @return string[][]
 	 */
-	public function getDecodedContent() : array {
+	public function getDecodedContent () : array {
 		return json_decode( $this->getContent(), true );
 	}
 }

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 );
 		}
@@ -53,18 +53,18 @@ 
 	 * @phan-param array<int|string|bool> $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 )
@@ -77,7 +77,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function exists() : bool {
+	public function exists () : bool {
 		$pages = $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() : string {
+	public function __toString () : string {
 		return $this->getTitle();
 	}
 }

includes/Wiki/Page/PageRiconferma.php

Spacing +21 added lines, -21 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki\Page;
 
@@ -14,7 +14,7 @@ 
 	/** @var int */
 	private $opposeSection;
 	/** @var int[] Counts of votes for each section */
-	private $sectionCounts = [];
+	private $sectionCounts = [ ];
 
 	// Possible outcomes of a vote
 	public const OUTCOME_OK = 0;
@@ -33,7 +33,7 @@ 
 	 * because they can vary depending on whether the page is a vote, which is relatively
 	 * expensive to know since it requires parsing the content of the page.
 	 */
-	private function defineSections() : void {
+	private function defineSections () : void {
 		$this->supportSection = $this->isVote() ? 3 : 0;
 		$this->opposeSection = $this->isVote() ? 4 : 3;
 	}
@@ -43,8 +43,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getUserName() : string {
-		return explode( '/', $this->title )[2];
+	public function getUserName () : string {
+		return explode( '/', $this->title )[ 2 ];
 	}
 
 	/**
@@ -52,7 +52,7 @@ 
 	 *
 	 * @return int
 	 */
-	public function getNum() : int {
+	public function getNum () : int {
 		$bits = explode( '/', $this->getTitle() );
 		return (int)end( $bits );
 	}
@@ -62,8 +62,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getUserNum() : string {
-		return explode( '/', $this->getTitle(), 3 )[2];
+	public function getUserNum () : string {
+		return explode( '/', $this->getTitle(), 3 )[ 2 ];
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	 *
 	 * @return int
 	 */
-	public function getOpposingCount() : int {
+	public function getOpposingCount () : int {
 		$this->defineSections();
 		return $this->getCountForSection( $this->opposeSection );
 	}
@@ -82,7 +82,7 @@ 
 	 * @return int
 	 * @throws \BadMethodCallException
 	 */
-	public function getSupportCount() : int {
+	public function getSupportCount () : int {
 		if ( !$this->isVote() ) {
 			throw new \BadMethodCallException( 'Cannot get support for a non-vote page.' );
 		}
@@ -96,13 +96,13 @@ 
 	 * @param int $secNum
 	 * @return int
 	 */
-	protected function getCountForSection( int $secNum ) : int {
+	protected function getCountForSection ( int $secNum ) : int {
 		if ( !isset( $this->sectionCounts[ $secNum ] ) ) {
 			$content = $this->wiki->getPageContent( $this->title, $secNum );
 			// Let's hope that this is good enough...
-			$this->sectionCounts[$secNum] = preg_match_all( "/^# *(?![# *:]|\.\.\.$)/m", $content );
+			$this->sectionCounts[ $secNum ] = preg_match_all( "/^# *(?![# *:]|\.\.\.$)/m", $content );
 		}
-		return $this->sectionCounts[$secNum];
+		return $this->sectionCounts[ $secNum ];
 	}
 
 	/**
@@ -110,9 +110,9 @@ 
 	 *
 	 * @return int
 	 */
-	protected function getQuorum() : int {
+	protected function getQuorum () : int {
 		$reg = "!soddisfare il \[\[[^|\]]+\|quorum]] di '''(\d+) voti'''!";
-		return (int)$this->getMatch( $reg )[1];
+		return (int)$this->getMatch( $reg )[ 1 ];
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function hasOpposition() : bool {
+	public function hasOpposition () : bool {
 		return $this->getOpposingCount() >= self::REQUIRED_OPPOSE;
 	}
 
@@ -129,7 +129,7 @@ 
 	 *
 	 * @return int One of the OUTCOME_* constants
 	 */
-	public function getOutcome() : int {
+	public function getOutcome () : int {
 		if ( !$this->isVote() ) {
 			return self::OUTCOME_OK;
 		}
@@ -152,7 +152,7 @@ 
 	 * @throws \BadMethodCallException
 	 * @throws \LogicException
 	 */
-	public function getOutcomeText() : string {
+	public function getOutcomeText () : string {
 		if ( !$this->isVote() ) {
 			throw new \BadMethodCallException( 'No need for an outcome text.' );
 		}
@@ -186,7 +186,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isVote() : bool {
+	public function isVote () : bool {
 		$sectionReg = '/<!-- SEZIONE DA UTILIZZARE PER/';
 		return !$this->matches( $sectionReg );
 	}
@@ -196,7 +196,7 @@ 
 	 *
 	 * @return int
 	 */
-	public function getCreationTimestamp() : int {
+	public function getCreationTimestamp () : int {
 		return $this->wiki->getPageCreationTS( $this->title );
 	}
 
@@ -205,7 +205,7 @@ 
 	 *
 	 * @return int
 	 */
-	public function getEndTimestamp() : int {
+	public function getEndTimestamp () : int {
 		if ( $this->isVote() ) {
 			$reg = "!La votazione ha inizio il.+ alle ore ([\d:]+) e ha termine il (.+) alla stessa ora!";
 			[ , $hours, $day ] = $this->getMatch( $reg );

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;
 
@@ -22,7 +22,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;
@@ -31,7 +31,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function getName() : string {
+	public function getName () : string {
 		return $this->name;
 	}
 
@@ -40,7 +40,7 @@ 
 	 *
 	 * @return string[]
 	 */
-	public function getGroups() : array {
+	public function getGroups () : array {
 		return $this->ui->extractGroups();
 	}
 
@@ -49,7 +49,7 @@ 
 	 *
 	 * @return string[] [ group => date ]
 	 */
-	public function getGroupsWithDates() : array {
+	public function getGroupsWithDates () : array {
 		return $this->ui->extractGroupsWithDates();
 	}
 
@@ -59,7 +59,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 );
 	}
 
@@ -68,9 +68,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 ( string $el ) use ( $delimiter ) : string {
 			return str_replace( ' ', '[ _]', preg_quote( $el, $delimiter ) );
 		};
@@ -82,14 +82,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 );
 	}
 
@@ -97,7 +97,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 );
 	}
@@ -109,7 +109,7 @@ 
 	 * @throws MissingPageException
 	 * @return Page
 	 */
-	public function getExistingBasePage() : Page {
+	public function getExistingBasePage () : Page {
 		$basePage = $this->getBasePage();
 		if ( !$basePage->exists() ) {
 			$basePage = null;
@@ -133,7 +133,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function __toString() {
+	public function __toString () {
 		return $this->name;
 	}
 }

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;
 
@@ -21,7 +21,7 @@ 
 	 * @param array $info
 	 * @phan-param array<string,string|string[]> $info
 	 */
-	public function __construct( string $name, array $info ) {
+	public function __construct ( string $name, array $info ) {
 		$this->name = $name;
 		$this->info = $info;
 	}
@@ -29,7 +29,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function getName() : string {
+	public function getName () : string {
 		return $this->name;
 	}
 
@@ -37,28 +37,28 @@ 
 	 * @return array
 	 * @phan-return array<string,string|string[]>
 	 */
-	public function getInfo() : array {
+	public function getInfo () : array {
 		return $this->info;
 	}
 
 	/**
 	 * @return string[]
 	 */
-	public function extractGroups() : array {
+	public function extractGroups () : array {
 		return array_keys( $this->extractGroupsWithDates() );
 	}
 
 	/**
 	 * @return string[]
 	 */
-	public function extractGroupsWithDates() : array {
+	public function extractGroupsWithDates () : array {
 		return array_intersect_key( $this->getInfo(), array_fill_keys( self::GROUP_KEYS, 1 ) );
 	}
 
 	/**
 	 * @return string[]
 	 */
-	public function getAliases() : array {
-		return $this->getInfo()['aliases'] ?? [];
+	public function getAliases () : array {
+		return $this->getInfo()[ 'aliases' ] ?? [ ];
 	}
 }

includes/Task/UpdateList.php

Spacing +30 added lines, -30 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();
 		$pageBotList = $this->getBotList();
 		$this->botList = $pageBotList->getDecodedContent();
@@ -55,7 +55,7 @@ 
 	 * @return string[][]
 	 * @phan-return array<string,string[]>
 	 */
-	protected function getActualAdmins() : array {
+	protected function getActualAdmins () : array {
 		$params = [
 			'action' => 'query',
 			'list' => 'allusers',
@@ -73,8 +73,8 @@ 
 	 * @return string[][]
 	 * @phan-return array<string,string[]>
 	 */
-	protected function extractAdmins( Generator $data ) : array {
-		$ret = [];
+	protected function extractAdmins ( Generator $data ) : array {
+		$ret = [ ];
 		$blacklist = $this->getOpt( 'exclude-admins' );
 		foreach ( $data as $u ) {
 			if ( in_array( $u->name, $blacklist, true ) ) {
@@ -91,16 +91,16 @@ 
 	 *
 	 * @return string[][]
 	 */
-	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();
 				}
 			}
 		}
@@ -115,7 +115,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" );
 
 		$wiki = $this->getWiki();
@@ -150,7 +150,7 @@ 
 	 * @param string $group
 	 * @return string|null
 	 */
-	private function extractTimestamp( Generator $data, string $group ) : ?string {
+	private function extractTimestamp ( Generator $data, string $group ) : ?string {
 		$ts = null;
 		foreach ( $data as $entry ) {
 			if (
@@ -169,8 +169,8 @@ 
 	 *
 	 * @return string[][]
 	 */
-	protected function getExtraGroups() : array {
-		$extra = [];
+	protected function getExtraGroups () : array {
+		$extra = [ ];
 		foreach ( $this->botList as $name => $groups ) {
 			$groups = array_diff_key( $groups, array_fill_keys( PageBotList::NON_GROUP_KEYS, 1 ) );
 			if ( !isset( $this->actualList[ $name ] ) ) {
@@ -186,7 +186,7 @@ 
 	 * @param string[] $names
 	 * @return Generator
 	 */
-	private function getRenameEntries( array $names ) : Generator {
+	private function getRenameEntries ( array $names ) : Generator {
 		$titles = array_map( static function ( string $x ) : string {
 			return "Utente:$x";
 		}, $names );
@@ -210,14 +210,14 @@ 
 	 * @param string[] $names
 	 * @return string[] [ old_name => new_name ]
 	 */
-	protected function getRenamedUsers( array $names ) : array {
+	protected function getRenamedUsers ( array $names ) : array {
 		if ( !$names ) {
-			return [];
+			return [ ];
 		}
 		$this->getLogger()->info( 'Checking rename for ' . implode( ', ', $names ) );
 
 		$data = $this->getRenameEntries( $names );
-		$ret = [];
+		$ret = [ ];
 		foreach ( $data as $entry ) {
 			// 1 month is arbitrary
 			if ( strtotime( $entry->timestamp ) > strtotime( '-1 month' ) ) {
@@ -235,18 +235,18 @@ 
 	 * @param string[][] &$newContent
 	 * @param string[][] $removed
 	 */
-	private function handleRenames( array &$newContent, array $removed ) : void {
+	private function handleRenames ( array &$newContent, array $removed ) : void {
 		$renameMap = $this->getRenamedUsers( array_keys( $removed ) );
 		foreach ( $removed as $oldName => $info ) {
 			if (
 				array_key_exists( $oldName, $renameMap ) &&
-				array_key_exists( $renameMap[$oldName], $newContent )
+				array_key_exists( $renameMap[ $oldName ], $newContent )
 			) {
 				// This user was renamed! Add this name as alias, if they're still listed
 				$newName = $renameMap[ $oldName ];
 				$this->getLogger()->info( "Found rename $oldName -> $newName" );
-				$aliases = array_unique( array_merge( $newContent[ $newName ]['aliases'], [ $oldName ] ) );
-				$newContent[ $newName ]['aliases'] = $aliases;
+				$aliases = array_unique( array_merge( $newContent[ $newName ][ 'aliases' ], [ $oldName ] ) );
+				$newContent[ $newName ][ 'aliases' ] = $aliases;
 				// Transfer overrides to the new name.
 				$overrides = array_diff_key( $info, [ 'override' => 1, 'override-perm' => 1 ] );
 				$newContent[ $newName ] = array_merge( $newContent[ $newName ], $overrides );
@@ -260,12 +260,12 @@ 
 	 * @param string[][] $extra
 	 * @return string[][] Removed users
 	 */
-	private function handleExtraAndMissing(
+	private function handleExtraAndMissing (
 		array &$newContent,
 		array $missing,
 		array $extra
 	) : array {
-		$removed = [];
+		$removed = [ ];
 		foreach ( $newContent as $user => $groups ) {
 			if ( isset( $missing[ $user ] ) ) {
 				$newContent[ $user ] = array_merge( $groups, $missing[ $user ] );
@@ -275,7 +275,7 @@ 
 				if ( array_diff_key( $newGroups, array_fill_keys( PageBotList::NON_GROUP_KEYS, 1 ) ) ) {
 					$newContent[ $user ] = $newGroups;
 				} else {
-					$removed[$user] = $newContent[$user];
+					$removed[ $user ] = $newContent[ $user ];
 					unset( $newContent[ $user ] );
 				}
 			}
@@ -292,7 +292,7 @@ 
 	 * @param string[][] $extra
 	 * @return array[]
 	 */
-	protected function getNewContent( array $missing, array $extra ) : array {
+	protected function getNewContent ( array $missing, array $extra ) : array {
 		$newContent = $this->botList;
 
 		$removed = $this->handleExtraAndMissing( $newContent, $missing, $extra );
@@ -311,12 +311,12 @@ 
 	 *
 	 * @param array[] &$newContent
 	 */
-	protected function removeOverrides( array &$newContent ) : void {
-		$removed = [];
+	protected function removeOverrides ( array &$newContent ) : void {
+		$removed = [ ];
 		foreach ( $newContent as $user => $groups ) {
 			if ( PageBotList::isOverrideExpired( $groups ) ) {
 				unset( $newContent[ $user ][ 'override' ] );
-				$removed[] = $user;
+				$removed[ ] = $user;
 			}
 		}
 

includes/Task/Subtask/SimpleUpdates.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\Subtask;
 
@@ -14,7 +14,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function runInternal() : int {
+	public function runInternal () : int {
 		$pages = $this->getDataProvider()->getPagesToClose();
 
 		if ( !$pages ) {
@@ -36,15 +36,15 @@ 
 	 * @param PageRiconferma[] $pages
 	 * @see OpenUpdates::addToVotazioni()
 	 */
-	protected function updateVotazioni( array $pages ) : void {
+	protected function updateVotazioni ( array $pages ) : void {
 		$this->getLogger()->info(
 			'Updating votazioni: ' . implode( ', ', $pages )
 		);
 		$votePage = $this->getPage( $this->getOpt( 'vote-page-title' ) );
 
-		$users = [];
+		$users = [ ];
 		foreach ( $pages as $page ) {
-			$users[] = $this->getUser( $page->getUserName() );
+			$users[ ] = $this->getUser( $page->getUserName() );
 		}
 		$usersReg = RegexUtils::regexFromArray( '!', ...$users );
 
@@ -65,7 +65,7 @@ 
 	 * @param PageRiconferma[] $pages
 	 * @see OpenUpdates::addToNews()
 	 */
-	protected function updateNews( array $pages ) : void {
+	protected function updateNews ( array $pages ) : void {
 		$simpleAmount = $voteAmount = 0;
 		foreach ( $pages as $page ) {
 			if ( $page->isVote() ) {
@@ -85,8 +85,8 @@ 
 		$simpleMatches = $newsPage->getMatch( $simpleReg );
 		$voteMatches = $newsPage->getMatch( $voteReg );
 
-		$newSimp = ( (int)$simpleMatches[2] - $simpleAmount ) ?: '';
-		$newVote = ( (int)$voteMatches[2] - $voteAmount ) ?: '';
+		$newSimp = ( (int)$simpleMatches[ 2 ] - $simpleAmount ) ?: '';
+		$newVote = ( (int)$voteMatches[ 2 ] - $voteAmount ) ?: '';
 		$newContent = preg_replace( $simpleReg, '${1}' . $newSimp, $newsPage->getContent() );
 		$newContent = preg_replace( $voteReg, '${1}' . $newVote, $newContent );
 
@@ -104,12 +104,12 @@ 
 	 *
 	 * @param bool[] $outcomes
 	 */
-	protected function updateAdminList( array $outcomes ) : void {
+	protected function updateAdminList ( array $outcomes ) : void {
 		$this->getLogger()->info( 'Updating admin list' );
 		$adminsPage = $this->getPage( $this->getOpt( 'admins-list-title' ) );
 		$newContent = $adminsPage->getContent();
 
-		$riconfNames = $removeNames = [];
+		$riconfNames = $removeNames = [ ];
 		foreach ( $outcomes as $username => $confirmed ) {
 			$user = $this->getUser( $username );
 			$userReg = $user->getRegex( '!' );
@@ -124,10 +124,10 @@ 
 					'${1}{{subst:#timel:Ymd}}|' . $nextDate . '$2',
 					$newContent
 				);
-				$riconfNames[] = $username;
+				$riconfNames[ ] = $username;
 			} else {
 				$newContent = preg_replace( $reg, '', $newContent );
-				$removeNames[] = $username;
+				$removeNames[ ] = $username;
 			}
 		}
 
@@ -147,21 +147,21 @@ 
 	/**
 	 * @param bool[] $outcomes
 	 */
-	protected function updateCUList( array $outcomes ) : void {
+	protected function updateCUList ( array $outcomes ) : void {
 		$this->getLogger()->info( 'Updating CU list.' );
 		$cuList = $this->getPage( $this->getOpt( 'cu-list-title' ) );
 		$newContent = $cuList->getContent();
 
-		$riconfNames = $removeNames = [];
+		$riconfNames = $removeNames = [ ];
 		foreach ( $outcomes as $user => $confirmed ) {
 			$userReg = $this->getUser( $user )->getRegex( '!' );
 			$reg = "!(\{\{ *Checkuser *\| *$userReg *\|[^}]+\| *)[\w \d]+(}}.*\n)!";
 			if ( $confirmed ) {
 				$newContent = preg_replace( $reg, '${1}{{subst:#time:j F Y}}$2', $newContent );
-				$riconfNames[] = $user;
+				$riconfNames[ ] = $user;
 			} else {
 				$newContent = preg_replace( $reg, '', $newContent );
-				$removeNames[] = $user;
+				$removeNames[ ] = $user;
 			}
 		}
 
@@ -185,8 +185,8 @@ 
 	 * @param PageRiconferma[] $pages
 	 * @return bool[]
 	 */
-	private function getGroupOutcomes( string $group, array $pages ) : array {
-		$ret = [];
+	private function getGroupOutcomes ( string $group, array $pages ) : array {
+		$ret = [ ];
 		foreach ( $pages as $page ) {
 			$user = $this->getUser( $page->getUserName() );
 			if ( $user->inGroup( $group ) ) {

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;
 
@@ -39,7 +39,7 @@ 
 	/** @var string */
 	protected $method = self::METHOD_GET;
 	/** @var string[] */
-	protected $newCookies = [];
+	protected $newCookies = [ ];
 
 	/**
 	 * @private Use RequestFactory
@@ -48,7 +48,7 @@ 
 	 * @phan-param array<int|string|bool> $params
 	 * @param string $domain
 	 */
-	public function __construct( array $params, string $domain ) {
+	public function __construct ( array $params, string $domain ) {
 		$this->params = [ 'format' => 'json' ] + $params;
 		$this->url = $domain;
 	}
@@ -58,7 +58,7 @@ 
 	 *
 	 * @return self For chaining
 	 */
-	public function setPost() : self {
+	public function setPost () : self {
 		$this->method = self::METHOD_POST;
 		return $this;
 	}
@@ -67,12 +67,12 @@ 
 	 * Execute a query request
 	 * @return Generator
 	 */
-	public function executeAsQuery() : Generator {
-		if ( ( $this->params['action'] ?? false ) !== 'query' ) {
+	public function executeAsQuery () : Generator {
+		if ( ( $this->params[ 'action' ] ?? false ) !== 'query' ) {
 			throw new BadMethodCallException( 'Not an ApiQuery!' );
 		}
 		// TODO Is this always correct?
-		$key = $this->params['list'] ?? 'pages';
+		$key = $this->params[ 'list' ] ?? 'pages';
 		$curParams = $this->params;
 		$lim = $this->parseLimit();
 		do {
@@ -101,7 +101,7 @@ 
 	 * Execute a request that doesn't need any continuation.
 	 * @return stdClass
 	 */
-	public function executeSingle() : stdClass {
+	public function executeSingle () : stdClass {
 		$curParams = $this->params;
 		$res = $this->makeRequestInternal( $curParams );
 		$this->handleErrorAndWarnings( $res );
@@ -111,7 +111,7 @@ 
 	/**
 	 * @return int
 	 */
-	private function parseLimit() : int {
+	private function parseLimit () : int {
 		foreach ( $this->params as $name => $val ) {
 			if ( substr( $name, -strlen( 'limit' ) ) === 'limit' ) {
 				return $val === 'max' ? -1 : (int)$val;
@@ -128,7 +128,7 @@ 
 	 * @param string $resKey
 	 * @return int|null
 	 */
-	private function countQueryResults( stdClass $res, string $resKey ) : ?int {
+	private function countQueryResults ( stdClass $res, string $resKey ) : ?int {
 		if ( !isset( $res->query->$resKey ) ) {
 			return null;
 		}
@@ -156,9 +156,9 @@ 
 	 * @phan-param array<int|string|bool> $params
 	 * @return stdClass
 	 */
-	private function makeRequestInternal( array $params ) : stdClass {
+	private function makeRequestInternal ( array $params ) : stdClass {
 		if ( $this->method === self::METHOD_POST ) {
-			$params['maxlag'] = self::MAXLAG;
+			$params[ 'maxlag' ] = self::MAXLAG;
 		}
 		$query = http_build_query( $params );
 
@@ -174,17 +174,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 string[] $cookies
 	 */
-	protected function setCookies( array $cookies ) : void {
+	protected function setCookies ( array $cookies ) : void {
 		foreach ( $cookies as $cookie ) {
 			$bits = explode( ';', $cookie );
-			[ $name, $value ] = explode( '=', $bits[0] );
+			[ $name, $value ] = explode( '=', $bits[ 0 ] );
 			self::$cookiesToSet[ $name ] = $value;
 		}
 	}
@@ -195,7 +195,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;
@@ -221,7 +221,7 @@ 
 	 * @param stdClass $res
 	 * @throws APIRequestException
 	 */
-	protected function handleErrorAndWarnings( stdClass $res ) : void {
+	protected function handleErrorAndWarnings ( stdClass $res ) : void {
 		if ( isset( $res->error ) ) {
 			throw $this->getException( $res );
 		}
@@ -237,14 +237,14 @@ 
 	 *
 	 * @return string[]
 	 */
-	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;
 	}
@@ -255,7 +255,7 @@ 
 	 * @param string[] $headers
 	 * @return string
 	 */
-	protected function buildHeadersString( array $headers ) : string {
+	protected function buildHeadersString ( array $headers ) : string {
 		$ret = '';
 		foreach ( $headers as $header ) {
 			$ret .= "$header\r\n";