Daimona / BotRiconferme

includes/TaskDataProvider.php

Spacing +21 added lines, -23 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -18,20 +18,20 @@ 
 	 * @return array[]
 	 */
 	public function getUsersToProcess() : array {
-		if ( $this->users === null ) {
-			$this->getLogger()->debug( 'Retrieving users list' );
-			$content = $this->getController()->getPageContent( $this->getConfig()->get( 'list-title' ) );
-			$listUsers = json_decode( $content, true );
+		if ($this->users === null) {
+			$this->getLogger()->debug('Retrieving users list');
+			$content = $this->getController()->getPageContent($this->getConfig()->get('list-title'));
+			$listUsers = json_decode($content, true);
 
 			$this->users = [];
-			foreach ( $listUsers as $user => $groups ) {
-				$timestamp = $this->getValidTimestamp( $groups );
+			foreach ($listUsers as $user => $groups) {
+				$timestamp = $this->getValidTimestamp($groups);
 
-				if ( date( 'd/m', $timestamp ) === date( 'd/m' ) &&
+				if (date('d/m', $timestamp) === date('d/m') &&
 					// Don't trigger if the date is actually today
-					date( 'd/m/Y', $timestamp ) !== date( 'd/m/Y' )
+					date('d/m/Y', $timestamp) !== date('d/m/Y')
 				) {
-					$this->users[ $user ] = $groups;
+					$this->users[$user] = $groups;
 				}
 			}
 		}
@@ -45,17 +45,15 @@ 
 	 * @param array $groups
 	 * @return int
 	 */
-	private function getValidTimestamp( array $groups ) : int {
-		$checkuser = isset( $groups[ 'checkuser' ] ) ?
-			\DateTime::createFromFormat( 'd/m/Y', $groups[ 'checkuser' ] )->getTimestamp() :
-			0;
-		$bureaucrat = isset( $groups[ 'bureaucrat' ] ) ?
-			\DateTime::createFromFormat( 'd/m/Y', $groups[ 'bureaucrat' ] )->getTimestamp() :
-			0;
+	private function getValidTimestamp(array $groups) : int {
+		$checkuser = isset($groups['checkuser']) ?
+			\DateTime::createFromFormat('d/m/Y', $groups['checkuser'])->getTimestamp() : 0;
+		$bureaucrat = isset($groups['bureaucrat']) ?
+			\DateTime::createFromFormat('d/m/Y', $groups['bureaucrat'])->getTimestamp() : 0;
 
-		$timestamp = max( $bureaucrat, $checkuser );
-		if ( $timestamp === 0 ) {
-			$timestamp = \DateTime::createFromFormat( 'd/m/Y', $groups[ 'sysop' ] )->getTimestamp();
+		$timestamp = max($bureaucrat, $checkuser);
+		if ($timestamp === 0) {
+			$timestamp = \DateTime::createFromFormat('d/m/Y', $groups['sysop'])->getTimestamp();
 		}
 		return $timestamp;
 	}
@@ -65,8 +63,8 @@ 
 	 *
 	 * @param string $name
 	 */
-	public function removeUser( string $name ) {
-		unset( $this->users[ $name ] );
+	public function removeUser(string $name) {
+		unset($this->users[$name]);
 	}
 
 	/**
@@ -79,7 +77,7 @@ 
 	/**
 	 * @param string $title
 	 */
-	public function addCreatedPages( string $title ) {
+	public function addCreatedPages(string $title) {
 		$this->createdPages[] = $title;
 	}
 }

includes/Request/RequestBase.php

Spacing +50 added lines, -50 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -37,8 +37,8 @@ 
 	 * @param array $params
 	 * @param bool $isPOST
 	 */
-	protected function __construct( array $params, bool $isPOST = false ) {
-		$this->params = [ 'format' => 'json' ] + $params;
+	protected function __construct(array $params, bool $isPOST = false) {
+		$this->params = ['format' => 'json'] + $params;
 		$this->method = $isPOST ? 'POST' : 'GET';
 	}
 
@@ -49,11 +49,11 @@ 
 	 * @param bool $isPOST
 	 * @return self
 	 */
-	public static function newFromParams( array $params, bool $isPOST = false ) : self {
-		if ( extension_loaded( 'curl' ) ) {
-			$ret = new CurlRequest( $params, $isPOST );
+	public static function newFromParams(array $params, bool $isPOST = false) : self {
+		if (extension_loaded('curl')) {
+			$ret = new CurlRequest($params, $isPOST);
 		} else {
-			$ret = new NativeRequest( $params, $isPOST );
+			$ret = new NativeRequest($params, $isPOST);
 		}
 		return $ret;
 	}
@@ -67,19 +67,19 @@ 
 		$curParams = $this->params;
 		$sets = [];
 		do {
-			$res = $this->makeRequestInternal( $curParams );
+			$res = $this->makeRequestInternal($curParams);
 
-			$this->handleErrorAndWarnings( $res );
+			$this->handleErrorAndWarnings($res);
 			$sets[] = $res;
 
 			$finished = true;
-			if ( isset( $res->continue ) ) {
-				$curParams = array_merge( $curParams, get_object_vars( $res->continue ) );
+			if (isset($res->continue)) {
+				$curParams = array_merge($curParams, get_object_vars($res->continue));
 				$finished = false;
 			}
-		} while ( !$finished );
+		} while (!$finished);
 
-		return $this->mergeSets( $sets );
+		return $this->mergeSets($sets);
 	}
 
 	/**
@@ -88,16 +88,16 @@ 
 	 * @param array $params
 	 * @return \stdClass
 	 */
-	private function makeRequestInternal( array $params ) : \stdClass {
-		if ( $this->method === 'POST' ) {
+	private function makeRequestInternal(array $params) : \stdClass {
+		if ($this->method === 'POST') {
 			$params['maxlag'] = self::MAXLAG;
 		}
-		$params = http_build_query( $params );
+		$params = http_build_query($params);
 
-		$body = $this->reallyMakeRequest( $params );
+		$body = $this->reallyMakeRequest($params);
 
-		$this->setCookies( $this->newCookies );
-		return json_decode( $body );
+		$this->setCookies($this->newCookies);
+		return json_decode($body);
 	}
 
 	/**
@@ -106,18 +106,18 @@ 
 	 * @param string $params
 	 * @return string
 	 */
-	abstract protected function reallyMakeRequest( string $params ) : string;
+	abstract protected function reallyMakeRequest(string $params) : string;
 
 	/**
 	 * After a request, set cookies for the next ones
 	 *
 	 * @param array $cookies
 	 */
-	protected function setCookies( array $cookies ) {
-		foreach ( $cookies as $cookie ) {
-			$bits = explode( ';', $cookie );
-			list( $name, $value ) = explode( '=', $bits[0] );
-			self::$cookiesToSet[ $name ] = $value;
+	protected function setCookies(array $cookies) {
+		foreach ($cookies as $cookie) {
+			$bits = explode(';', $cookie);
+			list($name, $value) = explode('=', $bits[0]);
+			self::$cookiesToSet[$name] = $value;
 		}
 	}
 
@@ -127,9 +127,9 @@ 
 	 * @param \stdClass $res
 	 * @throws APIRequestException
 	 */
-	protected function handleErrorAndWarnings( $res ) {
-		if ( isset( $res->error ) ) {
-			switch ( $res->error->code ) {
+	protected function handleErrorAndWarnings($res) {
+		if (isset($res->error)) {
+			switch ($res->error->code) {
 				case 'missingtitle':
 					$ex = new MissingPageException;
 					break;
@@ -137,13 +137,13 @@ 
 					$ex = new ProtectedPageException;
 					break;
 				default:
-					$ex = new APIRequestException( $res->error->code . ' - ' . $res->error->info );
+					$ex = new APIRequestException($res->error->code . ' - ' . $res->error->info);
 			}
 			throw $ex;
-		} elseif ( isset( $res->warnings ) ) {
-			$act = $this->params[ 'action' ];
+		} elseif (isset($res->warnings)) {
+			$act = $this->params['action'];
 			$warning = $res->warnings->$act;
-			throw new APIRequestException( reset( $warning ) );
+			throw new APIRequestException(reset($warning));
 		}
 	}
 
@@ -153,16 +153,16 @@ 
 	 * @param \stdClass[] $sets
 	 * @return array
 	 */
-	private function mergeSets( array $sets ) : array {
-		$sets = $this->objectToArray( $sets );
+	private function mergeSets(array $sets) : array {
+		$sets = $this->objectToArray($sets);
 		// Use the first set as template
-		$ret = array_shift( $sets );
+		$ret = array_shift($sets);
 		$act = $this->params['action'];
 
-		foreach ( $sets as $set ) {
+		foreach ($sets as $set) {
 			$ret[$act] = array_merge_recursive(
-				$this->objectToArray( $ret[$act] ),
-				$this->objectToArray( $set[$act] )
+				$this->objectToArray($ret[$act]),
+				$this->objectToArray($set[$act])
 			);
 		}
 		return $ret;
@@ -175,14 +175,14 @@ 
 	 * @param \stdClass|array $objOrArray
 	 * @return array
 	 */
-	private function objectToArray( $objOrArray ) : array {
+	private function objectToArray($objOrArray) : array {
 		$array = [];
-		if ( is_object( $objOrArray ) ) {
-			$objOrArray = get_object_vars( $objOrArray );
+		if (is_object($objOrArray)) {
+			$objOrArray = get_object_vars($objOrArray);
 		}
-		foreach ( $objOrArray as $key => $value ) {
-			if ( is_object( $value ) || is_array( $value ) ) {
-				$value = $this->objectToArray( $value );
+		foreach ($objOrArray as $key => $value) {
+			if (is_object($value) || is_array($value)) {
+				$value = $this->objectToArray($value);
 			}
 			$array[$key] = $value;
 		}
@@ -196,12 +196,12 @@ 
 	 */
 	protected function getHeaders() :array {
 		$ret = self::HEADERS;
-		if ( self::$cookiesToSet ) {
+		if (self::$cookiesToSet) {
 			$cookies = [];
-			foreach ( self::$cookiesToSet as $cname => $cval ) {
-				$cookies[] = trim( "$cname=$cval" );
+			foreach (self::$cookiesToSet as $cname => $cval) {
+				$cookies[] = trim("$cname=$cval");
 			}
-			$ret[] = 'Cookie: ' . implode( '; ', $cookies );
+			$ret[] = 'Cookie: ' . implode('; ', $cookies);
 		}
 		return $ret;
 	}
@@ -212,9 +212,9 @@ 
 	 * @param array $headers
 	 * @return string
 	 */
-	protected function buildHeadersString( array $headers ) : string {
+	protected function buildHeadersString(array $headers) : string {
 		$ret = '';
-		foreach ( $headers as $header ) {
+		foreach ($headers as $header) {
 			$ret .= "$header\r\n";
 		}
 		return $ret;

includes/Exception/MissingPageException.php

Spacing +4 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Exception;
 
@@ -9,9 +9,9 @@ 
 	/**
 	 * @param string|null $title If available
 	 */
-	public function __construct( string $title = null ) {
-		if ( $title ) {
-			parent::__construct( "The specified page doesn't exist: $title" );
+	public function __construct(string $title = null) {
+		if ($title) {
+			parent::__construct("The specified page doesn't exist: $title");
 		} else {
 			parent::__construct();
 		}

includes/Exception/ProtectedPageException.php

Spacing +4 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Exception;
 
@@ -9,9 +9,9 @@ 
 	/**
 	 * @param string|null $title If available
 	 */
-	public function __construct( string $title = null ) {
-		if ( $title ) {
-			parent::__construct( "The specified page is protected: $title" );
+	public function __construct(string $title = null) {
+		if ($title) {
+			parent::__construct("The specified page is protected: $title");
 		} else {
 			parent::__construct();
 		}

includes/Task/UpdatesAround.php

Spacing +41 added lines, -41 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task;
 
@@ -13,19 +13,19 @@ 
 	 * @inheritDoc
 	 */
 	public function run() : TaskResult {
-		$this->getLogger()->info( 'Starting task UpdatesAround' );
+		$this->getLogger()->info('Starting task UpdatesAround');
 
-		foreach ( $this->getDataProvider()->getCreatedPages() as $page ) {
+		foreach ($this->getDataProvider()->getCreatedPages() as $page) {
 			// Wikipedia:Amministratori/Riconferma annuale
-			$this->addToMainPage( $page );
+			$this->addToMainPage($page);
 			// WP:Wikipediano/Votazioni
-			$this->addVote( $page );
+			$this->addVote($page);
 			// Template:VotazioniRCnews
-			$this->addNews( $page );
+			$this->addNews($page);
 		}
 
-		$this->getLogger()->info( 'Task UpdatesAround completed successfully' );
-		return new TaskResult( self::STATUS_OK );
+		$this->getLogger()->info('Task UpdatesAround completed successfully');
+		return new TaskResult(self::STATUS_OK);
 	}
 
 	/**
@@ -33,16 +33,16 @@ 
 	 *
 	 * @param string $page
 	 */
-	protected function addToMainPage( string $page ) {
-		$this->getLogger()->info( "Adding $page to main" );
+	protected function addToMainPage(string $page) {
+		$this->getLogger()->info("Adding $page to main");
 
 		$params = [
-			'title' => $this->getConfig()->get( 'ric-main-page' ),
+			'title' => $this->getConfig()->get('ric-main-page'),
 			'appendtext' => '{{' . $page . '}}',
-			'summary' => $this->getConfig()->get( 'ric-main-page-summary' )
+			'summary' => $this->getConfig()->get('ric-main-page-summary')
 		];
 
-		$this->getController()->editPage( $params );
+		$this->getController()->editPage($params);
 	}
 
 	/**
@@ -50,37 +50,37 @@ 
 	 *
 	 * @param string $page
 	 */
-	protected function addVote( string $page ) {
-		$this->getLogger()->info( "Adding $page to votes" );
-		$votePage = $this->getConfig()->get( 'ric-vote-page' );
+	protected function addVote(string $page) {
+		$this->getLogger()->info("Adding $page to votes");
+		$votePage = $this->getConfig()->get('ric-vote-page');
 
-		$content = $this->getController()->getPageContent( $votePage );
+		$content = $this->getController()->getPageContent($votePage);
 		// Remove comments etc.
-		$visibleContent = strip_tags( $content );
-		$user = explode( '/', $page )[2];
+		$visibleContent = strip_tags($content);
+		$user = explode('/', $page)[2];
 		$time = $this->getTimeWithArticle();
 
 		$newLine = "*[[Utente:$user|]]. La [[$page|procedura]] termina $time";
 
 		$introReg = '!^;È in corso la .*riconferma tacita.* degli .*amministratori.+!m';
-		if ( preg_match( $introReg, $visibleContent ) ) {
-			$newContent = preg_replace( $introReg, '$0' . "\n$newLine;", $content, 1 );
+		if (preg_match($introReg, $visibleContent)) {
+			$newContent = preg_replace($introReg, '$0' . "\n$newLine;", $content, 1);
 		} else {
 			$matches = [];
-			if ( preg_match( $introReg, $content, $matches ) === false ) {
-				throw new TaskException( 'Intro not found in vote page' );
+			if (preg_match($introReg, $content, $matches) === false) {
+				throw new TaskException('Intro not found in vote page');
 			}
 			$beforeReg = '!INSERIRE LA NOTIZIA PIÙ NUOVA IN CIMA.+!m';
-			$newContent = preg_replace( $beforeReg, "$0\n{$matches[0]}\n$newLine.", $content, 1 );
+			$newContent = preg_replace($beforeReg, "$0\n{$matches[0]}\n$newLine.", $content, 1);
 		}
 
 		$params = [
 			'title' => $votePage,
 			'text' => $newContent,
-			'summary' => $this->getConfig()->get( 'ric-vote-page-summary' )
+			'summary' => $this->getConfig()->get('ric-vote-page-summary')
 		];
 
-		$this->getController()->editPage( $params );
+		$this->getController()->editPage($params);
 	}
 
 	/**
@@ -89,13 +89,13 @@ 
 	 * @return string
 	 */
 	private function getTimeWithArticle() : string {
-		$oldLoc = setlocale( LC_TIME, 'it_IT', 'Italian_Italy', 'Italian' );
-		$endTS = time() + ( 60 * 60 * 24 * 7 );
-		$endTime = strftime( '%e %B alle %R', $endTS );
+		$oldLoc = setlocale(LC_TIME, 'it_IT', 'Italian_Italy', 'Italian');
+		$endTS = time() + (60 * 60 * 24 * 7);
+		$endTime = strftime('%e %B alle %R', $endTS);
 		// Remove the left space if day has a single digit
-		$endTime = ltrim( $endTime );
-		$artic = in_array( date( 'j', $endTS ), [ 8, 11 ] ) ? "l'" : "il ";
-		setlocale( LC_TIME, $oldLoc );
+		$endTime = ltrim($endTime);
+		$artic = in_array(date('j', $endTS), [8, 11]) ? "l'" : "il ";
+		setlocale(LC_TIME, $oldLoc);
 
 		return $artic . $endTime;
 	}
@@ -105,27 +105,27 @@ 
 	 *
 	 * @param string $page
 	 */
-	protected function addNews( string $page ) {
-		$this->getLogger()->info( "Adding $page to news" );
-		$newsPage = $this->getConfig()->get( 'ric-news-page' );
+	protected function addNews(string $page) {
+		$this->getLogger()->info("Adding $page to news");
+		$newsPage = $this->getConfig()->get('ric-news-page');
 
-		$content = $this->getController()->getPageContent( $newsPage );
+		$content = $this->getController()->getPageContent($newsPage);
 		$reg = '!(\| *riconferme[ _]tacite[ _]amministratori *= *)(\d+)!';
 
 		$matches = [];
-		if ( preg_match( $reg, $content, $matches ) === false ) {
-			throw new TaskException( 'Param not found in news page' );
+		if (preg_match($reg, $content, $matches) === false) {
+			throw new TaskException('Param not found in news page');
 		}
 
 		$newNum = (int)$matches[2] + 1;
-		$newContent = preg_replace( $reg, '${1}' . $newNum, $content );
+		$newContent = preg_replace($reg, '${1}' . $newNum, $content);
 
 		$params = [
 			'title' => $newsPage,
 			'text' => $newContent,
-			'summary' => $this->getConfig()->get( 'ric-news-page-summary' )
+			'summary' => $this->getConfig()->get('ric-news-page-summary')
 		];
 
-		$this->getController()->editPage( $params );
+		$this->getController()->editPage($params);
 	}
 }

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;
 
@@ -19,18 +19,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;
@@ -39,15 +39,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',
@@ -56,23 +56,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;
 	}
@@ -81,10 +81,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);
 	}
 
 	/**
@@ -94,20 +94,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();
 				}
 			}
@@ -123,10 +123,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';
@@ -142,19 +142,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));
 	}
 
 	/**
@@ -164,15 +164,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;
@@ -188,11 +188,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;
@@ -203,25 +203,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);
 	}
 
 	/**
@@ -231,19 +231,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 +8 added lines, -8 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task;
 
@@ -23,9 +23,9 @@ 
 	 *
 	 * @param TaskDataProvider $dataProvider
 	 */
-	final public function __construct( TaskDataProvider $dataProvider ) {
-		set_exception_handler( [ $this, 'handleException' ] );
-		set_error_handler( [ $this, 'handleError' ] );
+	final public function __construct(TaskDataProvider $dataProvider) {
+		set_exception_handler([$this, 'handleException']);
+		set_error_handler([$this, 'handleError']);
 		parent::__construct();
 		$this->dataProvider = $dataProvider;
 	}
@@ -48,9 +48,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()
 		);
@@ -65,8 +65,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

@@ -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];
 	}
 }