Daimona / BotRiconferme

includes/Task/CreatePage.php

Spacing +46 added lines, -46 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task;
 
@@ -14,15 +14,15 @@ 
 	 * @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);
 	}
 
 	/**
@@ -31,27 +31,27 @@ 
 	 * @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 today. PLZ let this poor bot work!
-			$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);
 	}
 
 	/**
@@ -61,9 +61,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',
@@ -72,16 +72,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;
 			}
 		}
@@ -92,7 +92,7 @@ 
 	 * @param string $title
 	 * @return bool
 	 */
-	private function pageWasCreatedToday( string $title ) : bool {
+	private function pageWasCreatedToday(string $title) : bool {
 		$params = [
 			'action' => 'query',
 			'prop' => 'revisions',
@@ -103,10 +103,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);
 	}
 
 	/**
@@ -116,24 +116,24 @@ 
 	 * @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'],
 			'$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);
 	}
 
 	/**
@@ -142,16 +142,16 @@ 
 	 * @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);
 	}
 
 	/**
@@ -159,15 +159,15 @@ 
 	 * @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

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -26,26 +26,26 @@ 
 	 * @param array $defaults
 	 * @throws ConfigException
 	 */
-	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);
 		}
 	}
 
@@ -55,8 +55,8 @@ 
 	 * @param string $key
 	 * @param mixed $value
 	 */
-	protected function set( string $key, $value ) {
-		$this->opts[ $key ] = $value;
+	protected function set(string $key, $value) {
+		$this->opts[$key] = $value;
 	}
 
 	/**
@@ -66,8 +66,8 @@ 
 	 * @throws ConfigException
 	 */
 	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;
 	}
@@ -79,10 +79,10 @@ 
 	 * @return mixed
 	 * @throws ConfigException
 	 */
-	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];
 	}
 }

run.php

Spacing +22 added lines, -22 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 /**
  * Entry point for the bot, called by CLI
  */
@@ -9,8 +9,8 @@ 
 use BotRiconferme\Bot;
 use BotRiconferme\Request\RequestBase;
 
-if ( PHP_SAPI !== 'cli' ) {
-	exit( 'CLI only!' );
+if (PHP_SAPI !== 'cli') {
+	exit('CLI only!');
 }
 
 /** MAIN PARAMS */
@@ -29,14 +29,14 @@ 
 	'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!');
 }
 
 /* URL (for debugging purpose) */
-$url = getopt( '', [ 'force-url:' ] );
-if ( isset( $url['force-url'] ) ) {
+$url = getopt('', ['force-url:']);
+if (isset($url['force-url'])) {
 	RequestBase::$url = $url['force-url'];
 }
 
@@ -50,38 +50,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();
 }