Daimona / BotRiconferme

src/ContextSource.php

Spacing +17 added lines, -17 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -37,7 +37,7 @@ 
 	 * @param MessageProvider $mp
 	 * @param PageBotList $pbl
 	 */
-	public function __construct(
+	public function __construct (
 		LoggerInterface $logger,
 		WikiGroup $wikiGroup,
 		MessageProvider $mp,
@@ -53,14 +53,14 @@ 
 	/**
 	 * @return LoggerInterface
 	 */
-	protected function getLogger(): LoggerInterface {
+	protected function getLogger (): LoggerInterface {
 		return $this->logger;
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	public function setLogger( LoggerInterface $logger ): void {
+	public function setLogger ( LoggerInterface $logger ): void {
 		$this->logger = $logger;
 	}
 
@@ -70,21 +70,21 @@ 
 	 * @param string $optname
 	 * @return mixed
 	 */
-	protected function getOpt( string $optname ) {
+	protected function getOpt ( string $optname ) {
 		return $this->getConfig()->get( $optname );
 	}
 
 	/**
 	 * @return Config
 	 */
-	protected function getConfig(): Config {
+	protected function getConfig (): Config {
 		return $this->config;
 	}
 
 	/**
 	 * @param Config $cfg
 	 */
-	protected function setConfig( Config $cfg ): void {
+	protected function setConfig ( Config $cfg ): void {
 		$this->config = $cfg;
 	}
 
@@ -92,35 +92,35 @@ 
 	 * Shorthand
 	 * @return Wiki
 	 */
-	protected function getWiki(): Wiki {
+	protected function getWiki (): Wiki {
 		return $this->getWikiGroup()->getMainWiki();
 	}
 
 	/**
 	 * @return WikiGroup
 	 */
-	protected function getWikiGroup(): WikiGroup {
+	protected function getWikiGroup (): WikiGroup {
 		return $this->wikiGroup;
 	}
 
 	/**
 	 * @param WikiGroup $wikiGroup
 	 */
-	protected function setWikiGroup( WikiGroup $wikiGroup ): void {
+	protected function setWikiGroup ( WikiGroup $wikiGroup ): void {
 		$this->wikiGroup = $wikiGroup;
 	}
 
 	/**
 	 * @return MessageProvider
 	 */
-	protected function getMessageProvider(): MessageProvider {
+	protected function getMessageProvider (): MessageProvider {
 		return $this->messageProvider;
 	}
 
 	/**
 	 * @param MessageProvider $mp
 	 */
-	protected function setMessageProvider( MessageProvider $mp ): void {
+	protected function setMessageProvider ( MessageProvider $mp ): void {
 		$this->messageProvider = $mp;
 	}
 
@@ -130,21 +130,21 @@ 
 	 * @param string $key
 	 * @return Message
 	 */
-	protected function msg( string $key ): Message {
+	protected function msg ( string $key ): Message {
 		return $this->messageProvider->getMessage( $key );
 	}
 
 	/**
 	 * @return PageBotList
 	 */
-	public function getBotList(): PageBotList {
+	public function getBotList (): PageBotList {
 		return $this->pageBotList;
 	}
 
 	/**
 	 * @return RequestFactory
 	 */
-	public function getRequestFactory(): RequestFactory {
+	public function getRequestFactory (): RequestFactory {
 		return $this->getWiki()->getRequestFactory();
 	}
 
@@ -154,7 +154,7 @@ 
 	 * @param string $title
 	 * @return Page
 	 */
-	protected function getPage( string $title ): Page {
+	protected function getPage ( string $title ): Page {
 		return new Page( $title, $this->getWiki() );
 	}
 
@@ -164,7 +164,7 @@ 
 	 * @param string $name
 	 * @return User
 	 */
-	protected function getUser( string $name ): User {
+	protected function getUser ( string $name ): User {
 		$ui = $this->getBotList()->getUserInfo( $name );
 		return new User( $ui, $this->getWiki() );
 	}

src/Message/Message.php

Spacing +10 added lines, -10 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Message;
 
@@ -23,7 +23,7 @@ 
 	/**
 	 * @param string $value
 	 */
-	public function __construct( string $value ) {
+	public function __construct ( string $value ) {
 		$this->value = $value;
 	}
 
@@ -32,7 +32,7 @@ 
 	 * @phan-param array<string,int|string> $args
 	 * @return self
 	 */
-	public function params( array $args ): self {
+	public function params ( array $args ): self {
 		$this->value = strtr( $this->value, $args );
 		return $this;
 	}
@@ -40,7 +40,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function text(): string {
+	public function text (): string {
 		$this->parsePlurals();
 		return $this->value;
 	}
@@ -48,7 +48,7 @@ 
 	/**
 	 * Replace {{$plur|<amount>|sing|plur}}
 	 */
-	protected function parsePlurals(): void {
+	protected function parsePlurals (): void {
 		$reg = '!\{\{\$plur\|(?P<amount>\d+)\|(?P<sing>[^}|]+)\|(?P<plur>[^|}]+)}}!';
 
 		if ( preg_match( $reg, $this->value ) === 0 ) {
@@ -61,7 +61,7 @@ 
 			 * @return string
 			 */
 			static function ( array $matches ): string {
-				return (int)$matches['amount'] > 1 ? trim( $matches['plur'] ) : trim( $matches['sing'] );
+				return (int)$matches[ 'amount' ] > 1 ? trim( $matches[ 'plur' ] ) : trim( $matches[ 'sing' ] );
 			},
 			$this->value
 		);
@@ -73,7 +73,7 @@ 
 	 * @param string $timeString Full format, e.g. "15 aprile 2019 18:27"
 	 * @return int
 	 */
-	public static function getTimestampFromLocalTime( string $timeString ): int {
+	public static function getTimestampFromLocalTime ( string $timeString ): int {
 		$englishTime = str_ireplace(
 			array_values( self::MONTHS ),
 			array_keys( self::MONTHS ),
@@ -92,12 +92,12 @@ 
 	 * @param string $emptyText
 	 * @return string
 	 */
-	public static function commaList( array $data, string $emptyText = 'nessuno' ): string {
+	public static function commaList ( array $data, string $emptyText = 'nessuno' ): string {
 		if ( count( $data ) > 1 ) {
 			$last = array_pop( $data );
 			$ret = implode( ', ', $data ) . " e $last";
 		} elseif ( $data ) {
-			$ret = (string)$data[0];
+			$ret = (string)$data[ 0 ];
 		} else {
 			$ret = $emptyText;
 		}
@@ -105,7 +105,7 @@ 
 		return $ret;
 	}
 
-	public function __toString(): string {
+	public function __toString (): string {
 		return $this->text();
 	}
 }

src/Utils/IRegexable.php

Spacing +2 added lines, -2 removed lines

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

src/Utils/RegexUtils.php

Spacing +4 added lines, -4 removed lines

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

src/Request/RequestFactory.php

Spacing +3 added lines, -3 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -14,7 +14,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;
 	}
@@ -24,7 +24,7 @@ 
 	 * @phan-param array<int|string|bool> $params
 	 * @return RequestBase
 	 */
-	public function newFromParams( array $params ): RequestBase {
+	public function newFromParams ( array $params ): RequestBase {
 		if ( extension_loaded( 'curl' ) ) {
 			return new CurlRequest( $this->logger, $params, $this->domain );
 		}

src/Request/NativeRequest.php

Spacing +5 added lines, -5 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -9,7 +9,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	protected function reallyMakeRequest( string $params ): string {
+	protected function reallyMakeRequest ( string $params ): string {
 		$context = [
 			'http' => [
 				'method' => $this->method,
@@ -18,7 +18,7 @@ 
 		];
 		$url = $this->url;
 		if ( $this->method === self::METHOD_POST ) {
-			$context['http']['content'] = $params;
+			$context[ 'http' ][ 'content' ] = $params;
 		} else {
 			$url = "$url?$params";
 		}
@@ -28,8 +28,8 @@ 
 		foreach ( $http_response_header as $header ) {
 			/** @var string[] $bits */
 			$bits = explode( ':', $header, 2 );
-			if ( trim( $bits[0] ) === 'Set-Cookie' ) {
-				$this->newCookies[] = $bits[1];
+			if ( trim( $bits[ 0 ] ) === 'Set-Cookie' ) {
+				$this->newCookies[ ] = $bits[ 1 ];
 			}
 		}
 

src/Request/CurlRequest.php

Spacing +5 added lines, -5 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -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,11 +59,11 @@ 
 	 * @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 {
 		/** @var string[] $bits */
 		$bits = explode( ':', $header, 2 );
-		if ( trim( $bits[0] ) === 'Set-Cookie' ) {
-			$this->newCookies[] = $bits[1];
+		if ( trim( $bits[ 0 ] ) === 'Set-Cookie' ) {
+			$this->newCookies[ ] = $bits[ 1 ];
 		}
 
 		return strlen( $header );

src/Request/RequestBase.php

Spacing +23 added lines, -23 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,9 +163,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 );
 
@@ -186,18 +186,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;
 		}
 	}
@@ -208,7 +208,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;
@@ -234,7 +234,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 );
 		}
@@ -250,14 +250,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;
 	}
@@ -268,7 +268,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";
@@ -280,7 +280,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";

src/Wiki/LoginInfo.php

Spacing +4 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki;
 
@@ -15,7 +15,7 @@ 
 	 * @param string $username
 	 * @param string $password
 	 */
-	public function __construct( string $username, string $password ) {
+	public function __construct ( string $username, string $password ) {
 		$this->username = $username;
 		$this->password = $password;
 	}
@@ -23,14 +23,14 @@ 
 	/**
 	 * @return string
 	 */
-	public function getUsername(): string {
+	public function getUsername (): string {
 		return $this->username;
 	}
 
 	/**
 	 * @return string
 	 */
-	public function getPassword(): string {
+	public function getPassword (): string {
 		return $this->password;
 	}
 }