Daimona / BotRiconferme

includes/Request/RequestFactory.php

Spacing +3 added lines, -3 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -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 );
 		}

includes/Utils/RegexUtils.php

Spacing +4 added lines, -4 removed lines

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

includes/Utils/IRegexable.php

Spacing +2 added lines, -2 removed lines

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

includes/Task/TaskBase.php

Spacing +7 added lines, -7 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task;
 
@@ -17,7 +17,7 @@ 
  */
 abstract class TaskBase extends ContextSource {
 	/** @var string[] */
-	protected $errors = [];
+	protected $errors = [ ];
 	/** @var TaskDataProvider */
 	protected $dataProvider;
 
@@ -30,7 +30,7 @@ 
 	 * @param MessageProvider $mp
 	 * @param PageBotList $pbl
 	 */
-	final public function __construct(
+	final public function __construct (
 		LoggerInterface $logger,
 		WikiGroup $wikiGroup,
 		TaskDataProvider $dataProvider,
@@ -46,7 +46,7 @@ 
 	 *
 	 * @return TaskResult
 	 */
-	final public function run() : TaskResult {
+	final public function run () : TaskResult {
 		$class = ( new ReflectionClass( $this ) )->getShortName();
 		$opName = $this->getOperationName();
 		$this->getLogger()->info( "Starting $opName $class" );
@@ -77,19 +77,19 @@ 
 	 *
 	 * @return int One of the STATUS_* constants
 	 */
-	abstract protected function runInternal() : int;
+	abstract protected function runInternal () : int;
 
 	/**
 	 * How this operation should be called in logs
 	 *
 	 * @return string
 	 */
-	abstract public function getOperationName() : string;
+	abstract public function getOperationName () : string;
 
 	/**
 	 * @return TaskDataProvider
 	 */
-	protected function getDataProvider() : TaskDataProvider {
+	protected function getDataProvider () : TaskDataProvider {
 		return $this->dataProvider;
 	}
 }

includes/Task/Task.php

Spacing +5 added lines, -5 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task;
 
@@ -15,13 +15,13 @@ 
 	 *
 	 * @return string[]
 	 */
-	abstract protected function getSubtasksMap() : array;
+	abstract protected function getSubtasksMap () : array;
 
 	/**
 	 * @param string $subtask Defined in self::SUBTASKS_MAP
 	 * @return TaskResult
 	 */
-	protected function runSubtask( string $subtask ) : TaskResult {
+	protected function runSubtask ( string $subtask ) : TaskResult {
 		$map = $this->getSubtasksMap();
 		if ( !isset( $map[ $subtask ] ) ) {
 			throw new InvalidArgumentException( "'$subtask' is not a valid task." );
@@ -34,7 +34,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	final public function getOperationName(): string {
+	final public function getOperationName (): string {
 		return 'task';
 	}
 
@@ -44,7 +44,7 @@ 
 	 * @param string $class
 	 * @return Subtask
 	 */
-	private function getSubtaskInstance( string $class ) : Subtask {
+	private function getSubtaskInstance ( string $class ) : Subtask {
 		return new $class(
 			$this->getLogger(),
 			$this->getWikiGroup(),

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;
 
@@ -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();
 	}
 }

includes/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";

includes/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 );

includes/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 ];
 			}
 		}