Daimona / BotRiconferme

src/Wiki/Wiki.php

Spacing +22 added lines, -22 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki;
 
@@ -31,14 +31,14 @@ 
 	/** @var string Used for logging */
 	private $pagePrefix = '';
 	/** @var string[] */
-	private $cookies = [];
+	private $cookies = [ ];
 
 	/**
 	 * @param LoginInfo $li
 	 * @param LoggerInterface $logger
 	 * @param RequestFactory $requestFactory
 	 */
-	public function __construct(
+	public function __construct (
 		LoginInfo $li,
 		LoggerInterface $logger,
 		RequestFactory $requestFactory
@@ -51,35 +51,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;
 	}
 
@@ -87,7 +87,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 );
@@ -102,7 +102,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',
@@ -113,7 +113,7 @@ 
 		];
 
 		if ( $section !== null ) {
-			$params['rvsection'] = $section;
+			$params[ 'rvsection' ] = $section;
 		}
 
 		$req = $this->buildRequest( $params );
@@ -122,7 +122,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 );
@@ -137,7 +137,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 = [
@@ -146,7 +146,7 @@ 
 		] + $params;
 
 		if ( BOT_EDITS === true ) {
-			$params['bot'] = 1;
+			$params[ 'bot' ] = 1;
 		}
 
 		$res = $this->buildRequest( $params )->setPost()->executeSingle();
@@ -164,7 +164,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' );
 		}
@@ -194,7 +194,7 @@ 
 
 		$this->loggedIn = true;
 		// Clear tokens cache
-		$this->tokens = [];
+		$this->tokens = [ ];
 		$this->logger->info( 'Login succeeded' );
 	}
 
@@ -204,7 +204,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',
@@ -224,7 +224,7 @@ 
 	 * @param string $title
 	 * @return int
 	 */
-	public function getPageCreationTS( string $title ): int {
+	public function getPageCreationTS ( string $title ): int {
 		$params = [
 			'action' => 'query',
 			'prop' => 'revisions',
@@ -236,7 +236,7 @@ 
 		];
 
 		$page = $this->buildRequest( $params )->executeAsQuery()->current();
-		return strtotime( $page->revisions[0]->timestamp );
+		return strtotime( $page->revisions[ 0 ]->timestamp );
 	}
 
 	/**
@@ -245,7 +245,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();
@@ -268,7 +268,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();
 
@@ -295,7 +295,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->createRequest(
 			$params,
 			$this->cookies,

src/Request/NativeRequest.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 @@ 
 	/**
 	 * @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 === self::METHOD_POST ) {
-			$context['http']['content'] = $params;
+			$context[ 'http' ][ 'content' ] = $params;
 		} else {
 			$url = "$url?$params";
 		}

src/Request/CurlRequest.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;
 
@@ -13,7 +13,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.' );
@@ -59,7 +59,7 @@ 
 	 * @internal Only used as CB for cURL (CURLOPT_HEADERFUNCTION)
 	 * @suppress PhanUnreferencedPublicMethod,PhanUnusedPublicNoOverrideMethodParameter
 	 */
-	public function headersHandler( $ch, string $header ): int {
+	public function headersHandler ( $ch, string $header ): int {
 		$this->handleResponseHeader( $header );
 		return strlen( $header );
 	}

src/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;
 
@@ -18,7 +18,7 @@ 
 	 * @param string $listTitle
 	 * @param Wiki $wiki
 	 */
-	private function __construct( string $listTitle, Wiki $wiki ) {
+	private function __construct ( string $listTitle, Wiki $wiki ) {
 		parent::__construct( $listTitle, $wiki );
 	}
 
@@ -29,7 +29,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 );
@@ -41,7 +41,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;
@@ -49,9 +49,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,18 +63,18 @@ 
 	 * @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();
 		$now = new DateTime();
-		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 <= $now ) {
 				$ts = self::getValidFlagTimestamp( $userInfo );
@@ -95,17 +95,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;
 	}
@@ -119,14 +117,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;
@@ -137,9 +135,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 );
 			}
@@ -151,8 +149,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 ];
 	}
 
 	/**
@@ -161,7 +159,7 @@ 
 	 * @return array[]
 	 * @phan-return array<string,array{sysop:string,checkuser?:string,bureaucrat?:string,override?:string,override-perm?:string,aliases?:list<string>}>
 	 */
-	public function getDecodedContent(): array {
+	public function getDecodedContent (): array {
 		return json_decode( $this->getContent(), true );
 	}
 }

src/Request/RequestFactory.php

Spacing +4 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -20,7 +20,7 @@ 
 	 * @param LoggerInterface $logger
 	 * @param string $domain
 	 */
-	public function __construct( LoggerInterface $logger, string $domain ) {
+	public function __construct ( LoggerInterface $logger, string $domain ) {
 		$this->logger = $logger;
 		$this->domain = $domain;
 	}
@@ -32,7 +32,7 @@ 
 	 * @param callable $cookiesCallback
 	 * @return RequestBase
 	 */
-	public function createRequest( array $params, array $cookies, callable $cookiesCallback ) {
+	public function createRequest ( array $params, array $cookies, callable $cookiesCallback ) {
 		$ret = extension_loaded( 'curl' )
 			? new CurlRequest( $this->logger, $params, $this->domain, $cookiesCallback )
 			: new NativeRequest( $this->logger, $params, $this->domain, $cookiesCallback );
@@ -47,7 +47,7 @@ 
 	 * @phan-param array<int|string|bool> $params
 	 * @return RequestBase
 	 */
-	public function createStandaloneRequest( array $params ) {
+	public function createStandaloneRequest ( array $params ) {
 		/** @param string[] $newCookies */
 		$cookiesCallback = function ( array $newCookies ) {
 			$newCookies = array_map( 'trim', array_keys( $newCookies ) );

src/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;
 
@@ -16,7 +16,7 @@ 
 	/** @var int|null */
 	private $opposeSection;
 	/** @var int[] Counts of votes for each section */
-	private $sectionCounts = [];
+	private $sectionCounts = [ ];
 
 	// Possible outcomes of a vote
 	public const OUTCOME_OK = 0;
@@ -36,7 +36,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;
 	}
@@ -46,8 +46,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getUserName(): string {
-		return explode( '/', $this->title )[2];
+	public function getUserName (): string {
+		return explode( '/', $this->title )[ 2 ];
 	}
 
 	/**
@@ -55,7 +55,7 @@ 
 	 *
 	 * @return int
 	 */
-	public function getNum(): int {
+	public function getNum (): int {
 		$bits = explode( '/', $this->getTitle() );
 		return (int)end( $bits );
 	}
@@ -65,8 +65,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getUserNum(): string {
-		return explode( '/', $this->getTitle(), 3 )[2];
+	public function getUserNum (): string {
+		return explode( '/', $this->getTitle(), 3 )[ 2 ];
 	}
 
 	/**
@@ -74,7 +74,7 @@ 
 	 *
 	 * @return int
 	 */
-	public function getOpposingCount(): int {
+	public function getOpposingCount (): int {
 		$this->defineSections();
 		return $this->getCountForSection( $this->opposeSection );
 	}
@@ -85,7 +85,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.' );
 		}
@@ -99,13 +99,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 ];
 	}
 
 	/**
@@ -113,9 +113,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 ];
 	}
 
 	/**
@@ -123,7 +123,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function hasOpposition(): bool {
+	public function hasOpposition (): bool {
 		$req = min(
 			self::REQUIRED_OPPOSE_MAX,
 			ceil( $this->getQuorum() * self::REQUIRED_OPPOSE_QUORUM_RATIO )
@@ -136,7 +136,7 @@ 
 	 *
 	 * @return int One of the OUTCOME_* constants
 	 */
-	public function getOutcome(): int {
+	public function getOutcome (): int {
 		if ( !$this->isVote() ) {
 			return self::OUTCOME_OK;
 		}
@@ -159,7 +159,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.' );
 		}
@@ -193,7 +193,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isVote(): bool {
+	public function isVote (): bool {
 		$sectionReg = '/<!-- SEZIONE DA UTILIZZARE PER/';
 		return !$this->matches( $sectionReg );
 	}
@@ -203,7 +203,7 @@ 
 	 *
 	 * @return int
 	 */
-	public function getCreationTimestamp(): int {
+	public function getCreationTimestamp (): int {
 		return $this->wiki->getPageCreationTS( $this->title );
 	}
 
@@ -212,7 +212,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 );

src/Task/UpdateList.php

Spacing +44 added lines, -44 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task;
 
@@ -22,15 +22,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->computeActualList();
 		$pageBotList = $this->getBotList();
 		$botList = $pageBotList->getDecodedContent();
@@ -55,7 +55,7 @@ 
 	 * @return string[][]
 	 * @phan-return array<string,string[]>
 	 */
-	private function computeActualList(): array {
+	private function computeActualList (): array {
 		$params = [
 			'action' => 'query',
 			'list' => 'allusers',
@@ -73,8 +73,8 @@ 
 	 * @return string[][]
 	 * @phan-return array<string,string[]>
 	 */
-	private function extractAdminsData( Generator $data ): array {
-		$ret = [];
+	private function extractAdminsData ( Generator $data ): array {
+		$ret = [ ];
 		$blacklist = $this->getOpt( 'exclude-admins' );
 		foreach ( $data as $user ) {
 			if ( in_array( $user->name, $blacklist, true ) ) {
@@ -94,7 +94,7 @@ 
 	 * @phan-param array<string,array{sysop:string,checkuser?:string,bureaucrat?:string,override?:string,override-perm?:string,aliases?:list<string>}> $curList
 	 * @return array[]
 	 */
-	private function computeNewList( array $curList ): array {
+	private function computeNewList ( array $curList ): array {
 		$newList = $curList;
 
 		$extra = $this->getExtraAdminGroups( $curList );
@@ -114,21 +114,21 @@ 
 	 * @phan-param array<string,array<string,string|string[]>> &$newList
 	 * @param string[][] $extra
 	 */
-	private function handleExtraAndMissing( array &$newList, array $extra ): void {
+	private function handleExtraAndMissing ( array &$newList, array $extra ): void {
 		$missing = $this->getMissingAdminGroups( $newList );
 
-		$removed = [];
+		$removed = [ ];
 		foreach ( $newList as $user => $data ) {
-			if ( isset( $missing[$user] ) ) {
-				$newList[$user] = array_merge( $data, $missing[$user] );
-				unset( $missing[$user] );
-			} elseif ( isset( $extra[$user] ) ) {
-				$newGroups = array_diff_key( $data, $extra[$user] );
+			if ( isset( $missing[ $user ] ) ) {
+				$newList[ $user ] = array_merge( $data, $missing[ $user ] );
+				unset( $missing[ $user ] );
+			} elseif ( isset( $extra[ $user ] ) ) {
+				$newGroups = array_diff_key( $data, $extra[ $user ] );
 				if ( array_diff_key( $newGroups, self::NON_GROUP_KEYS ) ) {
-					$newList[$user] = $newGroups;
+					$newList[ $user ] = $newGroups;
 				} else {
-					$removed[] = $user;
-					unset( $newList[$user] );
+					$removed[ ] = $user;
+					unset( $newList[ $user ] );
 				}
 			}
 		}
@@ -146,17 +146,17 @@ 
 	 * @phan-param array<string,array<string,string|string[]>> $botList
 	 * @return string[][]
 	 */
-	private function getMissingAdminGroups( array $botList ): array {
-		$missing = [];
+	private function getMissingAdminGroups ( array $botList ): array {
+		$missing = [ ];
 		foreach ( $this->actualList as $admin => $groups ) {
-			$missingGroups = array_diff( $groups, array_keys( $botList[$admin] ?? [] ) );
+			$missingGroups = array_diff( $groups, array_keys( $botList[ $admin ] ?? [ ] ) );
 			foreach ( $missingGroups as $group ) {
 				$ts = $this->getFlagDate( $admin, $group );
 				if ( $ts === null ) {
-					$this->errors[] = "$group flag date unavailable for $admin";
+					$this->errors[ ] = "$group flag date unavailable for $admin";
 					continue;
 				}
-				$missing[$admin][$group] = $ts;
+				$missing[ $admin ][ $group ] = $ts;
 			}
 		}
 		return $missing;
@@ -169,7 +169,7 @@ 
 	 * @param string $group
 	 * @return string|null
 	 */
-	private function getFlagDate( string $admin, string $group ): ?string {
+	private function getFlagDate ( string $admin, string $group ): ?string {
 		$this->getLogger()->info( "Retrieving $group flag date for $admin" );
 
 		$wiki = $this->getWiki();
@@ -200,7 +200,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 (
@@ -222,14 +222,14 @@ 
 	 * @phan-param array<string,array{sysop:string,checkuser?:string,bureaucrat?:string,override?:string,override-perm?:string,aliases?:list<string>}> $botList
 	 * @return string[][]
 	 */
-	private function getExtraAdminGroups( array $botList ): array {
-		$extra = [];
+	private function getExtraAdminGroups ( array $botList ): array {
+		$extra = [ ];
 		foreach ( $botList as $name => $data ) {
 			$groups = array_diff_key( $data, self::NON_GROUP_KEYS );
-			if ( !isset( $this->actualList[$name] ) ) {
-				$extra[$name] = $groups;
-			} elseif ( count( $groups ) > count( $this->actualList[$name] ) ) {
-				$extra[$name] = array_diff_key( $groups, $this->actualList[$name] );
+			if ( !isset( $this->actualList[ $name ] ) ) {
+				$extra[ $name ] = $groups;
+			} elseif ( count( $groups ) > count( $this->actualList[ $name ] ) ) {
+				$extra[ $name ] = array_diff_key( $groups, $this->actualList[ $name ] );
 			}
 		}
 		return $extra;
@@ -239,7 +239,7 @@ 
 	 * @param string[] $oldNames
 	 * @return Generator
 	 */
-	private function getRenameEntries( array $oldNames ): Generator {
+	private function getRenameEntries ( array $oldNames ): Generator {
 		$titles = array_map( static function ( string $x ): string {
 			return "Utente:$x";
 		}, $oldNames );
@@ -263,14 +263,14 @@ 
 	 * @param string[] $oldNames
 	 * @return string[] [ old_name => new_name ]
 	 */
-	private function getRenamedUsers( array $oldNames ): array {
+	private function getRenamedUsers ( array $oldNames ): array {
 		if ( !$oldNames ) {
-			return [];
+			return [ ];
 		}
 		$this->getLogger()->info( 'Checking rename for ' . implode( ', ', $oldNames ) );
 
 		$data = $this->getRenameEntries( $oldNames );
-		$ret = [];
+		$ret = [ ];
 		foreach ( $data as $entry ) {
 			// 1 month is arbitrary
 			if ( strtotime( $entry->timestamp ) > strtotime( '-1 month' ) ) {
@@ -291,15 +291,15 @@ 
 	 * @param string[][] $extra
 	 * @return array<string,string> Map of renamed users
 	 */
-	private function handleRenames( array &$newList, array $extra ): array {
+	private function handleRenames ( array &$newList, array $extra ): array {
 		$renameMap = $this->getRenamedUsers( array_keys( $extra ) );
 		foreach ( $renameMap as $oldName => $newName ) {
 			$this->getLogger()->info( "Found rename $oldName -> $newName" );
-			$newList[$newName] = $newList[$oldName];
-			$newList[$newName]['aliases'] = array_unique(
-				array_merge( $newList[$newName]['aliases'] ?? [], [ $oldName ] )
+			$newList[ $newName ] = $newList[ $oldName ];
+			$newList[ $newName ][ 'aliases' ] = array_unique(
+				array_merge( $newList[ $newName ][ 'aliases' ] ?? [ ], [ $oldName ] )
 			);
-			unset( $newList[$oldName] );
+			unset( $newList[ $oldName ] );
 		}
 		return $renameMap;
 	}
@@ -309,12 +309,12 @@ 
 	 *
 	 * @param array[] &$newList
 	 */
-	private function removeOverrides( array &$newList ): void {
-		$removed = [];
+	private function removeOverrides ( array &$newList ): void {
+		$removed = [ ];
 		foreach ( $newList as $user => $data ) {
 			if ( PageBotList::isOverrideExpired( $data ) ) {
-				unset( $newList[$user]['override'] );
-				$removed[] = $user;
+				unset( $newList[ $user ][ 'override' ] );
+				$removed[ ] = $user;
 			}
 		}
 

src/Request/RequestBase.php

Spacing +27 added lines, -27 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -41,7 +41,7 @@ 
 	/** @var string */
 	protected $method = self::METHOD_GET;
 	/** @var string[] */
-	protected $newCookies = [];
+	protected $newCookies = [ ];
 	/** @var callable|null */
 	private $cookiesHandlerCallback;
 
@@ -57,7 +57,7 @@ 
 	 * @param string $domain
 	 * @param callable $cookiesHandlerCallback
 	 */
-	public function __construct(
+	public function __construct (
 		LoggerInterface $logger,
 		array $params,
 		string $domain,
@@ -74,7 +74,7 @@ 
 	 *
 	 * @return self For chaining
 	 */
-	public function setPost(): self {
+	public function setPost (): self {
 		$this->method = self::METHOD_POST;
 		return $this;
 	}
@@ -83,7 +83,7 @@ 
 	 * @param string[] $cookies
 	 * @return self For chaining
 	 */
-	public function setCookies( array $cookies ): self {
+	public function setCookies ( array $cookies ): self {
 		$this->cookiesToSet = $cookies;
 		return $this;
 	}
@@ -92,12 +92,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 {
@@ -126,7 +126,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 );
@@ -136,7 +136,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;
@@ -153,7 +153,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;
 		}
@@ -181,9 +181,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 );
 
@@ -203,15 +203,15 @@ 
 	 *
 	 * @param string $rawHeader
 	 */
-	protected function handleResponseHeader( string $rawHeader ): void {
+	protected function handleResponseHeader ( string $rawHeader ): void {
 		$headerParts = explode( ':', $rawHeader, 2 );
-		$headerName = $headerParts[0];
-		$headerValue = $headerParts[1] ?? null;
+		$headerName = $headerParts[ 0 ];
+		$headerValue = $headerParts[ 1 ] ?? null;
 		if ( strtolower( trim( $headerName ) ) === 'set-cookie' && $headerValue ) {
 			// TODO Maybe use a cookie file?
-			$cookieKeyVal = explode( ';', $headerValue )[0];
+			$cookieKeyVal = explode( ';', $headerValue )[ 0 ];
 			[ $name, $value ] = explode( '=', $cookieKeyVal );
-			$this->newCookies[$name] = $value;
+			$this->newCookies[ $name ] = $value;
 		}
 	}
 
@@ -221,7 +221,7 @@ 
 	 * @param string $params
 	 * @return string
 	 */
-	abstract protected function reallyMakeRequest( string $params ): string;
+	abstract protected function reallyMakeRequest ( string $params ): string;
 
 	/**
 	 * Get a specific exception class depending on the error code
@@ -229,7 +229,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;
@@ -255,7 +255,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 );
 		}
@@ -271,14 +271,14 @@ 
 	 *
 	 * @return string[]
 	 */
-	protected function getHeaders(): array {
+	protected function getHeaders (): array {
 		$ret = self::HEADERS;
 		if ( $this->cookiesToSet ) {
-			$cookies = [];
+			$cookies = [ ];
 			foreach ( $this->cookiesToSet as $cname => $cval ) {
-				$cookies[] = trim( "$cname=$cval" );
+				$cookies[ ] = trim( "$cname=$cval" );
 			}
-			$ret[] = 'Cookie: ' . implode( '; ', $cookies );
+			$ret[ ] = 'Cookie: ' . implode( '; ', $cookies );
 		}
 		return $ret;
 	}
@@ -289,7 +289,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";
@@ -301,7 +301,7 @@ 
 	 * @param string $actualParams
 	 * @return string
 	 */
-	protected function getDebugURL( string $actualParams ): string {
+	protected function getDebugURL ( string $actualParams ): string {
 		return strpos( $this->url, 'login' ) !== false
 			? '[Login request]'
 			: "{$this->url}?$actualParams";