Daimona / BotRiconferme

includes/Task/UpdateList.php

Spacing +65 added lines, -65 removed lines

@@ -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,13 +116,13 @@ 
 	 * @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 = $this->getConfig()->get( 'url' );
-			$this->getConfig()->set( 'url', 'https://meta.wikimedia.org/w/api.php' );
+			$oldUrl = $this->getConfig()->get('url');
+			$this->getConfig()->set('url', 'https://meta.wikimedia.org/w/api.php');
 			$admin .= '@itwiki';
 		}
 
@@ -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 ) ) {
-			$this->getConfig()->set( 'url', $oldUrl );
+		if (isset($oldUrl)) {
+			$this->getConfig()->set('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/Task/Task.php

Spacing +7 added lines, -7 removed lines

@@ -18,9 +18,9 @@ 
 	/**
 	 * @param TaskDataProvider $dataProvider
 	 */
-	public function __construct( TaskDataProvider $dataProvider ) {
-		set_exception_handler( [ $this, 'handleException' ] );
-		set_error_handler( [ $this, 'handleError' ] );
+	public function __construct(TaskDataProvider $dataProvider) {
+		set_exception_handler([$this, 'handleException']);
+		set_error_handler([$this, 'handleError']);
 		parent::__construct();
 		$this->dataProvider = $dataProvider;
 	}
@@ -43,9 +43,9 @@ 
 	 * @param \Throwable $ex
 	 * @protected
 	 */
-	public function handleException( \Throwable $ex ) {
+	public function handleException(\Throwable $ex) {
 		$this->getLogger()->error(
-			get_class( $ex ) . ': ' .
+			get_class($ex) . ': ' .
 			$ex->getMessage() . "\nTrace:\n" .
 			$ex->getTraceAsString()
 		);
@@ -60,8 +60,8 @@ 
 	 * @param int $errline
 	 * @protected
 	 */
-	public function handleError( $errno, $errstr, $errfile, $errline ) {
-		throw new \ErrorException( $errstr, 0, $errno, $errfile, $errline );
+	public function handleError($errno, $errstr, $errfile, $errline) {
+		throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
 	}
 
 	/**

includes/Task/CreatePage.php

Spacing +46 added lines, -46 removed lines

@@ -11,42 +11,42 @@ 
 	 * @inheritDoc
 	 */
 	public function run() : TaskResult {
-		$this->getLogger()->info( 'Starting task CreatePage' );
+		$this->getLogger()->info('Starting task CreatePage');
 		$users = $this->getDataProvider()->getUsersToProcess();
 
-		foreach ( $users as $user => $groups ) {
-			$this->processUser( $user, $groups );
+		foreach ($users as $user => $groups) {
+			$this->processUser($user, $groups);
 		}
 
-		$this->getLogger()->info( 'Task CreatePage completed successfully' );
-		return new TaskResult( self::STATUS_OK );
+		$this->getLogger()->info('Task CreatePage completed successfully');
+		return new TaskResult(self::STATUS_OK);
 	}
 
 	/**
 	 * @param string $user
 	 * @param array $groups
 	 */
-	protected function processUser( string $user, array $groups ) {
+	protected function processUser(string $user, array $groups) {
 		try {
-			$num = $this->getLastPageNum( $user ) + 1;
-		} catch ( TaskException $e ) {
+			$num = $this->getLastPageNum($user) + 1;
+		} catch (TaskException $e) {
 			// The page was already created.
-			$this->getDataProvider()->removeUser( $user );
-			$this->getLogger()->warning( $e->getMessage() . "\nRemoving $user." );
+			$this->getDataProvider()->removeUser($user);
+			$this->getLogger()->warning($e->getMessage() . "\nRemoving $user.");
 			return;
 		}
 
-		$baseTitle = $this->getConfig()->get( 'ric-main-page' ) . "/$user";
+		$baseTitle = $this->getConfig()->get('ric-main-page') . "/$user";
 		$pageTitle = "$baseTitle/$num";
-		$this->doCreatePage( $pageTitle, $user, $groups );
+		$this->doCreatePage($pageTitle, $user, $groups);
 
-		$newText = str_replace( '$title', $pageTitle, $this->getConfig()->get( 'ric-base-page-text' ) );
-		if ( $num === 1 ) {
-			$this->createBasePage( $baseTitle, $newText );
+		$newText = str_replace('$title', $pageTitle, $this->getConfig()->get('ric-base-page-text'));
+		if ($num === 1) {
+			$this->createBasePage($baseTitle, $newText);
 		} else {
-			$this->updateBasePage( $baseTitle, $newText );
+			$this->updateBasePage($baseTitle, $newText);
 		}
-		$this->getDataProvider()->addCreatedPages( $pageTitle );
+		$this->getDataProvider()->addCreatedPages($pageTitle);
 	}
 
 	/**
@@ -54,9 +54,9 @@ 
 	 * @return int
 	 * @throws TaskException
 	 */
-	protected function getLastPageNum( string $user ) : int {
-		$this->getLogger()->debug( "Retrieving previous pages for $user" );
-		$unprefixedTitle = explode( ':', $this->getConfig()->get( 'ric-main-page' ), 2 )[1];
+	protected function getLastPageNum(string $user) : int {
+		$this->getLogger()->debug("Retrieving previous pages for $user");
+		$unprefixedTitle = explode(':', $this->getConfig()->get('ric-main-page'), 2)[1];
 		$params = [
 			'action' => 'query',
 			'list' => 'allpages',
@@ -65,16 +65,16 @@ 
 			'aplimit' => 'max'
 		];
 
-		$res = ( RequestBase::newFromParams( $params ) )->execute();
+		$res = (RequestBase::newFromParams($params))->execute();
 
 		$last = 0;
-		foreach ( $res['query']['allpages'] as $page ) {
-			if ( $this->pageWasCreatedToday( $page['title'] ) ) {
-				throw new TaskException( 'Page ' . $page['title'] . ' was already created.' );
+		foreach ($res['query']['allpages'] as $page) {
+			if ($this->pageWasCreatedToday($page['title'])) {
+				throw new TaskException('Page ' . $page['title'] . ' was already created.');
 			}
-			$bits = explode( '/', $page['title'] );
-			$cur = intval( end( $bits ) );
-			if ( is_numeric( $cur ) && $cur > $last ) {
+			$bits = explode('/', $page['title']);
+			$cur = intval(end($bits));
+			if (is_numeric($cur) && $cur > $last) {
 				$last = $cur;
 			}
 		}
@@ -85,7 +85,7 @@ 
 	 * @param string $title
 	 * @return bool
 	 */
-	private function pageWasCreatedToday( string $title ) : bool {
+	private function pageWasCreatedToday(string $title) : bool {
 		$params = [
 			'action' => 'query',
 			'prop' => 'revisions',
@@ -96,10 +96,10 @@ 
 			'rvdir' => 'newer'
 		];
 
-		$res = ( RequestBase::newFromParams( $params ) )->execute();
+		$res = (RequestBase::newFromParams($params))->execute();
 		$data = $res['query']['pages'];
-		$time = strtotime( reset( $data )['revisions'][0]['timestamp'] );
-		return date( 'z/Y' ) === date( 'z/Y', $time );
+		$time = strtotime(reset($data)['revisions'][0]['timestamp']);
+		return date('z/Y') === date('z/Y', $time);
 	}
 
 	/**
@@ -107,56 +107,56 @@ 
 	 * @param string $user
 	 * @param array $groups
 	 */
-	protected function doCreatePage( string $title, string $user, array $groups ) {
-		$this->getLogger()->info( "Creating page $title" );
-		$text = $this->getConfig()->get( 'ric-page-text' );
+	protected function doCreatePage(string $title, string $user, array $groups) {
+		$this->getLogger()->info("Creating page $title");
+		$text = $this->getConfig()->get('ric-page-text');
 		$textParams = [
 			'$user' => $user,
 			'$date' => $groups['sysop'],
-			'$quorum' => '',##################################################################Handle on-wiki
+			'$quorum' => '', ##################################################################Handle on-wiki
 			'$burocrate' => $groups['bureaucrat'] ?? '',
 			'$checkuser' => $groups['checkuser'] ?? ''
 		];
-		$text = strtr( $text, $textParams );
+		$text = strtr($text, $textParams);
 
 		$params = [
 			'title' => $title,
 			'text' => $text,
-			'summary' => $this->getConfig()->get( 'ric-page-summary' )
+			'summary' => $this->getConfig()->get('ric-page-summary')
 		];
 
-		$this->getController()->editPage( $params );
+		$this->getController()->editPage($params);
 	}
 
 	/**
 	 * @param string $title
 	 * @param string $newText
 	 */
-	protected function createBasePage( string $title, string $newText ) {
-		$this->getLogger()->info( "Creating base page $title" );
+	protected function createBasePage(string $title, string $newText) {
+		$this->getLogger()->info("Creating base page $title");
 
 		$params = [
 			'title' => $title,
 			'text' => $newText,
-			'summary' => $this->getConfig()->get( 'ric-base-page-summary' )
+			'summary' => $this->getConfig()->get('ric-base-page-summary')
 		];
 
-		$this->getController()->editPage( $params );
+		$this->getController()->editPage($params);
 	}
 
 	/**
 	 * @param string $title
 	 * @param string $newText
 	 */
-	protected function updateBasePage( string $title, string $newText ) {
-		$this->getLogger()->info( "Updating base page $title" );
+	protected function updateBasePage(string $title, string $newText) {
+		$this->getLogger()->info("Updating base page $title");
 
 		$params = [
 			'title' => $title,
 			'appendtext' => $newText,
-			'summary' => $this->getConfig()->get( 'ric-base-page-summary-update' )
+			'summary' => $this->getConfig()->get('ric-base-page-summary-update')
 		];
 
-		$this->getController()->editPage( $params );
+		$this->getController()->editPage($params);
 	}
 }

includes/Config.php

Spacing +20 added lines, -20 removed lines

@@ -22,27 +22,27 @@ 
 	 *
 	 * @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( 'url', $defaults['url'] );
-		$inst->set( 'list-title', $defaults['list-title'] );
-		$inst->set( 'username', $defaults['username'] );
-		$inst->set( 'password', $defaults['password'] );
+		$inst->set('url', $defaults['url']);
+		$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);
 		}
 	}
 
@@ -50,8 +50,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;
 	}
 
 	/**
@@ -60,8 +60,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;
 	}
@@ -70,10 +70,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/TaskResult.php

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
 	 * @param int $status One of the Task::STATUS_* constants
 	 * @param string[] $errors
 	 */
-	public function __construct( int $status, array $errors = [] ) {
+	public function __construct(int $status, array $errors = []) {
 		$this->status = $status;
 		$this->errors = $errors;
 	}
@@ -39,25 +39,25 @@ 
 	/**
 	 * @param TaskResult $that
 	 */
-	public function merge( TaskResult $that ) {
+	public function merge(TaskResult $that) {
 		$this->status |= $that->status;
-		$this->errors = array_merge( $this->errors, $that->errors );
+		$this->errors = array_merge($this->errors, $that->errors);
 	}
 
 	/**
 	 * @return string
 	 */
 	public function __toString() {
-		if ( $this->isOK() ) {
+		if ($this->isOK()) {
 			$stat = 'OK';
 			$errs = "\tNo errors.";
 		} else {
 			$stat = 'ERROR';
 			$formattedErrs = [];
-			foreach ( $this->errors as $err ) {
+			foreach ($this->errors as $err) {
 				$formattedErrs[] = "\t - $err";
 			}
-			$errs = implode( "\n", $formattedErrs );
+			$errs = implode("\n", $formattedErrs);
 		}
 		return "=== RESULT ===\n - Status: $stat\n - Errors:\n$errs\n";
 	}

includes/WikiController.php

Spacing +27 added lines, -27 removed lines

@@ -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']['*'];
@@ -50,16 +50,16 @@ 
 	 *
 	 * @param array $params
 	 */
-	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);
 		$req->execute();
 	}
 
@@ -67,55 +67,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];
 	}
 }

includes/Bot.php

Spacing +11 added lines, -11 removed lines

@@ -14,13 +14,13 @@ 
 	 * Entry point for the whole process
 	 */
 	public function run() {
-		$this->logger->info( 'Starting full process.' );
+		$this->logger->info('Starting full process.');
 		$manager = new TaskManager;
-		$res = $manager->run( TaskManager::MODE_COMPLETE );
-		if ( $res->isOK() ) {
-			$this->logger->info( 'Execution completed successfully.' );
+		$res = $manager->run(TaskManager::MODE_COMPLETE);
+		if ($res->isOK()) {
+			$this->logger->info('Execution completed successfully.');
 		} else {
-			$this->logger->error( "Execution failed.\n$res" );
+			$this->logger->error("Execution failed.\n$res");
 		}
 	}
 
@@ -29,14 +29,14 @@ 
 	 *
 	 * @param string $task
 	 */
-	public function runSingle( string $task ) {
-		$this->logger->info( "Starting single task $task." );
+	public function runSingle(string $task) {
+		$this->logger->info("Starting single task $task.");
 		$manager = new TaskManager;
-		$res = $manager->run( TaskManager::MODE_SINGLE, $task );
-		if ( $res->isOK() ) {
-			$this->logger->info( "Execution of $task completed successfully." );
+		$res = $manager->run(TaskManager::MODE_SINGLE, $task);
+		if ($res->isOK()) {
+			$this->logger->info("Execution of $task completed successfully.");
 		} else {
-			$this->logger->error( "Execution of $task failed.\n$res" );
+			$this->logger->error("Execution of $task failed.\n$res");
 		}
 	}
 }

includes/TaskManager.php

Spacing +20 added lines, -20 removed lines

@@ -29,7 +29,7 @@ 
 	 * Should only be used for debugging purpose.
 	 */
 	public static function resetLastRunDate() {
-		file_put_contents( self::LOG_FILE, '' );
+		file_put_contents(self::LOG_FILE, '');
 	}
 
 	/**
@@ -37,12 +37,12 @@ 
 	 * @param string|null $taskName Only used in MODE_SINGLE
 	 * @return TaskResult
 	 */
-	public function run( int $mode, string $taskName = null ) : TaskResult {
+	public function run(int $mode, string $taskName = null) : TaskResult {
 		$this->provider = new TaskDataProvider;
-		if ( $mode === self::MODE_COMPLETE ) {
+		if ($mode === self::MODE_COMPLETE) {
 			return $this->runAllTasks();
 		} else {
-			return $this->runTask( $taskName );
+			return $this->runTask($taskName);
 		}
 	}
 
@@ -50,9 +50,9 @@ 
 	 * @return TaskResult
 	 */
 	protected function runAllTasks() : TaskResult {
-		if ( self::getLastFullRunDate() === date( 'd/m/Y' ) ) {
+		if (self::getLastFullRunDate() === date('d/m/Y')) {
 			// Really avoid executing twice the same day
-			return new TaskResult( TaskResult::STATUS_ERROR, [ 'A full run was already executed today.' ] );
+			return new TaskResult(TaskResult::STATUS_ERROR, ['A full run was already executed today.']);
 		}
 
 		// Order matters here
@@ -63,12 +63,12 @@ 
 			'user-notice'
 		];
 
-		$res = new TaskResult( TaskResult::STATUS_OK );
+		$res = new TaskResult(TaskResult::STATUS_OK);
 		do {
-			$res->merge( $this->runTask( current( $list ) ) );
-		} while ( $res->isOK() && next( $list ) );
+			$res->merge($this->runTask(current($list)));
+		} while ($res->isOK() && next($list));
 
-		if ( $res->isOK() ) {
+		if ($res->isOK()) {
 			self::setLastFullRunDate();
 		}
 
@@ -79,8 +79,8 @@ 
 	 * @return string|null d/m/Y or null if no last run registered
 	 */
 	public static function getLastFullRunDate() : ?string {
-		if ( file_exists( self::LOG_FILE ) ) {
-			return file_get_contents( self::LOG_FILE ) ?: null;
+		if (file_exists(self::LOG_FILE)) {
+			return file_get_contents(self::LOG_FILE) ?: null;
 		} else {
 			return null;
 		}
@@ -90,13 +90,13 @@ 
 	 * @param string $task Defined in self::TASKS_MAP
 	 * @return TaskResult
 	 */
-	protected function runTask( string $task ) : TaskResult {
-		if ( !isset( self::TASKS_MAP[ $task ] ) ) {
-			throw new \InvalidArgumentException( "'$task' is not a valid task." );
+	protected function runTask(string $task) : TaskResult {
+		if (!isset(self::TASKS_MAP[$task])) {
+			throw new \InvalidArgumentException("'$task' is not a valid task.");
 		}
 
-		$class = self::TASKS_MAP[ $task ];
-		return $this->getTaskInstance( $class )->run();
+		$class = self::TASKS_MAP[$task];
+		return $this->getTaskInstance($class)->run();
 	}
 
 	/**
@@ -105,11 +105,11 @@ 
 	 * @param string $class
 	 * @return Task
 	 */
-	private function getTaskInstance( string $class ) : Task {
-		return new $class( $this->provider );
+	private function getTaskInstance(string $class) : Task {
+		return new $class($this->provider);
 	}
 
 	public static function setLastFullRunDate() {
-		file_put_contents( self::LOG_FILE, date( 'd/m/Y' ) );
+		file_put_contents(self::LOG_FILE, date('d/m/Y'));
 	}
 }

run.php

Spacing +19 added lines, -19 removed lines

@@ -5,8 +5,8 @@ 
 use BotRiconferme\Config;
 use BotRiconferme\Bot;
 
-if ( PHP_SAPI !== 'cli' ) {
-	exit( 'CLI only!' );
+if (PHP_SAPI !== 'cli') {
+	exit('CLI only!');
 }
 
 /** MAIN PARAMS */
@@ -27,9 +27,9 @@ 
 	'config-title:'
 ];
 
-$vals = getopt( '', $params );
-if ( count( $vals ) !== count( $params ) ) {
-	exit( 'Not enough params!' );
+$vals = getopt('', $params);
+if (count($vals) !== count($params)) {
+	exit('Not enough params!');
 }
 
 /* PASSWORD */
@@ -42,38 +42,38 @@ 
  * --use-password-file
  * which will look for a $PWFILE file in the current directory containing only the plain password
  */
-$pwParams = getopt( '', [
+$pwParams = getopt('', [
 	'password:',
 	'use-password-file'
-] );
+]);
 
-if ( isset( $pwParams[ 'password' ] ) ) {
-	$pw = $pwParams[ 'password' ];
-} elseif ( isset( $pwParams[ 'use-password-file' ] ) ) {
-	if ( file_exists( $PWFILE ) ) {
-		$pw = trim( file_get_contents( $PWFILE ) );
+if (isset($pwParams['password'])) {
+	$pw = $pwParams['password'];
+} elseif (isset($pwParams['use-password-file'])) {
+	if (file_exists($PWFILE)) {
+		$pw = trim(file_get_contents($PWFILE));
 	} else {
-		exit( 'Please create a password.txt file to use with use-password-file' );
+		exit('Please create a password.txt file to use with use-password-file');
 	}
 } else {
-	exit( 'Please provide a password or use a password file' );
+	exit('Please provide a password or use a password file');
 }
 
-$vals[ 'password' ] = $pw;
+$vals['password'] = $pw;
 
 /* START */
 
-Config::init( $vals );
+Config::init($vals);
 
 $bot = new Bot();
 
 /*
  * E.g. --task=update-list
  */
-$taskOpts = getopt( '', [ 'task:' ] );
+$taskOpts = getopt('', ['task:']);
 
-if ( $taskOpts ) {
-	$bot->runSingle( $taskOpts[ 'task' ] );
+if ($taskOpts) {
+	$bot->runSingle($taskOpts['task']);
 } else {
 	$bot->run();
 }