Daimona / BotRiconferme

includes/Request/RequestBase.php

Spacing +23 added lines, -23 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -30,14 +30,14 @@ 
 	/** @var string */
 	protected $method = 'GET';
 	/** @var string[] */
-	protected $newCookies = [];
+	protected $newCookies = [ ];
 
 	/**
 	 * Use self::newFromParams, which will provide the right class to use
 	 *
 	 * @param array $params
 	 */
-	protected function __construct( array $params ) {
+	protected function __construct ( array $params ) {
 		$this->params = [ 'format' => 'json' ] + $params;
 		$this->url = DEFAULT_URL;
 	}
@@ -48,7 +48,7 @@ 
 	 * @param array $params
 	 * @return self
 	 */
-	public static function newFromParams( array $params ) : self {
+	public static function newFromParams ( array $params ) : self {
 		if ( extension_loaded( 'curl' ) ) {
 			$ret = new CurlRequest( $params );
 		} else {
@@ -62,7 +62,7 @@ 
 	 *
 	 * @return self For chaining
 	 */
-	public function setPost() : self {
+	public function setPost () : self {
 		$this->method = 'POST';
 		return $this;
 	}
@@ -73,7 +73,7 @@ 
 	 * @param string $url
 	 * @return self for chaining
 	 */
-	public function setUrl( string $url ) : self {
+	public function setUrl ( string $url ) : self {
 		$this->url = $url;
 		return $this;
 	}
@@ -85,14 +85,14 @@ 
 	 * @todo Return an iterable object which automatically continues the query only if the last
 	 *   entry available is reached.
 	 */
-	public function execute() : \stdClass {
+	public function execute () : \stdClass {
 		$curParams = $this->params;
-		$sets = [];
+		$sets = [ ];
 		do {
 			$res = $this->makeRequestInternal( $curParams );
 
 			$this->handleErrorAndWarnings( $res );
-			$sets[] = $res;
+			$sets[ ] = $res;
 
 			$finished = true;
 			if ( isset( $res->continue ) ) {
@@ -110,9 +110,9 @@ 
 	 * @param array $params
 	 * @return \stdClass
 	 */
-	private function makeRequestInternal( array $params ) : \stdClass {
+	private function makeRequestInternal ( array $params ) : \stdClass {
 		if ( $this->method === 'POST' ) {
-			$params['maxlag'] = self::MAXLAG;
+			$params[ 'maxlag' ] = self::MAXLAG;
 		}
 		$params = http_build_query( $params );
 
@@ -128,17 +128,17 @@ 
 	 * @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 ) {
+	protected function setCookies ( array $cookies ) {
 		foreach ( $cookies as $cookie ) {
 			$bits = explode( ';', $cookie );
-			list( $name, $value ) = explode( '=', $bits[0] );
+			list( $name, $value ) = explode( '=', $bits[ 0 ] );
 			self::$cookiesToSet[ $name ] = $value;
 		}
 	}
@@ -149,7 +149,7 @@ 
 	 * @param \stdClass $res
 	 * @return APIRequestException
 	 */
-	private function getException( \stdClass $res ) : APIRequestException {
+	private function getException ( \stdClass $res ) : APIRequestException {
 		switch ( $res->error->code ) {
 			case 'missingtitle':
 				$ex = new MissingPageException;
@@ -172,7 +172,7 @@ 
 	 * @param \stdClass $res
 	 * @throws APIRequestException
 	 */
-	protected function handleErrorAndWarnings( \stdClass $res ) {
+	protected function handleErrorAndWarnings ( \stdClass $res ) {
 		if ( isset( $res->error ) ) {
 			throw $this->getException( $res );
 		} elseif ( isset( $res->warnings ) ) {
@@ -188,7 +188,7 @@ 
 	 * @param \stdClass[] $sets
 	 * @return \stdClass
 	 */
-	private function mergeSets( array $sets ) : \stdClass {
+	private function mergeSets ( array $sets ) : \stdClass {
 		// Use the first set as template
 		$ret = array_shift( $sets );
 
@@ -205,7 +205,7 @@ 
 	 * @param array|\stdClass $second
 	 * @return array|\stdClass array
 	 */
-	private function recursiveMerge( $first, $second ) {
+	private function recursiveMerge ( $first, $second ) {
 		$ret = $first;
 		if ( is_array( $second ) ) {
 			$ret = is_array( $first ) ? array_merge_recursive( $first, $second ) : $second;
@@ -223,14 +223,14 @@ 
 	 *
 	 * @return array
 	 */
-	protected function getHeaders() :array {
+	protected function getHeaders () :array {
 		$ret = self::HEADERS;
 		if ( self::$cookiesToSet ) {
-			$cookies = [];
+			$cookies = [ ];
 			foreach ( self::$cookiesToSet as $cname => $cval ) {
-				$cookies[] = trim( "$cname=$cval" );
+				$cookies[ ] = trim( "$cname=$cval" );
 			}
-			$ret[] = 'Cookie: ' . implode( '; ', $cookies );
+			$ret[ ] = 'Cookie: ' . implode( '; ', $cookies );
 		}
 		return $ret;
 	}
@@ -241,7 +241,7 @@ 
 	 * @param array $headers
 	 * @return string
 	 */
-	protected function buildHeadersString( array $headers ) : string {
+	protected function buildHeadersString ( array $headers ) : string {
 		$ret = '';
 		foreach ( $headers as $header ) {
 			$ret .= "$header\r\n";

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;
 
@@ -16,7 +16,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function runInternal() : int {
+	public function runInternal () : int {
 		$pages = $this->getDataProvider()->getPagesToClose();
 
 		if ( !$pages ) {
@@ -38,15 +38,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 = $this->getPage( $this->getOpt( 'vote-page-title' ) );
 
-		$users = [];
+		$users = [ ];
 		foreach ( $pages as $page ) {
-			$users[] = $page->getUser();
+			$users[ ] = $page->getUser();
 		}
 		$usersReg = Element::regexFromArray( $users );
 
@@ -67,7 +67,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() ) {
@@ -87,8 +87,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 );
 
@@ -106,12 +106,12 @@ 
 	 *
 	 * @param bool[] $outcomes
 	 */
-	protected function updateAdminList( array $outcomes ) {
+	protected function updateAdminList ( array $outcomes ) {
 		$this->getLogger()->info( 'Updating admin list' );
 		$adminsPage = $this->getPage( $this->getOpt( 'admins-list-title' ) );
 		$newContent = $adminsPage->getContent();
 
-		$riconfNames = $removeNames = [];
+		$riconfNames = $removeNames = [ ];
 		foreach ( $outcomes as $username => $confirmed ) {
 			$user = new User( $username, $this->getWiki() );
 			$userReg = $user->getRegex();
@@ -123,10 +123,10 @@ 
 					'${1}' . date( 'Ymd' ) . '|' . $nextDate . '$2',
 					$newContent
 				);
-				$riconfNames[] = $username;
+				$riconfNames[ ] = $username;
 			} else {
 				$newContent = preg_replace( $reg, '', $newContent );
-				$removeNames[] = $username;
+				$removeNames[ ] = $username;
 			}
 		}
 
@@ -149,12 +149,12 @@ 
 	 * @param User $user
 	 * @return int
 	 */
-	private function getNextTs( User $user ) : int {
+	private function getNextTs ( User $user ) : int {
 		$userInfo = $user->getUserInfo();
-		if ( isset( $userInfo['override-perm'] ) ) {
+		if ( isset( $userInfo[ 'override-perm' ] ) ) {
 			$date = \DateTime::createFromFormat(
 				'd/m/Y',
-				$userInfo['override-perm'] . '/' . date( 'Y' )
+				$userInfo[ 'override-perm' ] . '/' . date( 'Y' )
 			);
 			if ( $date < new \DateTime ) {
 				$date->modify( '+1 year' );
@@ -163,8 +163,8 @@ 
 		} else {
 			$ts = PageBotList::getValidFlagTimestamp( $userInfo );
 			$res = strtotime( date( 'Y', strtotime( '+1 year' ) ) . date( '-m-d', $ts ) );
-			if ( isset( $userInfo['override'] ) ) {
-				$date = \DateTime::createFromFormat( 'd/m/Y', $userInfo['override'] );
+			if ( isset( $userInfo[ 'override' ] ) ) {
+				$date = \DateTime::createFromFormat( 'd/m/Y', $userInfo[ 'override' ] );
 				if ( $date > new \DateTime ) {
 					$res = $date->getTimestamp();
 				}
@@ -176,21 +176,21 @@ 
 	/**
 	 * @param bool[] $outcomes
 	 */
-	protected function updateCUList( array $outcomes ) {
+	protected function updateCUList ( array $outcomes ) {
 		$this->getLogger()->info( 'Updating CU list.' );
 		$cuList = $this->getPage( $this->getOpt( 'cu-list-title' ) );
 		$newContent = $cuList->getContent();
 
-		$riconfNames = $removeNames = [];
+		$riconfNames = $removeNames = [ ];
 		foreach ( $outcomes as $user => $confirmed ) {
 			$userReg = ( new User( $user, $this->getWiki() ) )->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;
 			}
 		}
 
@@ -214,8 +214,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/Wiki/Wiki.php

Spacing +14 added lines, -14 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki;
 
@@ -28,7 +28,7 @@ 
 	 * @param LoggerInterface $logger
 	 * @param string $domain The URL of the wiki, if different from default
 	 */
-	public function __construct( LoggerInterface $logger, string $domain = DEFAULT_URL ) {
+	public function __construct ( LoggerInterface $logger, string $domain = DEFAULT_URL ) {
 		$this->logger = $logger;
 		$this->domain = $domain;
 	}
@@ -42,7 +42,7 @@ 
 	 * @throws MissingPageException
 	 * @throws MissingSectionException
 	 */
-	public function getPageContent( string $title, int $section = null ) : string {
+	public function getPageContent ( string $title, int $section = null ) : string {
 		$msg = "Retrieving content of $title" . ( $section !== null ? ", section $section" : '' );
 		$this->logger->debug( $msg );
 		$params = [
@@ -54,7 +54,7 @@ 
 		];
 
 		if ( $section !== null ) {
-			$params['rvsection'] = $section;
+			$params[ 'rvsection' ] = $section;
 		}
 
 		$req = $this->buildRequest( $params );
@@ -64,7 +64,7 @@ 
 			throw new MissingPageException( $title );
 		}
 
-		$mainSlot = $page->revisions[0]->slots->main;
+		$mainSlot = $page->revisions[ 0 ]->slots->main;
 
 		if ( $section !== null && isset( $mainSlot->nosuchsection ) ) {
 			throw new MissingSectionException( $title, $section );
@@ -78,7 +78,7 @@ 
 	 * @param array $params
 	 * @throws EditException
 	 */
-	public function editPage( array $params ) {
+	public function editPage ( array $params ) {
 		$this->login();
 
 		$params = [
@@ -87,7 +87,7 @@ 
 		] + $params;
 
 		if ( Config::getInstance()->get( 'bot-edits' ) ) {
-			$params['bot'] = 1;
+			$params[ 'bot' ] = 1;
 		}
 
 		$res = $this->buildRequest( $params )->setPost()->execute();
@@ -105,7 +105,7 @@ 
 	 * Login wrapper. Checks if we're already logged in and clears tokens cache
 	 * @throws LoginException
 	 */
-	public function login() {
+	public function login () {
 		if ( self::$loggedIn ) {
 			return;
 		}
@@ -132,7 +132,7 @@ 
 
 		self::$loggedIn = true;
 		// Clear tokens cache
-		$this->tokens = [];
+		$this->tokens = [ ];
 		$this->logger->info( 'Login succeeded' );
 	}
 
@@ -142,7 +142,7 @@ 
 	 * @param string $type
 	 * @return string
 	 */
-	public function getToken( string $type ) : string {
+	public function getToken ( string $type ) : string {
 		if ( !isset( $this->tokens[ $type ] ) ) {
 			$params = [
 				'action' => 'query',
@@ -165,7 +165,7 @@ 
 	 * @param string $title
 	 * @return int
 	 */
-	public function getPageCreationTS( string $title ) : int {
+	public function getPageCreationTS ( string $title ) : int {
 		$params = [
 			'action' => 'query',
 			'prop' => 'revisions',
@@ -178,7 +178,7 @@ 
 
 		$res = $this->buildRequest( $params )->execute();
 		$data = $res->query->pages;
-		return strtotime( reset( $data )->revisions[0]->timestamp );
+		return strtotime( reset( $data )->revisions[ 0 ]->timestamp );
 	}
 
 	/**
@@ -187,7 +187,7 @@ 
 	 * @param string $title
 	 * @param string $reason
 	 */
-	public function protectPage( string $title, string $reason ) {
+	public function protectPage ( string $title, string $reason ) {
 		$this->logger->info( "Protecting page $title" );
 		$this->login();
 
@@ -208,7 +208,7 @@ 
 	 * @param array $params
 	 * @return RequestBase
 	 */
-	private function buildRequest( array $params ) : RequestBase {
+	private function buildRequest ( array $params ) : RequestBase {
 		return RequestBase::newFromParams( $params )->setUrl( $this->domain );
 	}
 }

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 ) {
@@ -35,7 +35,7 @@ 
 	 * @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 ) {
@@ -67,15 +67,15 @@ 
 	 * @return int
 	 * @throws TaskException
 	 */
-	protected function getLastPageNum( string $user ) : int {
+	protected function getLastPageNum ( string $user ) : int {
 		$this->getLogger()->debug( "Retrieving previous pages for $user" );
 		$userObj = new User( $user, $this->getWiki() );
 
-		$unprefixedTitle = explode( ':', $this->getOpt( 'main-page-title' ), 2 )[1];
+		$unprefixedTitle = explode( ':', $this->getOpt( 'main-page-title' ), 2 )[ 1 ];
 
 		$prefixes = [ "$unprefixedTitle/$user/" ];
 		foreach ( $userObj->getAliases() as $alias ) {
-			$prefixes[] = "$unprefixedTitle/$alias/";
+			$prefixes[ ] = "$unprefixedTitle/$alias/";
 		}
 
 		$params = [
@@ -112,13 +112,13 @@ 
 	 * @param string $user
 	 * @param array $groups
 	 */
-	protected function createPage( string $title, string $user, array $groups ) {
+	protected function createPage ( string $title, string $user, array $groups ) {
 		$this->getLogger()->info( "Creating page $title" );
 		$textParams = [
 			'$user' => $user,
-			'$date' => $groups['sysop'],
-			'$burocrate' => $groups['bureaucrat'] ?? '',
-			'$checkuser' => $groups['checkuser'] ?? ''
+			'$date' => $groups[ 'sysop' ],
+			'$burocrate' => $groups[ 'bureaucrat' ] ?? '',
+			'$checkuser' => $groups[ 'checkuser' ] ?? ''
 		];
 
 		$params = [
@@ -136,7 +136,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 = [
@@ -153,7 +153,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 +29 added lines, -29 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->getAdminsList();
@@ -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,7 +187,7 @@ 
 	 * @param string[] $names
 	 * @return string[] [ new_name => old_name ]
 	 */
-	protected function checkRenamedUsers( array $names ) : array {
+	protected function checkRenamedUsers ( array $names ) : array {
 		$titles = array_map( function ( $x ) {
 			return "Utente:$x";
 		}, $names );
@@ -202,7 +202,7 @@ 
 		];
 
 		$data = RequestBase::newFromParams( $params )->execute();
-		$ret = [];
+		$ret = [ ];
 		foreach ( $data->query->logevents as $entry ) {
 			$time = strtotime( $entry->timestamp );
 			// 1 month is arbitrary
@@ -221,10 +221,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 ] );
@@ -234,7 +234,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 ] );
 				}
 			}
@@ -245,16 +245,16 @@ 
 		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 ];
 				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 ] );
@@ -274,21 +274,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/Wiki/User.php

Spacing +12 added lines, -12 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki;
 
@@ -17,7 +17,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;
 	}
@@ -25,7 +25,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function getName() : string {
+	public function getName () : string {
 		return $this->name;
 	}
 
@@ -34,7 +34,7 @@ 
 	 *
 	 * @return string[]
 	 */
-	public function getGroups() : array {
+	public function getGroups () : array {
 		return array_keys( array_diff_key( $this->getUserInfo(), array_fill_keys( PageBotList::NON_GROUP_KEYS, 1 ) ) );
 	}
 
@@ -43,7 +43,7 @@ 
 	 *
 	 * @return string[]
 	 */
-	public function getUserInfo() : array {
+	public function getUserInfo () : array {
 		if ( $this->groups === null ) {
 			$usersList = PageBotList::get( $this->wiki )->getAdminsList();
 			$this->groups = $usersList[ $this->name ];
@@ -57,7 +57,7 @@ 
 	 * @param string $groupName
 	 * @return bool
 	 */
-	public function inGroup( string $groupName ) : bool {
+	public function inGroup ( string $groupName ) : bool {
 		return in_array( $groupName, $this->getGroups() );
 	}
 
@@ -66,10 +66,10 @@ 
 	 *
 	 * @inheritDoc
 	 */
-	public function getRegex() : string {
+	public function getRegex () : string {
 		$bits = $this->getAliases();
-		$bits[] = $this->name;
-		$regexify = function( $el ) {
+		$bits[ ] = $this->name;
+		$regexify = function ( $el ) {
 			return str_replace( ' ', '[ _]', preg_quote( $el ) );
 		};
 		return '(?:' . implode( '|', array_map( $regexify, $bits ) ) . ')';
@@ -80,14 +80,14 @@ 
 	 *
 	 * @return string[]
 	 */
-	public function getAliases() : array {
-		return $this->getUserInfo()['aliases'] ?? [];
+	public function getAliases () : array {
+		return $this->getUserInfo()[ 'aliases' ] ?? [ ];
 	}
 
 	/**
 	 * @return string
 	 */
-	public function __toString() {
+	public function __toString () {
 		return $this->name;
 	}
 }