Daimona / BotRiconferme

includes/Wiki/Page/PageBotList.php

Spacing +13 added lines, -15 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki\Page;
 
@@ -11,7 +11,7 @@ 
 	/**
 	 * @private Use self::get()
 	 */
-	public function __construct() {
+	public function __construct () {
 		parent::__construct( Config::getInstance()->get( 'list-title' ) );
 	}
 
@@ -20,7 +20,7 @@ 
 	 *
 	 * @return self
 	 */
-	public static function get() : self {
+	public static function get () : self {
 		static $instance = null;
 		if ( $instance === null ) {
 			$instance = new self;
@@ -32,16 +32,16 @@ 
 	 * @param string[] $groups
 	 * @return int|null
 	 */
-	public static function getOverrideTimestamp( array $groups ) : ?int {
+	public static function getOverrideTimestamp ( array $groups ) : ?int {
 		if ( !array_intersect_key( $groups, [ 'override-perm' => true, 'override' => true ] ) ) {
 			return null;
 		}
 
 		// A one-time override takes precedence
 		if ( array_key_exists( 'override', $groups ) ) {
-			$date = $groups['override'];
+			$date = $groups[ 'override' ];
 		} else {
-			$date = $groups['override-prem'] . '/' . date( 'Y' );
+			$date = $groups[ 'override-prem' ] . '/' . date( 'Y' );
 		}
 		return \DateTime::createFromFormat( 'd/m/Y', $date )->getTimestamp();
 	}
@@ -52,17 +52,15 @@ 
 	 * @param array $groups
 	 * @return int
 	 */
-	public static function getValidFlagTimestamp( 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;
+	public static function getValidFlagTimestamp ( 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 = \DateTime::createFromFormat( 'd/m/Y', $groups[ 'sysop' ] )->getTimestamp();
 		}
 		return $timestamp;
 	}
@@ -72,7 +70,7 @@ 
 	 *
 	 * @return array[]
 	 */
-	public function getAdminsList() : array {
+	public function getAdminsList () : array {
 		return json_decode( $this->getContent(), true );
 	}
 }

includes/Task/Subtask/SimpleUpdates.php

Spacing +23 added lines, -23 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task\Subtask;
 
@@ -17,7 +17,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function runInternal() : int {
+	public function runInternal () : int {
 		$pages = $this->getDataProvider()->getPagesToClose();
 
 		if ( !$pages ) {
@@ -39,15 +39,15 @@ 
 	 * @param PageRiconferma[] $pages
 	 * @see OpenUpdates::addToVotazioni()
 	 */
-	protected function updateVotazioni( array $pages ) {
+	protected function updateVotazioni ( array $pages ) {
 		$this->getLogger()->info(
 			'Updating votazioni: ' . implode( ', ', $pages )
 		);
 		$votePage = new Page( $this->getOpt( 'vote-page-title' ) );
 
-		$users = [];
+		$users = [ ];
 		foreach ( $pages as $page ) {
-			$users[] = $page->getUser();
+			$users[ ] = $page->getUser();
 		}
 		$usersReg = Element::regexFromArray( $users );
 
@@ -68,7 +68,7 @@ 
 	 * @param array $pages
 	 * @see OpenUpdates::addToNews()
 	 */
-	protected function updateNews( array $pages ) {
+	protected function updateNews ( array $pages ) {
 		$simpleAmount = $voteAmount = 0;
 		foreach ( $pages as $page ) {
 			if ( $page->isVote() ) {
@@ -88,8 +88,8 @@ 
 		$simpleMatches = $newsPage->getMatch( $simpleReg );
 		$voteMatches = $newsPage->getMatch( $voteReg );
 
-		$newSimp = (int)$simpleMatches[2] - $simpleAmount ?: '';
-		$newVote = (int)$voteMatches[2] - $voteAmount ?: '';
+		$newSimp = (int)$simpleMatches[ 2 ] - $simpleAmount ?: '';
+		$newVote = (int)$voteMatches[ 2 ] - $voteAmount ?: '';
 		$newContent = preg_replace( $simpleReg, '${1}' . $newSimp, $newsPage->getContent() );
 		$newContent = preg_replace( $voteReg, '${1}' . $newVote, $newContent );
 
@@ -107,12 +107,12 @@ 
 	 *
 	 * @param bool[] $outcomes
 	 */
-	protected function updateAdminList( array $outcomes ) {
+	protected function updateAdminList ( array $outcomes ) {
 		$this->getLogger()->info( 'Updating admin list' );
 		$adminsPage = new Page( $this->getOpt( 'admins-list-title' ) );
 		$newContent = $adminsPage->getContent();
 
-		$riconfNames = $removeNames = [];
+		$riconfNames = $removeNames = [ ];
 		foreach ( $outcomes as $username => $confirmed ) {
 			$user = new User( $username );
 			$userReg = $user->getRegex();
@@ -124,10 +124,10 @@ 
 					'${1}' . date( 'Ymd' ) . '|' . $nextDate . '$2',
 					$newContent
 				);
-				$riconfNames[] = $username;
+				$riconfNames[ ] = $username;
 			} else {
 				$newContent = preg_replace( $reg, '', $newContent );
-				$removeNames[] = $username;
+				$removeNames[ ] = $username;
 			}
 		}
 
@@ -150,12 +150,12 @@ 
 	 * @param User $user
 	 * @return int
 	 */
-	private function getNextTs( User $user ) : int {
+	private function getNextTs ( User $user ) : int {
 		$groups = $user->getGroupsWithDates();
-		if ( isset( $groups['override-perm'] ) ) {
+		if ( isset( $groups[ 'override-perm' ] ) ) {
 			$date = \DateTime::createFromFormat(
 				'd/m/Y',
-				$groups['override-perm'] . '/' . date( 'Y' )
+				$groups[ 'override-perm' ] . '/' . date( 'Y' )
 			);
 			if ( $date < new \DateTime ) {
 				$date->modify( '+1 year' );
@@ -164,8 +164,8 @@ 
 		} else {
 			$ts = PageBotList::getValidFlagTimestamp( $groups );
 			$res = strtotime( date( 'Y', strtotime( '+1 year' ) ) . date( '-m-d', $ts ) );
-			if ( isset( $groups['override'] ) ) {
-				$date = \DateTime::createFromFormat( 'd/m/Y', $groups['override'] );
+			if ( isset( $groups[ 'override' ] ) ) {
+				$date = \DateTime::createFromFormat( 'd/m/Y', $groups[ 'override' ] );
 				if ( $date > new \DateTime ) {
 					$res = $date->getTimestamp();
 				}
@@ -177,21 +177,21 @@ 
 	/**
 	 * @param bool[] $outcomes
 	 */
-	protected function updateCUList( array $outcomes ) {
+	protected function updateCUList ( array $outcomes ) {
 		$this->getLogger()->info( 'Updating CU list.' );
 		$cuList = new Page( $this->getOpt( 'cu-list-title' ) );
 		$newContent = $cuList->getContent();
 
-		$riconfNames = $removeNames = [];
+		$riconfNames = $removeNames = [ ];
 		foreach ( $outcomes as $user => $confirmed ) {
 			$userReg = ( new User( $user ) )->getRegex();
 			$reg = "!(\{\{ *Checkuser *\| *$userReg *\|[^}]+\| *)[\w \d]+(}}.*\n)!";
 			if ( $confirmed ) {
 				$newContent = preg_replace( $reg, '${1}{{subst:#time:j F Y}}$2', $newContent );
-				$riconfNames[] = $user;
+				$riconfNames[ ] = $user;
 			} else {
 				$newContent = preg_replace( $reg, '', $newContent );
-				$removeNames[] = $user;
+				$removeNames[ ] = $user;
 			}
 		}
 
@@ -215,8 +215,8 @@ 
 	 * @param PageRiconferma[] $pages
 	 * @return bool[]
 	 */
-	private function getGroupOutcomes( string $group, array $pages ) : array {
-		$ret = [];
+	private function getGroupOutcomes ( string $group, array $pages ) : array {
+		$ret = [ ];
 		foreach ( $pages as $page ) {
 			$user = $page->getUser();
 			if ( $user->inGroup( $group ) ) {

includes/Task/UpdateList.php

Spacing +22 added lines, -22 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task;
 
@@ -19,15 +19,15 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	protected function getSubtasksMap(): array {
+	protected function getSubtasksMap (): array {
 		// Everything is done here.
-		return [];
+		return [ ];
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	public function runInternal() : int {
+	public function runInternal () : int {
 		$this->actualList = $this->getActualAdmins();
 		$this->botList = PageBotList::get()->getAdminsList();
 
@@ -53,7 +53,7 @@ 
 	/**
 	 * @return array
 	 */
-	protected function getActualAdmins() : array {
+	protected function getActualAdmins () : array {
 		$params = [
 			'action' => 'query',
 			'list' => 'allusers',
@@ -70,8 +70,8 @@ 
 	 * @param \stdClass $data
 	 * @return array
 	 */
-	protected function extractAdmins( \stdClass $data ) : array {
-		$ret = [];
+	protected function extractAdmins ( \stdClass $data ) : array {
+		$ret = [ ];
 		$blacklist = $this->getOpt( 'exclude-admins' );
 		foreach ( $data->query->allusers as $u ) {
 			if ( in_array( $u->name, $blacklist ) ) {
@@ -88,16 +88,16 @@ 
 	 *
 	 * @return array[]
 	 */
-	protected function getMissingGroups() : array {
-		$missing = [];
+	protected function getMissingGroups () : array {
+		$missing = [ ];
 		foreach ( $this->actualList as $adm => $groups ) {
-			$curMissing = array_diff( $groups, array_keys( $this->botList[$adm] ?? [] ) );
+			$curMissing = array_diff( $groups, array_keys( $this->botList[ $adm ] ?? [ ] ) );
 
 			foreach ( $curMissing as $group ) {
 				try {
 					$missing[ $adm ][ $group ] = $this->getFlagDate( $adm, $group );
 				} catch ( TaskException $e ) {
-					$this->errors[] = $e->getMessage();
+					$this->errors[ ] = $e->getMessage();
 				}
 			}
 		}
@@ -112,7 +112,7 @@ 
 	 * @return string
 	 * @throws TaskException
 	 */
-	protected function getFlagDate( string $admin, string $group ) : string {
+	protected function getFlagDate ( string $admin, string $group ) : string {
 		$this->getLogger()->info( "Retrieving $group flag date for $admin" );
 
 		$url = DEFAULT_URL;
@@ -147,7 +147,7 @@ 
 	 * @param string $group
 	 * @return string|null
 	 */
-	private function extractTimestamp( \stdClass $data, string $group ) : ?string {
+	private function extractTimestamp ( \stdClass $data, string $group ) : ?string {
 		$ts = null;
 		foreach ( $data->query->logevents as $entry ) {
 			if ( isset( $entry->params ) ) {
@@ -166,8 +166,8 @@ 
 	 *
 	 * @return array[]
 	 */
-	protected function getExtraGroups() : array {
-		$extra = [];
+	protected function getExtraGroups () : array {
+		$extra = [ ];
 		foreach ( $this->botList as $name => $groups ) {
 			// These are not groups
 			unset( $groups[ 'override' ], $groups[ 'override-perm' ] );
@@ -187,7 +187,7 @@ 
 	 * @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 ] ) ) {
@@ -211,20 +211,20 @@ 
 	 * @param array[] $newContent
 	 * @return array[]
 	 */
-	protected function removeOverrides( array $newContent ) : array {
-		$removed = [];
+	protected function removeOverrides ( array $newContent ) : array {
+		$removed = [ ];
 		foreach ( $newContent as $user => $groups ) {
-			if ( !isset( $groups['override'] ) ) {
+			if ( !isset( $groups[ 'override' ] ) ) {
 				continue;
 			}
 
 			$flagTS = PageBotList::getValidFlagTimestamp( $groups );
 			$usualTS = strtotime( date( 'd/m', $flagTS ) . date( 'Y' ) );
-			$overrideTS = \DateTime::createFromFormat( 'd/m/Y', $groups['override'] )->getTimestamp();
+			$overrideTS = \DateTime::createFromFormat( 'd/m/Y', $groups[ 'override' ] )->getTimestamp();
 
-			if ( time() > $usualTS && time () > $overrideTS ) {
+			if ( time() > $usualTS && time() > $overrideTS ) {
 				unset( $newContent[ $user ][ 'override' ] );
-				$removed[] = $user;
+				$removed[ ] = $user;
 			}
 		}