Daimona / BotRiconferme

includes/Task/UpdateList.php

Spacing +63 added lines, -63 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task;
 
@@ -16,18 +16,18 @@ 
 	 * @inheritDoc
 	 */
 	public function run() : TaskResult {
-		$this->getLogger()->info( 'Starting task UpdateList' );
+		$this->getLogger()->info('Starting task UpdateList');
 		$this->actualList = $this->getActualAdmins();
 		$this->botList = $this->getList();
 
 		$missing = $this->getMissingGroups();
 		$extra = $this->getExtraGroups();
 
-		if ( $missing || $extra ) {
-			$this->doUpdateList( $this->getNewContent( $missing, $extra ) );
+		if ($missing || $extra) {
+			$this->doUpdateList($this->getNewContent($missing, $extra));
 		}
 
-		if ( $this->errors ) {
+		if ($this->errors) {
 			// We're fine with it, but don't run other tasks
 			$msg = 'Task UpdateList completed with warnings.';
 			$status = self::STATUS_ERROR;
@@ -36,15 +36,15 @@ 
 			$status = self::STATUS_OK;
 		}
 
-		$this->getLogger()->info( $msg );
-		return new TaskResult( $status, $this->errors );
+		$this->getLogger()->info($msg);
+		return new TaskResult($status, $this->errors);
 	}
 
 	/**
 	 * @return array
 	 */
 	protected function getActualAdmins() : array {
-		$this->getLogger()->debug( 'Retrieving admins - API' );
+		$this->getLogger()->debug('Retrieving admins - API');
 		$params = [
 			'action' => 'query',
 			'list' => 'allusers',
@@ -53,23 +53,23 @@ 
 			'aulimit' => 'max',
 		];
 
-		$req = RequestBase::newFromParams( $params );
-		return $this->extractAdmins( $req->execute() );
+		$req = RequestBase::newFromParams($params);
+		return $this->extractAdmins($req->execute());
 	}
 
 	/**
 	 * @param array $data
 	 * @return array
 	 */
-	protected function extractAdmins( array $data ) : array {
+	protected function extractAdmins(array $data) : array {
 		$ret = [];
-		$blacklist = $this->getConfig()->get( 'exclude-admins' );
-		foreach ( $data['query']['allusers'] as $u ) {
-			if ( in_array( $u['name'], $blacklist ) ) {
+		$blacklist = $this->getConfig()->get('exclude-admins');
+		foreach ($data['query']['allusers'] as $u) {
+			if (in_array($u['name'], $blacklist)) {
 				continue;
 			}
-			$interestingGroups = array_intersect( $u['groups'], [ 'sysop', 'bureaucrat', 'checkuser' ] );
-			$ret[ $u['name'] ] = $interestingGroups;
+			$interestingGroups = array_intersect($u['groups'], ['sysop', 'bureaucrat', 'checkuser']);
+			$ret[$u['name']] = $interestingGroups;
 		}
 		return $ret;
 	}
@@ -78,10 +78,10 @@ 
 	 * @return array
 	 */
 	protected function getList() : array {
-		$this->getLogger()->debug( 'Retrieving admins - JSON list' );
-		$content = $this->getController()->getPageContent( $this->getConfig()->get( 'list-title' ) );
+		$this->getLogger()->debug('Retrieving admins - JSON list');
+		$content = $this->getController()->getPageContent($this->getConfig()->get('list-title'));
 
-		return json_decode( $content, true );
+		return json_decode($content, true);
 	}
 
 	/**
@@ -89,20 +89,20 @@ 
 	 */
 	protected function getMissingGroups() : array {
 		$missing = [];
-		foreach ( $this->actualList as $adm => $groups ) {
-			if ( !isset( $this->botList[ $adm ] ) ) {
+		foreach ($this->actualList as $adm => $groups) {
+			if (!isset($this->botList[$adm])) {
 				$groupsList = $groups;
-			} elseif ( count( $groups ) > count( $this->botList[$adm] ) ) {
+			} elseif (count($groups) > count($this->botList[$adm])) {
 				// Only some groups are missing
-				$groupsList = array_diff_key( $groups, $this->botList[$adm] );
+				$groupsList = array_diff_key($groups, $this->botList[$adm]);
 			} else {
 				continue;
 			}
 
-			foreach ( $groupsList as $group ) {
+			foreach ($groupsList as $group) {
 				try {
-					$missing[ $adm ][ $group ] = $this->getFlagDate( $adm, $group );
-				} catch ( TaskException $e ) {
+					$missing[$adm][$group] = $this->getFlagDate($adm, $group);
+				} catch (TaskException $e) {
 					$this->errors[] = $e->getMessage();
 				}
 			}
@@ -116,10 +116,10 @@ 
 	 * @return string
 	 * @throws TaskException
 	 */
-	protected function getFlagDate( string $admin, string $group ) : string {
-		$this->getLogger()->info( "Retrieving $group flag date for $admin" );
+	protected function getFlagDate(string $admin, string $group) : string {
+		$this->getLogger()->info("Retrieving $group flag date for $admin");
 
-		if ( $group === 'checkuser' ) {
+		if ($group === 'checkuser') {
 			// Little hack
 			$oldUrl = RequestBase::$url;
 			RequestBase::$url = 'https://meta.wikimedia.org/w/api.php';
@@ -135,19 +135,19 @@ 
 			'lelimit' => 'max'
 		];
 
-		$req = RequestBase::newFromParams( $params );
+		$req = RequestBase::newFromParams($params);
 		$data = $req->execute();
-		$ts = $this->extractTimestamp( $data, $group );
+		$ts = $this->extractTimestamp($data, $group);
 
-		if ( isset( $oldUrl ) ) {
+		if (isset($oldUrl)) {
 			RequestBase::$url = $oldUrl;
 		}
 
-		if ( $ts === null ) {
-			throw new TaskException( "$group flag date unavailable for $admin" );
+		if ($ts === null) {
+			throw new TaskException("$group flag date unavailable for $admin");
 		}
 
-		return date( "d/m/Y", strtotime( $ts ) );
+		return date("d/m/Y", strtotime($ts));
 	}
 
 	/**
@@ -155,15 +155,15 @@ 
 	 * @param string $group
 	 * @return string|null
 	 */
-	private function extractTimestamp( array $data, string $group ) : ?string {
+	private function extractTimestamp(array $data, string $group) : ?string {
 		$ts = null;
-		foreach ( $data['query']['logevents'] as $entry ) {
-			if ( !isset( $entry['params'] ) ) {
+		foreach ($data['query']['logevents'] as $entry) {
+			if (!isset($entry['params'])) {
 				// Old entries
 				continue;
 			}
-			if ( in_array( $group, $entry['params']['newgroups'] ) &&
-				!in_array( $group, $entry['params']['oldgroups'] )
+			if (in_array($group, $entry['params']['newgroups']) &&
+				!in_array($group, $entry['params']['oldgroups'])
 			) {
 				$ts = $entry['timestamp'];
 				break;
@@ -176,11 +176,11 @@ 
 	 */
 	protected function getExtraGroups() : array {
 		$extra = [];
-		foreach ( $this->botList as $name => $groups ) {
-			if ( !isset( $this->actualList[ $name ] ) ) {
-				$extra[ $name ] = $groups;
-			} elseif ( count( $groups ) > count( $this->actualList[ $name ] ) ) {
-				$extra[ $name ] = array_diff_key( $groups, $this->actualList[ $name ] );
+		foreach ($this->botList as $name => $groups) {
+			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;
@@ -189,25 +189,25 @@ 
 	/**
 	 * @param array $newContent
 	 */
-	protected function doUpdateList( array $newContent ) {
-		ksort( $newContent );
+	protected function doUpdateList(array $newContent) {
+		ksort($newContent);
 
-		if ( $newContent !== $this->botList ) {
-			$this->getLogger()->info( 'Updating admin list' );
+		if ($newContent !== $this->botList) {
+			$this->getLogger()->info('Updating admin list');
 		} else {
-			$this->getLogger()->info( 'Admin list already up-to-date' );
+			$this->getLogger()->info('Admin list already up-to-date');
 			return;
 		}
 
-		$stringified = json_encode( $newContent );
+		$stringified = json_encode($newContent);
 
 		$params = [
-			'title' => $this->getConfig()->get( 'list-title' ),
+			'title' => $this->getConfig()->get('list-title'),
 			'text' => $stringified,
-			'summary' => $this->getConfig()->get( 'list-update-summary' )
+			'summary' => $this->getConfig()->get('list-update-summary')
 		];
 
-		$this->getController()->editPage( $params );
+		$this->getController()->editPage($params);
 	}
 
 	/**
@@ -215,19 +215,19 @@ 
 	 * @param array[] $extra
 	 * @return array[]
 	 */
-	protected function getNewContent( array $missing, array $extra ) : array {
+	protected function getNewContent(array $missing, array $extra) : array {
 		$newContent = $this->botList;
-		foreach ( $newContent as $user => $groups ) {
-			if ( isset( $missing[ $user ] ) ) {
-				$newContent[ $user ] = array_merge( $groups, $missing[ $user ] );
-				unset( $missing[ $user ] );
-			} elseif ( isset( $extra[ $user ] ) ) {
-				$newContent[ $user ] = array_diff_key( $groups, $extra[ $user ] );
+		foreach ($newContent as $user => $groups) {
+			if (isset($missing[$user])) {
+				$newContent[$user] = array_merge($groups, $missing[$user]);
+				unset($missing[$user]);
+			} elseif (isset($extra[$user])) {
+				$newContent[$user] = array_diff_key($groups, $extra[$user]);
 			}
 		}
 		// Add users which don't have an entry at all
-		$newContent = array_merge( $newContent, $missing );
+		$newContent = array_merge($newContent, $missing);
 		// And remove empty users
-		return array_filter( $newContent );
+		return array_filter($newContent);
 	}
 }

includes/Config.php

Spacing +20 added lines, -20 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -22,26 +22,26 @@ 
 	 *
 	 * @param array $defaults
 	 */
-	public static function init( array $defaults ) {
-		if ( self::$instance ) {
-			throw new ConfigException( 'Config was already initialized' );
+	public static function init(array $defaults) {
+		if (self::$instance) {
+			throw new ConfigException('Config was already initialized');
 		}
 
 		$inst = new self;
-		$inst->set( 'list-title', $defaults['list-title'] );
-		$inst->set( 'username', $defaults['username'] );
-		$inst->set( 'password', $defaults['password'] );
+		$inst->set('list-title', $defaults['list-title']);
+		$inst->set('username', $defaults['username']);
+		$inst->set('password', $defaults['password']);
 		self::$instance = $inst;
 
 		// On-wiki values
 		try {
-			$conf = ( new WikiController )->getPageContent( $defaults[ 'config-title' ] );
-		} catch ( MissingPageException $e ) {
-			throw new ConfigException( 'Please create a config page.' );
+			$conf = (new WikiController)->getPageContent($defaults['config-title']);
+		} catch (MissingPageException $e) {
+			throw new ConfigException('Please create a config page.');
 		}
 
-		foreach ( json_decode( $conf, true ) as $key => $val ) {
-			self::$instance->set( $key, $val );
+		foreach (json_decode($conf, true) as $key => $val) {
+			self::$instance->set($key, $val);
 		}
 	}
 
@@ -49,8 +49,8 @@ 
 	 * @param string $key
 	 * @param mixed $value
 	 */
-	public function set( string $key, $value ) {
-		$this->opts[ $key ] = $value;
+	public function set(string $key, $value) {
+		$this->opts[$key] = $value;
 	}
 
 	/**
@@ -59,8 +59,8 @@ 
 	 * @return self
 	 */
 	public static function getInstance() : self {
-		if ( !self::$instance ) {
-			throw new ConfigException( 'Config not yet initialized' );
+		if (!self::$instance) {
+			throw new ConfigException('Config not yet initialized');
 		}
 		return self::$instance;
 	}
@@ -69,10 +69,10 @@ 
 	 * @param string $opt
 	 * @return mixed
 	 */
-	public function get( string $opt ) {
-		if ( !isset( $this->opts[ $opt ] ) ) {
-			throw new ConfigException( "Config option '$opt' not set." );
+	public function get(string $opt) {
+		if (!isset($this->opts[$opt])) {
+			throw new ConfigException("Config option '$opt' not set.");
 		}
-		return $this->opts[ $opt ];
+		return $this->opts[$opt];
 	}
 }

includes/WikiController.php

Spacing +30 added lines, -30 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -24,8 +24,8 @@ 
 	 * @return string
 	 * @throws MissingPageException
 	 */
-	public function getPageContent( string $title ) : string {
-		$this->logger->debug( "Retrieving page $title" );
+	public function getPageContent(string $title) : string {
+		$this->logger->debug("Retrieving page $title");
 		$params = [
 			'action' => 'query',
 			'titles' => $title,
@@ -35,11 +35,11 @@ 
 			'rvlimit' => 1
 		];
 
-		$req = RequestBase::newFromParams( $params );
+		$req = RequestBase::newFromParams($params);
 		$data = $req->execute();
-		$page = reset( $data['query']['pages'] );
-		if ( isset( $page['missing'] ) ) {
-			throw new MissingPageException( $title );
+		$page = reset($data['query']['pages']);
+		if (isset($page['missing'])) {
+			throw new MissingPageException($title);
 		}
 
 		return $page['revisions'][0]['slots']['main']['*'];
@@ -51,19 +51,19 @@ 
 	 * @param array $params
 	 * @throws APIRequestException
 	 */
-	public function editPage( array $params ) {
+	public function editPage(array $params) {
 		$this->login();
 
 		$params = [
 			'action' => 'edit',
-			'token' => $this->getToken( 'csrf' ),
-			'bot' => Config::getInstance()->get( 'bot-edits' )
+			'token' => $this->getToken('csrf'),
+			'bot' => Config::getInstance()->get('bot-edits')
 		] + $params;
 
-		$req = RequestBase::newFromParams( $params, true );
+		$req = RequestBase::newFromParams($params, true);
 		$res = $req->execute();
-		if ( $res['edit']['result'] !== 'Success' ) {
-			throw new APIRequestException( $res['edit']['info'] );
+		if ($res['edit']['result'] !== 'Success') {
+			throw new APIRequestException($res['edit']['info']);
 		}
 	}
 
@@ -71,55 +71,55 @@ 
 	 * @throws LoginException
 	 */
 	public function login() {
-		if ( self::$loggedIn ) {
-			$this->logger->debug( 'Already logged in' );
+		if (self::$loggedIn) {
+			$this->logger->debug('Already logged in');
 			return;
 		}
 
-		$this->logger->debug( 'Logging in' );
+		$this->logger->debug('Logging in');
 
 		$params = [
 			'action' => 'login',
-			'lgname' => Config::getInstance()->get( 'username' ),
-			'lgpassword' => Config::getInstance()->get( 'password' ),
-			'lgtoken' => $this->getToken( 'login' )
+			'lgname' => Config::getInstance()->get('username'),
+			'lgpassword' => Config::getInstance()->get('password'),
+			'lgtoken' => $this->getToken('login')
 		];
 
 		try {
-			$req = RequestBase::newFromParams( $params, true );
+			$req = RequestBase::newFromParams($params, true);
 			$res = $req->execute();
-		} catch ( APIRequestException $e ) {
-			throw new LoginException( $e->getMessage() );
+		} catch (APIRequestException $e) {
+			throw new LoginException($e->getMessage());
 		}
 
-		if ( !isset( $res['login']['result'] ) || $res['login']['result'] !== 'Success' ) {
-			throw new LoginException( 'Unknown error' );
+		if (!isset($res['login']['result']) || $res['login']['result'] !== 'Success') {
+			throw new LoginException('Unknown error');
 		}
 
 		self::$loggedIn = true;
 		// Clear tokens cache
 		$this->tokens = [];
-		$this->logger->debug( 'Login succeeded' );
+		$this->logger->debug('Login succeeded');
 	}
 
 	/**
 	 * @param string $type
 	 * @return string
 	 */
-	public function getToken( string $type ) : string {
-		if ( !isset( $this->tokens[ $type ] ) ) {
+	public function getToken(string $type) : string {
+		if (!isset($this->tokens[$type])) {
 			$params = [
 				'action' => 'query',
 				'meta'   => 'tokens',
 				'type'   => $type
 			];
 
-			$req = RequestBase::newFromParams( $params );
+			$req = RequestBase::newFromParams($params);
 			$res = $req->execute();
 
-			$this->tokens[ $type ] = $res['query']['tokens']["{$type}token"];
+			$this->tokens[$type] = $res['query']['tokens']["{$type}token"];
 		}
 
-		return $this->tokens[ $type ];
+		return $this->tokens[$type];
 	}
 }