Daimona / BotRiconferme

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

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

includes/TaskManager.php

Spacing +9 added lines, -9 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -72,7 +72,7 @@ 
 	 * @param MessageProvider $mp
 	 * @param PageBotList $pbl
 	 */
-	public function __construct(
+	public function __construct (
 		LoggerInterface $logger,
 		WikiGroup $wikiGroup,
 		MessageProvider $mp,
@@ -97,7 +97,7 @@ 
 	 * @param string[] $tasks Only used in MODE_TASK and MODE_SUBTASK
 	 * @return TaskResult
 	 */
-	public function run( string $mode, array $tasks = [] ) : TaskResult {
+	public function run ( string $mode, array $tasks = [ ] ) : TaskResult {
 		if ( $mode === self::MODE_COMPLETE ) {
 			$tasks = self::FULL_RUN_ORDERED;
 		}
@@ -113,7 +113,7 @@ 
 	 * @param string[] $tasks
 	 * @return TaskResult
 	 */
-	private function runTasks( array $tasks ) : TaskResult {
+	private function runTasks ( array $tasks ) : TaskResult {
 		$res = new TaskResult( TaskResult::STATUS_GOOD );
 		do {
 			$res->merge( $this->runTask( current( $tasks ) ) );
@@ -128,7 +128,7 @@ 
 	 * @param string $name
 	 * @return TaskResult
 	 */
-	protected function runTask( string $name ) : TaskResult {
+	protected function runTask ( string $name ) : TaskResult {
 		if ( !isset( self::TASKS_MAP[ $name ] ) ) {
 			throw new InvalidArgumentException( "'$name' is not a valid task." );
 		}
@@ -142,7 +142,7 @@ 
 	 * @param string[] $subtasks
 	 * @return TaskResult
 	 */
-	private function runSubtasks( array $subtasks ) : TaskResult {
+	private function runSubtasks ( array $subtasks ) : TaskResult {
 		$res = new TaskResult( TaskResult::STATUS_GOOD );
 		do {
 			$res->merge( $this->runSubtask( current( $subtasks ) ) );
@@ -157,7 +157,7 @@ 
 	 * @param string $name
 	 * @return TaskResult
 	 */
-	protected function runSubtask( string $name ) : TaskResult {
+	protected function runSubtask ( string $name ) : TaskResult {
 		if ( !isset( self::SUBTASKS_MAP[ $name ] ) ) {
 			throw new InvalidArgumentException( "'$name' is not a valid subtask." );
 		}
@@ -172,7 +172,7 @@ 
 	 * @param string $name
 	 * @return Task
 	 */
-	private function getTaskInstance( string $name ) : Task {
+	private function getTaskInstance ( string $name ) : Task {
 		$class = self::TASKS_MAP[ $name ];
 		return new $class(
 			$this->logger,
@@ -189,7 +189,7 @@ 
 	 * @param string $class
 	 * @return Subtask
 	 */
-	private function getSubtaskInstance( string $class ) : Subtask {
+	private function getSubtaskInstance ( string $class ) : Subtask {
 		return new $class(
 			$this->logger,
 			$this->wikiGroup,

includes/Task/Subtask/FailedUpdates.php

Spacing +20 added lines, -20 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task\Subtask;
 
@@ -16,7 +16,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function runInternal() : int {
+	public function runInternal () : int {
 		$failed = $this->getFailures();
 		if ( !$failed ) {
 			return TaskResult::STATUS_NOTHING;
@@ -41,12 +41,12 @@ 
 	 *
 	 * @return PageRiconferma[]
 	 */
-	private function getFailures() : array {
-		$ret = [];
+	private function getFailures () : array {
+		$ret = [ ];
 		$allPages = $this->getDataProvider()->getPagesToClose();
 		foreach ( $allPages as $page ) {
 			if ( $page->getOutcome() & PageRiconferma::OUTCOME_FAIL ) {
-				$ret[] = $page;
+				$ret[ ] = $page;
 			}
 		}
 		return $ret;
@@ -55,7 +55,7 @@ 
 	/**
 	 * @param User[] $users
 	 */
-	protected function updateBurList( array $users ) : void {
+	protected function updateBurList ( array $users ) : void {
 		$this->getLogger()->info( 'Updating bur list. Removing: ' . implode( ', ', $users ) );
 		$remList = RegexUtils::regexFromArray( '!', ...$users );
 		$burList = $this->getPage( $this->getOpt( 'bur-list-title' ) );
@@ -78,7 +78,7 @@ 
 	 *
 	 * @param PageRiconferma[] $pages
 	 */
-	protected function requestRemoval( array $pages ) : void {
+	protected function requestRemoval ( array $pages ) : void {
 		$this->getLogger()->info( 'Requesting flag removal for: ' . implode( ', ', $pages ) );
 
 		$metaWiki = $this->getWikiGroup()->getCentralWiki();
@@ -115,21 +115,21 @@ 
 	 *
 	 * @param PageRiconferma[] $pages
 	 */
-	protected function updateAnnunci( array $pages ) : void {
+	protected function updateAnnunci ( array $pages ) : void {
 		$this->getLogger()->info( 'Updating annunci' );
 		$section = 1;
 
-		$names = [];
+		$names = [ ];
 		$text = '';
 		foreach ( $pages as $page ) {
 			$user = $page->getUserName();
-			$names[] = $user;
+			$names[ ] = $user;
 			$text .= $this->msg( 'annunci-text' )->params( [ '$user' => $user ] )->text();
 		}
 
 		/** @var string $curMonth */
 		$curMonth = date( 'F' );
-		$month = ucfirst( Message::MONTHS[$curMonth] );
+		$month = ucfirst( Message::MONTHS[ $curMonth ] );
 
 		$annunciPage = $this->getPage( $this->getOpt( 'annunci-page-title' ) );
 		$content = $annunciPage->getContent( $section );
@@ -157,16 +157,16 @@ 
 	 *
 	 * @param PageRiconferma[] $pages
 	 */
-	protected function updateUltimeNotizie( array $pages ) : void {
+	protected function updateUltimeNotizie ( array $pages ) : void {
 		$this->getLogger()->info( 'Updating ultime notizie' );
 		$notiziePage = $this->getPage( $this->getOpt( 'ultimenotizie-page-title' ) );
 
-		$names = [];
+		$names = [ ];
 		$text = '';
 		$msg = $this->msg( 'ultimenotizie-text' );
 		foreach ( $pages as $page ) {
 			$user = $page->getUserName();
-			$names[] = $user;
+			$names[ ] = $user;
 			$text .= $msg->params( [ '$user' => $user, '$title' => $page->getTitle() ] )->text();
 		}
 
@@ -194,7 +194,7 @@ 
 	 *
 	 * @param PageRiconferma[] $pages
 	 */
-	protected function updateTimeline( array $pages ) : void {
+	protected function updateTimeline ( array $pages ) : void {
 		$this->getLogger()->info( 'Updating timeline' );
 		$timelinePage = $this->getPage( $this->getOpt( 'timeline-page-title' ) );
 		$content = $timelinePage->getContent();
@@ -222,7 +222,7 @@ 
 	 *
 	 * @param PageRiconferma[] $pages
 	 */
-	private function updateCronologia( array $pages ) : void {
+	private function updateCronologia ( array $pages ) : void {
 		$this->getLogger()->info( 'Updating cronologia' );
 		$timelinePage = $this->getPage( $this->getOpt( 'cronologia-page-title' ) );
 		$content = $timelinePage->getContent();
@@ -249,7 +249,7 @@ 
 	 *
 	 * @param PageRiconferma[] $pages
 	 */
-	private function blockOnPrivate( array $pages ) : void {
+	private function blockOnPrivate ( array $pages ) : void {
 		$this->getLogger()->info( 'Blocking on private wiki: ' . implode( ', ', $pages ) );
 
 		$privWiki = $this->getWikiGroup()->getPrivateWiki();
@@ -266,12 +266,12 @@ 
 	 * @param PageRiconferma[] $pages
 	 * @return User[]
 	 */
-	private function getFailedBureaucrats( array $pages ) : array {
-		$ret = [];
+	private function getFailedBureaucrats ( array $pages ) : array {
+		$ret = [ ];
 		foreach ( $pages as $page ) {
 			$user = $this->getUser( $page->getUserName() );
 			if ( $user->inGroup( 'bureaucrat' ) ) {
-				$ret[] = $user;
+				$ret[ ] = $user;
 			}
 		}
 		return $ret;

includes/CLI.php

Spacing +16 added lines, -16 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,14 +162,14 @@ 
 	 * @param mixed|null $default
 	 * @return string
 	 */
-	public function getOpt( string $opt, $default = null ) : string {
-		return $this->opts[$opt] ?? $default;
+	public function getOpt ( string $opt, $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 ]
@@ -179,7 +179,7 @@ 
 	/**
 	 * @return string|null
 	 */
-	public function getURL() : ?string {
+	public function getURL () : ?string {
 		return $this->getOpt( 'force-url' );
 	}
 }

includes/Wiki/Page/PageBotList.php

Spacing +25 added lines, -27 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki\Page;
 
@@ -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 );
@@ -96,17 +96,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;
 	}
@@ -120,14 +118,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;
@@ -138,9 +136,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 );
 			}
@@ -152,8 +150,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 string[][]
 	 */
-	public function getDecodedContent() : array {
+	public function getDecodedContent () : array {
 		return json_decode( $this->getContent(), true );
 	}
 }

includes/Wiki/Page/PageRiconferma.php

Spacing +21 added lines, -21 removed lines

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