Daimona / BotRiconferme

includes/Wiki/Page/PageBotList.php

Spacing +15 added lines, -17 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki\Page;
 
@@ -19,7 +19,7 @@ 
 	 * @private Use self::get()
 	 * @param Wiki $wiki
 	 */
-	public function __construct( Wiki $wiki ) {
+	public function __construct ( Wiki $wiki ) {
 		parent::__construct( Config::getInstance()->get( 'list-title' ), $wiki );
 	}
 
@@ -29,7 +29,7 @@ 
 	 * @param Wiki $wiki
 	 * @return self
 	 */
-	public static function get( Wiki $wiki ) : self {
+	public static function get ( Wiki $wiki ) : self {
 		static $instance = null;
 		if ( $instance === null ) {
 			$instance = new self( $wiki );
@@ -41,16 +41,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();
 	}
@@ -61,17 +61,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;
 	}
@@ -81,9 +79,9 @@ 
 	 *
 	 * @return User[]
 	 */
-	public function getAdminsList() : array {
+	public function getAdminsList () : array {
 		if ( $this->adminsList === null ) {
-			$this->adminsList = [];
+			$this->adminsList = [ ];
 			foreach ( $this->getDecodedContent() as $user => $info ) {
 				$userObj = new User( $user, $this->wiki );
 				$userObj->setInfo( $info );
@@ -98,7 +96,7 @@ 
 	 *
 	 * @return array[]
 	 */
-	public function getDecodedContent() : array {
+	public function getDecodedContent () : array {
 		return json_decode( $this->getContent(), true );
 	}
 }

includes/Wiki/User.php

Spacing +13 added lines, -13 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki;
 
@@ -18,7 +18,7 @@ 
 	 * @param string $name
 	 * @param Wiki $wiki
 	 */
-	public function __construct( string $name, Wiki $wiki ) {
+	public function __construct ( string $name, Wiki $wiki ) {
 		parent::__construct( $wiki );
 		$this->name = $name;
 	}
@@ -26,7 +26,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function getName() : string {
+	public function getName () : string {
 		return $this->name;
 	}
 
@@ -35,7 +35,7 @@ 
 	 *
 	 * @return string[]
 	 */
-	public function getGroups() : array {
+	public function getGroups () : array {
 		return array_diff( array_keys( $this->getUserInfo() ), PageBotList::NON_GROUP_KEYS );
 	}
 
@@ -44,7 +44,7 @@ 
 	 *
 	 * @return string[]
 	 */
-	public function getUserInfo() : array {
+	public function getUserInfo () : array {
 		if ( $this->info === null ) {
 			$usersList = PageBotList::get( $this->wiki )->getAdminsList();
 			$this->info = $usersList[ $this->name ]->getUserInfo();
@@ -55,7 +55,7 @@ 
 	/**
 	 * @param array|null $info
 	 */
-	public function setInfo( ?array $info ) : void {
+	public function setInfo ( ?array $info ) : void {
 		$this->info = $info;
 	}
 
@@ -65,7 +65,7 @@ 
 	 * @param string $groupName
 	 * @return bool
 	 */
-	public function inGroup( string $groupName ) : bool {
+	public function inGroup ( string $groupName ) : bool {
 		return in_array( $groupName, $this->getGroups() );
 	}
 
@@ -74,9 +74,9 @@ 
 	 *
 	 * @inheritDoc
 	 */
-	public function getRegex() : string {
+	public function getRegex () : string {
 		$bits = $this->getAliases();
-		$bits[] = $this->name;
+		$bits[ ] = $this->name;
 		$regexify = function ( $el ) {
 			return str_replace( ' ', '[ _]', preg_quote( $el ) );
 		};
@@ -88,21 +88,21 @@ 
 	 *
 	 * @return string[]
 	 */
-	public function getAliases() : array {
-		return $this->getUserInfo()['aliases'] ?? [];
+	public function getAliases () : array {
+		return $this->getUserInfo()[ 'aliases' ] ?? [ ];
 	}
 
 	/**
 	 * @return Page
 	 */
-	public function getTalkPage() : Page {
+	public function getTalkPage () : Page {
 		return new Page( "User talk:{$this->name}", $this->wiki );
 	}
 
 	/**
 	 * @return string
 	 */
-	public function __toString() {
+	public function __toString () {
 		return $this->name;
 	}
 }

includes/Task/Subtask/UserNotice.php

Spacing +4 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task\Subtask;
 
@@ -12,7 +12,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function runInternal() : int {
+	public function runInternal () : int {
 		$pages = $this->getDataProvider()->getCreatedPages();
 		$users = $this->getDataProvider()->getUsersToProcess();
 
@@ -20,7 +20,7 @@ 
 			return TaskResult::STATUS_NOTHING;
 		}
 
-		$ricNums = [];
+		$ricNums = [ ];
 		foreach ( $pages as $page ) {
 			$ricNums[ $page->getUser()->getName() ] = $page->getNum();
 		}
@@ -38,7 +38,7 @@ 
 	 * @param User $user
 	 * @param int $ricNum
 	 */
-	protected function addMsg( User $user, int $ricNum ) {
+	protected function addMsg ( User $user, int $ricNum ) {
 		$this->getLogger()->info( "Leaving msg to $user" );
 		$msg = $this->msg( 'user-notice-msg' )->params( [ '$num' => $ricNum ] )->text();
 

includes/Task/Subtask/CreatePages.php

Spacing +12 added lines, -12 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task\Subtask;
 
@@ -15,7 +15,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function runInternal() : int {
+	public function runInternal () : int {
 		$users = $this->getDataProvider()->getUsersToProcess();
 
 		if ( !$users ) {
@@ -34,7 +34,7 @@ 
 	 *
 	 * @param User $user
 	 */
-	protected function processUser( User $user ) {
+	protected function processUser ( User $user ) {
 		try {
 			$num = $this->getLastPageNum( $user ) + 1;
 		} catch ( TaskException $e ) {
@@ -66,14 +66,14 @@ 
 	 * @return int
 	 * @throws TaskException
 	 */
-	protected function getLastPageNum( User $user ) : int {
+	protected function getLastPageNum ( User $user ) : int {
 		$this->getLogger()->debug( "Retrieving previous pages for $user" );
 
-		$unprefixedTitle = explode( ':', $this->getOpt( 'main-page-title' ), 2 )[1];
+		$unprefixedTitle = explode( ':', $this->getOpt( 'main-page-title' ), 2 )[ 1 ];
 
 		$prefixes = [ "$unprefixedTitle/$user/" ];
 		foreach ( $user->getAliases() as $alias ) {
-			$prefixes[] = "$unprefixedTitle/$alias/";
+			$prefixes[ ] = "$unprefixedTitle/$alias/";
 		}
 
 		$params = [
@@ -109,14 +109,14 @@ 
 	 * @param string $title
 	 * @param User $user
 	 */
-	protected function createPage( string $title, User $user ) {
+	protected function createPage ( string $title, User $user ) {
 		$this->getLogger()->info( "Creating page $title" );
 		$groups = $user->getGroups();
 		$textParams = [
 			'$user' => $user->getName(),
-			'$date' => $groups['sysop'],
-			'$burocrate' => $groups['bureaucrat'] ?? '',
-			'$checkuser' => $groups['checkuser'] ?? ''
+			'$date' => $groups[ 'sysop' ],
+			'$burocrate' => $groups[ 'bureaucrat' ] ?? '',
+			'$checkuser' => $groups[ 'checkuser' ] ?? ''
 		];
 
 		$params = [
@@ -134,7 +134,7 @@ 
 	 * @param string $title
 	 * @param string $newText
 	 */
-	protected function createBasePage( string $title, string $newText ) {
+	protected function createBasePage ( string $title, string $newText ) {
 		$this->getLogger()->info( "Creating base page $title" );
 
 		$params = [
@@ -151,7 +151,7 @@ 
 	 * @param string $title
 	 * @param string $newText
 	 */
-	protected function updateBasePage( string $title, string $newText ) {
+	protected function updateBasePage ( string $title, string $newText ) {
 		$this->getLogger()->info( "Updating base page $title" );
 
 		$params = [

includes/Task/UpdateList.php

Spacing +30 added lines, -30 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();
 		$pageBotList = PageBotList::get( $this->getWiki() );
 		$this->botList = $pageBotList->getDecodedContent();
@@ -54,7 +54,7 @@ 
 	/**
 	 * @return array
 	 */
-	protected function getActualAdmins() : array {
+	protected function getActualAdmins () : array {
 		$params = [
 			'action' => 'query',
 			'list' => 'allusers',
@@ -71,8 +71,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 ) ) {
@@ -89,16 +89,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();
 				}
 			}
 		}
@@ -113,7 +113,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;
@@ -149,7 +149,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 ) ) {
@@ -168,8 +168,8 @@ 
 	 *
 	 * @return array[]
 	 */
-	protected function getExtraGroups() : array {
-		$extra = [];
+	protected function getExtraGroups () : array {
+		$extra = [ ];
 		foreach ( $this->botList as $name => $groups ) {
 			$groups = array_diff_key( $groups, array_fill_keys( PageBotList::NON_GROUP_KEYS, 1 ) );
 			if ( !isset( $this->actualList[ $name ] ) ) {
@@ -187,9 +187,9 @@ 
 	 * @param string[] $names
 	 * @return string[] [ old_name => new_name ]
 	 */
-	protected function checkRenamedUsers( array $names ) : array {
+	protected function checkRenamedUsers ( array $names ) : array {
 		if ( !$names ) {
-			return [];
+			return [ ];
 		}
 		$this->getLogger()->info( 'Checking rename for ' . implode( ', ', $names ) );
 
@@ -207,7 +207,7 @@ 
 		];
 
 		$data = RequestBase::newFromParams( $params )->execute();
-		$ret = [];
+		$ret = [ ];
 		foreach ( $data->query->logevents as $entry ) {
 			$time = strtotime( $entry->timestamp );
 			// 1 month is arbitrary
@@ -227,10 +227,10 @@ 
 	 * @param array[] $extra
 	 * @return array[]
 	 */
-	protected function getNewContent( array $missing, array $extra ) : array {
+	protected function getNewContent ( array $missing, array $extra ) : array {
 		$newContent = $this->botList;
 		$renameMap = $this->checkRenamedUsers( array_keys( $extra ) );
-		$removed = [];
+		$removed = [ ];
 		foreach ( $newContent as $user => $groups ) {
 			if ( isset( $missing[ $user ] ) ) {
 				$newContent[ $user ] = array_merge( $groups, $missing[ $user ] );
@@ -240,7 +240,7 @@ 
 				if ( array_diff_key( $newGroups, array_fill_keys( PageBotList::NON_GROUP_KEYS, 1 ) ) ) {
 					$newContent[ $user ] = $newGroups;
 				} else {
-					$removed[$user] = $newContent[$user];
+					$removed[ $user ] = $newContent[ $user ];
 					unset( $newContent[ $user ] );
 				}
 			}
@@ -251,17 +251,17 @@ 
 		foreach ( $removed as $oldName => $info ) {
 			if (
 				array_key_exists( $oldName, $renameMap ) &&
-				array_key_exists( $renameMap[$oldName], $newContent )
+				array_key_exists( $renameMap[ $oldName ], $newContent )
 			) {
 				// This user was renamed! Add this name as alias, if they're still listed
 				$newName = $renameMap[ $oldName ];
 				$this->getLogger()->info( "Found rename $oldName -> $newName" );
 				if ( array_key_exists( 'aliases', $newContent[ $newName ] ) ) {
-					if ( !in_array( $oldName, $newContent[ $newName ]['aliases'] ) ) {
-						$newContent[ $newName ]['aliases'][] = $oldName;
+					if ( !in_array( $oldName, $newContent[ $newName ][ 'aliases' ] ) ) {
+						$newContent[ $newName ][ 'aliases' ][ ] = $oldName;
 					}
 				} else {
-					$newContent[ $newName ]['aliases'] = [ $oldName ];
+					$newContent[ $newName ][ 'aliases' ] = [ $oldName ];
 				}
 				// Transfer overrides to the new name.
 				$overrides = array_diff_key( $info, [ 'override' => 1, 'override-perm' => 1 ] );
@@ -281,21 +281,21 @@ 
 	 * @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( 'Y' ) . '-' . date( 'm-d', $flagTS ) );
-			$overrideTS = \DateTime::createFromFormat( 'd/m/Y', $groups['override'] )->getTimestamp();
+			$overrideTS = \DateTime::createFromFormat( 'd/m/Y', $groups[ 'override' ] )->getTimestamp();
 			$delay = 60 * 60 * 24 * 3;
 
 			if ( time() > $usualTS + $delay && time() > $overrideTS + $delay ) {
 				unset( $newContent[ $user ][ 'override' ] );
-				$removed[] = $user;
+				$removed[ ] = $user;
 			}
 		}
 

includes/TaskDataProvider.php

Spacing +15 added lines, -15 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -14,16 +14,16 @@ 
 	/** @var User[]|null */
 	private $processUsers;
 	/** @var PageRiconferma[] */
-	private $createdPages = [];
+	private $createdPages = [ ];
 
 	/**
 	 * Get a list of users to execute tasks on.
 	 *
 	 * @return User[]
 	 */
-	public function getUsersToProcess() : array {
+	public function getUsersToProcess () : array {
 		if ( $this->processUsers === null ) {
-			$this->processUsers = [];
+			$this->processUsers = [ ];
 			foreach ( PageBotList::get( $this->getWiki() )->getAdminsList() as $name => $user ) {
 				if ( $this->shouldAddUser( $user ) ) {
 					$this->processUsers[ $name ] = $user;
@@ -40,7 +40,7 @@ 
 	 * @param User $user
 	 * @return bool
 	 */
-	private function shouldAddUser( User $user ) : bool {
+	private function shouldAddUser ( User $user ) : bool {
 		$groups = $user->getGroups();
 		$override = true;
 		$timestamp = PageBotList::getOverrideTimestamp( $groups );
@@ -60,10 +60,10 @@ 
 	 *
 	 * @return PageRiconferma[]
 	 */
-	public function getOpenPages() : array {
+	public function getOpenPages () : array {
 		static $list = null;
 		if ( $list === null ) {
-			$list = [];
+			$list = [ ];
 			$mainTitle = $this->getOpt( 'main-page-title' );
 			$params = [
 				'action' => 'query',
@@ -77,7 +77,7 @@ 
 			$pages = RequestBase::newFromParams( $params )->execute()->query->pages;
 			foreach ( reset( $pages )->templates as $page ) {
 				if ( preg_match( "!$titleReg\/[^\/]+\/\d!", $page->title ) ) {
-					$list[] = new PageRiconferma( $page->title, $this->getWiki() );
+					$list[ ] = new PageRiconferma( $page->title, $this->getWiki() );
 				}
 			}
 		}
@@ -90,13 +90,13 @@ 
 	 *
 	 * @return PageRiconferma[]
 	 */
-	public function getPagesToClose() : array {
+	public function getPagesToClose () : array {
 		static $list = null;
 		if ( $list === null ) {
-			$list = [];
+			$list = [ ];
 			foreach ( $this->getOpenPages() as $page ) {
 				if ( time() > $page->getEndTimestamp() ) {
-					$list[] = $page;
+					$list[ ] = $page;
 				}
 			}
 		}
@@ -108,21 +108,21 @@ 
 	 *
 	 * @param string $name
 	 */
-	public function removeUser( string $name ) {
+	public function removeUser ( string $name ) {
 		unset( $this->processUsers[ $name ] );
 	}
 
 	/**
 	 * @return PageRiconferma[]
 	 */
-	public function getCreatedPages() : array {
+	public function getCreatedPages () : array {
 		return $this->createdPages;
 	}
 
 	/**
 	 * @param PageRiconferma $page
 	 */
-	public function addCreatedPages( PageRiconferma $page ) {
-		$this->createdPages[] = $page;
+	public function addCreatedPages ( PageRiconferma $page ) {
+		$this->createdPages[ ] = $page;
 	}
 }