Daimona / BotRiconferme

includes/Task/UpdateList.php

Spacing +30 added lines, -30 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task;
 
@@ -19,15 +19,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->getActualAdmins();
 		$pageBotList = PageBotList::get( $this->getWiki() );
 		$this->botList = $pageBotList->getAdminsList();
@@ -54,7 +54,7 @@ 
 	/**
 	 * @return array
 	 */
-	protected function getActualAdmins() : array {
+	protected function getActualAdmins () : array {
 		$params = [
 			'action' => 'query',
 			'list' => 'allusers',
@@ -71,8 +71,8 @@ 
 	 * @param \stdClass $data
 	 * @return array
 	 */
-	protected function extractAdmins( \stdClass $data ) : array {
-		$ret = [];
+	protected function extractAdmins ( \stdClass $data ) : array {
+		$ret = [ ];
 		$blacklist = $this->getOpt( 'exclude-admins' );
 		foreach ( $data->query->allusers as $u ) {
 			if ( in_array( $u->name, $blacklist ) ) {
@@ -89,16 +89,16 @@ 
 	 *
 	 * @return array[]
 	 */
-	protected function getMissingGroups() : array {
-		$missing = [];
+	protected function getMissingGroups () : array {
+		$missing = [ ];
 		foreach ( $this->actualList as $adm => $groups ) {
-			$curMissing = array_diff( $groups, array_keys( $this->botList[$adm] ?? [] ) );
+			$curMissing = array_diff( $groups, array_keys( $this->botList[ $adm ] ?? [ ] ) );
 
 			foreach ( $curMissing as $group ) {
 				try {
 					$missing[ $adm ][ $group ] = $this->getFlagDate( $adm, $group );
 				} catch ( TaskException $e ) {
-					$this->errors[] = $e->getMessage();
+					$this->errors[ ] = $e->getMessage();
 				}
 			}
 		}
@@ -113,7 +113,7 @@ 
 	 * @return string
 	 * @throws TaskException
 	 */
-	protected function getFlagDate( string $admin, string $group ) : string {
+	protected function getFlagDate ( string $admin, string $group ) : string {
 		$this->getLogger()->info( "Retrieving $group flag date for $admin" );
 
 		$url = DEFAULT_URL;
@@ -149,7 +149,7 @@ 
 	 * @param string $group
 	 * @return string|null
 	 */
-	private function extractTimestamp( \stdClass $data, string $group ) : ?string {
+	private function extractTimestamp ( \stdClass $data, string $group ) : ?string {
 		$ts = null;
 		foreach ( $data->query->logevents as $entry ) {
 			if ( isset( $entry->params ) ) {
@@ -168,8 +168,8 @@ 
 	 *
 	 * @return array[]
 	 */
-	protected function getExtraGroups() : array {
-		$extra = [];
+	protected function getExtraGroups () : array {
+		$extra = [ ];
 		foreach ( $this->botList as $name => $groups ) {
 			$groups = array_diff_key( $groups, array_fill_keys( PageBotList::NON_GROUP_KEYS, 1 ) );
 			if ( !isset( $this->actualList[ $name ] ) ) {
@@ -187,9 +187,9 @@ 
 	 * @param string[] $names
 	 * @return string[] [ old_name => new_name ]
 	 */
-	protected function checkRenamedUsers( array $names ) : array {
+	protected function checkRenamedUsers ( array $names ) : array {
 		if ( !$names ) {
-			return [];
+			return [ ];
 		}
 		$this->getLogger()->info( 'Checking rename for ' . implode( ', ', $names ) );
 
@@ -207,7 +207,7 @@ 
 		];
 
 		$data = RequestBase::newFromParams( $params )->execute();
-		$ret = [];
+		$ret = [ ];
 		foreach ( $data->query->logevents as $entry ) {
 			$time = strtotime( $entry->timestamp );
 			// 1 month is arbitrary
@@ -227,10 +227,10 @@ 
 	 * @param array[] $extra
 	 * @return array[]
 	 */
-	protected function getNewContent( array $missing, array $extra ) : array {
+	protected function getNewContent ( array $missing, array $extra ) : array {
 		$newContent = $this->botList;
 		$renameMap = $this->checkRenamedUsers( array_keys( $extra ) );
-		$removed = [];
+		$removed = [ ];
 		foreach ( $newContent as $user => $groups ) {
 			if ( isset( $missing[ $user ] ) ) {
 				$newContent[ $user ] = array_merge( $groups, $missing[ $user ] );
@@ -240,7 +240,7 @@ 
 				if ( array_diff_key( $newGroups, array_fill_keys( PageBotList::NON_GROUP_KEYS, 1 ) ) ) {
 					$newContent[ $user ] = $newGroups;
 				} else {
-					$removed[$user] = $newContent[$user];
+					$removed[ $user ] = $newContent[ $user ];
 					unset( $newContent[ $user ] );
 				}
 			}
@@ -251,17 +251,17 @@ 
 		foreach ( $removed as $oldName => $info ) {
 			if (
 				array_key_exists( $oldName, $renameMap ) &&
-				array_key_exists( $renameMap[$oldName], $newContent )
+				array_key_exists( $renameMap[ $oldName ], $newContent )
 			) {
 				// This user was renamed! Add this name as alias, if they're still listed
 				$newName = $renameMap[ $oldName ];
 				$this->getLogger()->info( "Found rename $oldName -> $newName" );
 				if ( array_key_exists( 'aliases', $newContent[ $newName ] ) ) {
-					if ( !in_array( $oldName, $newContent[ $newName ]['aliases'] ) ) {
-						$newContent[ $newName ]['aliases'][] = $oldName;
+					if ( !in_array( $oldName, $newContent[ $newName ][ 'aliases' ] ) ) {
+						$newContent[ $newName ][ 'aliases' ][ ] = $oldName;
 					}
 				} else {
-					$newContent[ $newName ]['aliases'] = [ $oldName ];
+					$newContent[ $newName ][ 'aliases' ] = [ $oldName ];
 				}
 				// Transfer overrides to the new name.
 				$overrides = array_diff_key( $info, [ 'override' => 1, 'override-perm' => 1 ] );
@@ -281,21 +281,21 @@ 
 	 * @param array[] $newContent
 	 * @return array[]
 	 */
-	protected function removeOverrides( array $newContent ) : array {
-		$removed = [];
+	protected function removeOverrides ( array $newContent ) : array {
+		$removed = [ ];
 		foreach ( $newContent as $user => $groups ) {
-			if ( !isset( $groups['override'] ) ) {
+			if ( !isset( $groups[ 'override' ] ) ) {
 				continue;
 			}
 
 			$flagTS = PageBotList::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;
 
 			if ( time() > $usualTS + $delay && time() > $overrideTS + $delay ) {
 				unset( $newContent[ $user ][ 'override' ] );
-				$removed[] = $user;
+				$removed[ ] = $user;
 			}
 		}