Daimona / BotRiconferme

src/Task/UpdateList.php

Spacing +44 added lines, -44 removed lines

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

src/Request/RequestBase.php

Spacing +27 added lines, -27 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -41,7 +41,7 @@ 
 	/** @var string */
 	protected $method = self::METHOD_GET;
 	/** @var string[] */
-	protected $newCookies = [];
+	protected $newCookies = [ ];
 	/** @var callable|null */
 	private $cookiesHandlerCallback;
 
@@ -57,7 +57,7 @@ 
 	 * @param string $domain
 	 * @param callable $cookiesHandlerCallback
 	 */
-	public function __construct(
+	public function __construct (
 		LoggerInterface $logger,
 		array $params,
 		string $domain,
@@ -74,7 +74,7 @@ 
 	 *
 	 * @return self For chaining
 	 */
-	public function setPost(): self {
+	public function setPost (): self {
 		$this->method = self::METHOD_POST;
 		return $this;
 	}
@@ -83,7 +83,7 @@ 
 	 * @param string[] $cookies
 	 * @return self For chaining
 	 */
-	public function setCookies( array $cookies ): self {
+	public function setCookies ( array $cookies ): self {
 		$this->cookiesToSet = $cookies;
 		return $this;
 	}
@@ -92,12 +92,12 @@ 
 	 * Execute a query request
 	 * @return Generator
 	 */
-	public function executeAsQuery(): Generator {
-		if ( ( $this->params['action'] ?? false ) !== 'query' ) {
+	public function executeAsQuery (): Generator {
+		if ( ( $this->params[ 'action' ] ?? false ) !== 'query' ) {
 			throw new BadMethodCallException( 'Not an ApiQuery!' );
 		}
 		// TODO Is this always correct?
-		$key = $this->params['list'] ?? 'pages';
+		$key = $this->params[ 'list' ] ?? 'pages';
 		$curParams = $this->params;
 		$lim = $this->parseLimit();
 		do {
@@ -126,7 +126,7 @@ 
 	 * Execute a request that doesn't need any continuation.
 	 * @return stdClass
 	 */
-	public function executeSingle(): stdClass {
+	public function executeSingle (): stdClass {
 		$curParams = $this->params;
 		$res = $this->makeRequestInternal( $curParams );
 		$this->handleErrorAndWarnings( $res );
@@ -136,7 +136,7 @@ 
 	/**
 	 * @return int
 	 */
-	private function parseLimit(): int {
+	private function parseLimit (): int {
 		foreach ( $this->params as $name => $val ) {
 			if ( substr( $name, -strlen( 'limit' ) ) === 'limit' ) {
 				return $val === 'max' ? -1 : (int)$val;
@@ -153,7 +153,7 @@ 
 	 * @param string $resKey
 	 * @return int|null
 	 */
-	private function countQueryResults( stdClass $res, string $resKey ): ?int {
+	private function countQueryResults ( stdClass $res, string $resKey ): ?int {
 		if ( !isset( $res->query->$resKey ) ) {
 			return null;
 		}
@@ -181,9 +181,9 @@ 
 	 * @phan-param array<int|string|bool> $params
 	 * @return stdClass
 	 */
-	private function makeRequestInternal( array $params ): stdClass {
+	private function makeRequestInternal ( array $params ): stdClass {
 		if ( $this->method === self::METHOD_POST ) {
-			$params['maxlag'] = self::MAXLAG;
+			$params[ 'maxlag' ] = self::MAXLAG;
 		}
 		$query = http_build_query( $params );
 
@@ -203,15 +203,15 @@ 
 	 *
 	 * @param string $rawHeader
 	 */
-	protected function handleResponseHeader( string $rawHeader ): void {
+	protected function handleResponseHeader ( string $rawHeader ): void {
 		$headerParts = explode( ':', $rawHeader, 2 );
-		$headerName = $headerParts[0];
-		$headerValue = $headerParts[1] ?? null;
+		$headerName = $headerParts[ 0 ];
+		$headerValue = $headerParts[ 1 ] ?? null;
 		if ( strtolower( trim( $headerName ) ) === 'set-cookie' && $headerValue ) {
 			// TODO Maybe use a cookie file?
-			$cookieKeyVal = explode( ';', $headerValue )[0];
+			$cookieKeyVal = explode( ';', $headerValue )[ 0 ];
 			[ $name, $value ] = explode( '=', $cookieKeyVal );
-			$this->newCookies[$name] = $value;
+			$this->newCookies[ $name ] = $value;
 		}
 	}
 
@@ -221,7 +221,7 @@ 
 	 * @param string $params
 	 * @return string
 	 */
-	abstract protected function reallyMakeRequest( string $params ): string;
+	abstract protected function reallyMakeRequest ( string $params ): string;
 
 	/**
 	 * Get a specific exception class depending on the error code
@@ -229,7 +229,7 @@ 
 	 * @param stdClass $res
 	 * @return APIRequestException
 	 */
-	private function getException( stdClass $res ): APIRequestException {
+	private function getException ( stdClass $res ): APIRequestException {
 		switch ( $res->error->code ) {
 			case 'missingtitle':
 				$ex = new MissingPageException;
@@ -255,7 +255,7 @@ 
 	 * @param stdClass $res
 	 * @throws APIRequestException
 	 */
-	protected function handleErrorAndWarnings( stdClass $res ): void {
+	protected function handleErrorAndWarnings ( stdClass $res ): void {
 		if ( isset( $res->error ) ) {
 			throw $this->getException( $res );
 		}
@@ -271,14 +271,14 @@ 
 	 *
 	 * @return string[]
 	 */
-	protected function getHeaders(): array {
+	protected function getHeaders (): array {
 		$ret = self::HEADERS;
 		if ( $this->cookiesToSet ) {
-			$cookies = [];
+			$cookies = [ ];
 			foreach ( $this->cookiesToSet as $cname => $cval ) {
-				$cookies[] = trim( "$cname=$cval" );
+				$cookies[ ] = trim( "$cname=$cval" );
 			}
-			$ret[] = 'Cookie: ' . implode( '; ', $cookies );
+			$ret[ ] = 'Cookie: ' . implode( '; ', $cookies );
 		}
 		return $ret;
 	}
@@ -289,7 +289,7 @@ 
 	 * @param string[] $headers
 	 * @return string
 	 */
-	protected function buildHeadersString( array $headers ): string {
+	protected function buildHeadersString ( array $headers ): string {
 		$ret = '';
 		foreach ( $headers as $header ) {
 			$ret .= "$header\r\n";
@@ -301,7 +301,7 @@ 
 	 * @param string $actualParams
 	 * @return string
 	 */
-	protected function getDebugURL( string $actualParams ): string {
+	protected function getDebugURL ( string $actualParams ): string {
 		return strpos( $this->url, 'login' ) !== false
 			? '[Login request]'
 			: "{$this->url}?$actualParams";