Daimona / BotRiconferme

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;
 
@@ -20,7 +20,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 );
 	}
 
@@ -31,7 +31,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 );
@@ -43,7 +43,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;
@@ -51,9 +51,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();
 	}
@@ -65,18 +65,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 );
@@ -97,17 +97,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;
 	}
@@ -121,14 +119,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;
@@ -139,9 +137,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 );
 			}
@@ -153,8 +151,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 ];
 	}
 
 	/**
@@ -162,7 +160,7 @@ 
 	 *
 	 * @return string[][]
 	 */
-	public function getDecodedContent(): array {
+	public function getDecodedContent (): array {
 		return json_decode( $this->getContent(), true );
 	}
 }

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;
@@ -35,7 +35,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;
 	}
@@ -45,8 +45,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getUserName(): string {
-		return explode( '/', $this->title )[2];
+	public function getUserName (): string {
+		return explode( '/', $this->title )[ 2 ];
 	}
 
 	/**
@@ -54,7 +54,7 @@ 
 	 *
 	 * @return int
 	 */
-	public function getNum(): int {
+	public function getNum (): int {
 		$bits = explode( '/', $this->getTitle() );
 		return (int)end( $bits );
 	}
@@ -64,8 +64,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getUserNum(): string {
-		return explode( '/', $this->getTitle(), 3 )[2];
+	public function getUserNum (): string {
+		return explode( '/', $this->getTitle(), 3 )[ 2 ];
 	}
 
 	/**
@@ -73,7 +73,7 @@ 
 	 *
 	 * @return int
 	 */
-	public function getOpposingCount(): int {
+	public function getOpposingCount (): int {
 		$this->defineSections();
 		return $this->getCountForSection( $this->opposeSection );
 	}
@@ -84,7 +84,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.' );
 		}
@@ -98,13 +98,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 ];
 	}
 
 	/**
@@ -112,9 +112,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 ];
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function hasOpposition(): bool {
+	public function hasOpposition (): bool {
 		return $this->getOpposingCount() >= self::REQUIRED_OPPOSE;
 	}
 
@@ -131,7 +131,7 @@ 
 	 *
 	 * @return int One of the OUTCOME_* constants
 	 */
-	public function getOutcome(): int {
+	public function getOutcome (): int {
 		if ( !$this->isVote() ) {
 			return self::OUTCOME_OK;
 		}
@@ -154,7 +154,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.' );
 		}
@@ -188,7 +188,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isVote(): bool {
+	public function isVote (): bool {
 		$sectionReg = '/<!-- SEZIONE DA UTILIZZARE PER/';
 		return !$this->matches( $sectionReg );
 	}
@@ -198,7 +198,7 @@ 
 	 *
 	 * @return int
 	 */
-	public function getCreationTimestamp(): int {
+	public function getCreationTimestamp (): int {
 		return $this->wiki->getPageCreationTS( $this->title );
 	}
 
@@ -207,7 +207,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/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;
 
@@ -22,7 +22,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;
 	}
@@ -30,7 +30,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function getTitle(): string {
+	public function getTitle (): string {
 		return $this->title;
 	}
 
@@ -40,7 +40,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 );
 		}
@@ -54,18 +54,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 )
@@ -78,7 +78,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function exists(): bool {
+	public function exists (): bool {
 		$pages = $this->wiki->getRequestFactory()->newFromParams( [
 			'action' => 'query',
 			'titles' => $this->getTitle()
@@ -92,7 +92,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() );
 	}
 
@@ -104,8 +104,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" );
 		}
@@ -117,7 +117,7 @@ 
 	 *
 	 * @inheritDoc
 	 */
-	public function getRegex( string $delimiter = '/' ): string {
+	public function getRegex ( string $delimiter = '/' ): string {
 		return str_replace( ' ', '[ _]', preg_quote( $this->title, $delimiter ) );
 	}
 
@@ -126,7 +126,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function __toString(): string {
+	public function __toString (): string {
 		return $this->getTitle();
 	}
 }

src/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' ] ?? [ ];
 	}
 }

src/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 );
 	}
 }

src/CLI.php

Spacing +18 added lines, -18 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -66,14 +66,14 @@ 
 	/**
 	 * @return bool
 	 */
-	public static function isCLI(): bool {
+	public static function isCLI (): bool {
 		return PHP_SAPI === 'cli';
 	}
 
 	/**
 	 * Populate options and check for required ones
 	 */
-	public function __construct() {
+	public function __construct () {
 		/** @var string[] $opts */
 		$opts = getopt( self::SHORT_OPTS, self::LONG_OPTS );
 		$this->checkRequiredOpts( $opts );
@@ -85,7 +85,7 @@ 
 	/**
 	 * @param string[] $opts
 	 */
-	private function checkRequiredOpts( array $opts ): void {
+	private function checkRequiredOpts ( array $opts ): void {
 		$missingOpts = array_diff( self::REQUIRED_OPTS, array_keys( $opts ) );
 		if ( $missingOpts ) {
 			$this->fatal( 'Required options missing: ' . implode( ', ', $missingOpts ) );
@@ -107,7 +107,7 @@ 
 	/**
 	 * @param string[] $opts
 	 */
-	private function checkConflictingOpts( array $opts ): void {
+	private function checkConflictingOpts ( array $opts ): void {
 		$this->checkNotBothSet( $opts, 'password', 'use-password-file' );
 		if ( array_key_exists( 'use-password-file', $opts ) && !file_exists( self::PASSWORD_FILE ) ) {
 			$this->fatal( 'Please create the password file (' . self::PASSWORD_FILE . ')' );
@@ -128,7 +128,7 @@ 
 	 * @param string $first
 	 * @param string $second
 	 */
-	private function checkNotBothSet( array $opts, string $first, string $second ): void {
+	private function checkNotBothSet ( array $opts, string $first, string $second ): void {
 		if ( array_key_exists( $first, $opts ) && array_key_exists( $second, $opts ) ) {
 			$this->fatal( "Can only use one of '$first' and '$second'" );
 		}
@@ -137,23 +137,23 @@ 
 	/**
 	 * @param string[] &$opts
 	 */
-	private function canonicalize( array &$opts ): void {
+	private function canonicalize ( array &$opts ): void {
 		if ( array_key_exists( 'use-password-file', $opts ) ) {
 			$pw = trim( file_get_contents( self::PASSWORD_FILE ) );
-			$opts['password'] = $pw;
-			unset( $opts['use-password-file'] );
+			$opts[ 'password' ] = $pw;
+			unset( $opts[ 'use-password-file' ] );
 		}
 		if ( array_key_exists( 'use-private-password-file', $opts ) ) {
 			$pw = trim( file_get_contents( self::PRIVATE_PASSWORD_FILE ) );
-			$opts['private-password'] = $pw;
-			unset( $opts['use-private-password-file'] );
+			$opts[ 'private-password' ] = $pw;
+			unset( $opts[ 'use-private-password-file' ] );
 		}
 	}
 
 	/**
 	 * @param string $msg
 	 */
-	private function fatal( string $msg ): void {
+	private function fatal ( string $msg ): void {
 		exit( $msg . "\n" );
 	}
 
@@ -162,8 +162,8 @@ 
 	 * @param string $opt
 	 * @return string
 	 */
-	public function getSetOpt( string $opt ): string {
-		return $this->opts[$opt];
+	public function getSetOpt ( string $opt ): string {
+		return $this->opts[ $opt ];
 	}
 
 	/**
@@ -171,14 +171,14 @@ 
 	 * @param string|null $default
 	 * @return string|null
 	 */
-	public function getOpt( string $opt, string $default = null ): ?string {
-		return $this->opts[$opt] ?? $default;
+	public function getOpt ( string $opt, string $default = null ): ?string {
+		return $this->opts[ $opt ] ?? $default;
 	}
 
 	/**
 	 * @return string[] Either [ 'tasks' => name1,... ] or [ 'subtasks' => name1,... ]
 	 */
-	public function getTaskOpt(): array {
+	public function getTaskOpt (): array {
 		return array_intersect_key(
 			$this->opts,
 			[ 'tasks' => true, 'subtasks' => true ]
@@ -188,7 +188,7 @@ 
 	/**
 	 * @return string|null
 	 */
-	public function getURL(): ?string {
+	public function getURL (): ?string {
 		return $this->getOpt( 'force-url' );
 	}
 }

src/Bot.php

Spacing +12 added lines, -13 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -34,7 +34,7 @@ 
 	/**
 	 * @param CLI $cli
 	 */
-	public function __construct( CLI $cli ) {
+	public function __construct ( CLI $cli ) {
 		$this->cli = $cli;
 		$this->initialize();
 	}
@@ -42,7 +42,7 @@ 
 	/**
 	 * Initialize all members.
 	 */
-	private function initialize(): void {
+	private function initialize (): void {
 		$simpleLogger = new SimpleLogger();
 		$this->createWikiGroup( $simpleLogger );
 		$this->messageProvider = new MessageProvider(
@@ -56,14 +56,14 @@ 
 	/**
 	 * Main entry point
 	 */
-	public function run(): void {
+	public function run (): void {
 		$taskOpt = $this->cli->getTaskOpt();
 		$type = current( array_keys( $taskOpt ) );
 		try {
 			if ( $type === 'tasks' ) {
-				$this->runInternal( TaskManager::MODE_TASK, explode( ',', $taskOpt['tasks'] ) );
+				$this->runInternal( TaskManager::MODE_TASK, explode( ',', $taskOpt[ 'tasks' ] ) );
 			} elseif ( $type === 'subtasks' ) {
-				$this->runInternal( TaskManager::MODE_SUBTASK, explode( ',', $taskOpt['subtasks'] ) );
+				$this->runInternal( TaskManager::MODE_SUBTASK, explode( ',', $taskOpt[ 'subtasks' ] ) );
 			} else {
 				$this->runInternal();
 			}
@@ -77,7 +77,7 @@ 
 	/**
 	 * @param LoggerInterface $baseLogger
 	 */
-	private function createWikiGroup( LoggerInterface $baseLogger ): void {
+	private function createWikiGroup ( LoggerInterface $baseLogger ): void {
 		// FIXME Hardcoded
 		$url = $this->cli->getURL() ?? 'https://it.wikipedia.org/w/api.php';
 		$localUserIdentifier = '@itwiki';
@@ -115,7 +115,7 @@ 
 	 *
 	 * @param IFlushingAwareLogger $baseLogger
 	 */
-	private function createMainLogger( IFlushingAwareLogger $baseLogger ): void {
+	private function createMainLogger ( IFlushingAwareLogger $baseLogger ): void {
 		$mainWiki = $this->wikiGroup->getMainWiki();
 		$mp = $this->messageProvider;
 		$errTitle = $this->cli->getOpt( 'error-title' );
@@ -142,7 +142,7 @@ 
 	/**
 	 * Create the Config
 	 */
-	private function initConfig(): void {
+	private function initConfig (): void {
 		$wiki = $this->wikiGroup->getMainWiki();
 		try {
 			$confValues = json_decode( $wiki->getPageContent( $this->cli->getSetOpt( 'config-title' ) ), true );
@@ -159,9 +159,9 @@ 
 	 * @param string $mode
 	 * @param string[] $taskNames
 	 */
-	private function runInternal(
+	private function runInternal (
 		string $mode = TaskManager::MODE_COMPLETE,
-		array $taskNames = []
+		array $taskNames = [ ]
 	): void {
 		$activity = $mode === TaskManager::MODE_COMPLETE
 			? 'full process'
@@ -181,8 +181,7 @@ 
 		$base = "Execution of $activity";
 		if ( $res->isOK() ) {
 			$msg = $res->getStatus() === TaskResult::STATUS_NOTHING ?
-				': nothing to do' :
-				' completed successfully';
+				': nothing to do' : ' completed successfully';
 			$this->mainLogger->info( $base . $msg );
 		} else {
 			$this->mainLogger->error( "$base failed.\n$res" );

src/Request/RequestBase.php

Spacing +25 added lines, -25 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 LoggerInterface */
 	protected $logger;
@@ -54,7 +54,7 @@ 
 	 * @phan-param array<int|string|bool> $params
 	 * @param string $domain
 	 */
-	public function __construct( LoggerInterface $logger, array $params, string $domain ) {
+	public function __construct ( LoggerInterface $logger, array $params, string $domain ) {
 		$this->logger = $logger;
 		$this->params = [ 'format' => 'json' ] + $params;
 		$this->url = $domain;
@@ -65,7 +65,7 @@ 
 	 *
 	 * @return self For chaining
 	 */
-	public function setPost(): self {
+	public function setPost (): self {
 		$this->method = self::METHOD_POST;
 		return $this;
 	}
@@ -74,12 +74,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 {
@@ -108,7 +108,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 );
@@ -118,7 +118,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;
@@ -135,7 +135,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;
 		}
@@ -163,12 +163,12 @@ 
 	 * @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;
 		}
-		if ( !isset( $params['assert'] ) ) {
-			$params['assert'] = 'user';
+		if ( !isset( $params[ 'assert' ] ) ) {
+			$params[ 'assert' ] = 'user';
 		}
 		$query = http_build_query( $params );
 
@@ -189,18 +189,18 @@ 
 	 * @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 ) {
 			/** @var string[] $bits */
 			$bits = explode( ';', $cookie );
-			[ $name, $value ] = explode( '=', $bits[0] );
+			[ $name, $value ] = explode( '=', $bits[ 0 ] );
 			self::$cookiesToSet[ $name ] = $value;
 		}
 	}
@@ -211,7 +211,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;
@@ -237,7 +237,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 );
 		}
@@ -253,14 +253,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;
 	}
@@ -271,7 +271,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";
@@ -283,7 +283,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";