Daimona / BotRiconferme

includes/TaskDataProvider.php

Spacing +15 added lines, -17 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -13,14 +13,14 @@ 
 	/** @var array[] */
 	private $allUsers;
 	/** @var PageRiconferma[] */
-	private $createdPages = [];
+	private $createdPages = [ ];
 
 	/**
 	 * Get the full content of the JSON users list
 	 *
 	 * @return array[]
 	 */
-	public function getUsersList() : array {
+	public function getUsersList () : array {
 		if ( $this->allUsers === null ) {
 			$this->getLogger()->debug( 'Retrieving users list' );
 			$content = $this->getController()->getPageContent( $this->getConfig()->get( 'list-title' ) );
@@ -35,9 +35,9 @@ 
 	 *
 	 * @return array[]
 	 */
-	public function getUsersToProcess() : array {
+	public function getUsersToProcess () : array {
 		if ( $this->processUsers === null ) {
-			$this->processUsers = [];
+			$this->processUsers = [ ];
 			foreach ( $this->getUsersList() as $user => $groups ) {
 				$timestamp = $this->getValidTimestamp( $groups );
 
@@ -59,13 +59,11 @@ 
 	 * @param array $groups
 	 * @return int
 	 */
-	private function getValidTimestamp( array $groups ) : int {
+	private function getValidTimestamp ( array $groups ) : int {
 		$checkuser = isset( $groups[ 'checkuser' ] ) ?
-			\DateTime::createFromFormat( 'd/m/Y', $groups[ 'checkuser' ] )->getTimestamp() :
-			0;
+			\DateTime::createFromFormat( 'd/m/Y', $groups[ 'checkuser' ] )->getTimestamp() : 0;
 		$bureaucrat = isset( $groups[ 'bureaucrat' ] ) ?
-			\DateTime::createFromFormat( 'd/m/Y', $groups[ 'bureaucrat' ] )->getTimestamp() :
-			0;
+			\DateTime::createFromFormat( 'd/m/Y', $groups[ 'bureaucrat' ] )->getTimestamp() : 0;
 
 		$timestamp = max( $bureaucrat, $checkuser );
 		if ( $timestamp === 0 ) {
@@ -79,7 +77,7 @@ 
 	 *
 	 * @return PageRiconferma[]
 	 */
-	public function getOpenPages() : array {
+	public function getOpenPages () : array {
 		$baseTitle = $this->getConfig()->get( 'ric-main-page' );
 		$params = [
 			'action' => 'query',
@@ -91,10 +89,10 @@ 
 
 		$res = RequestBase::newFromParams( $params )->execute();
 		$pages = $res->query->pages;
-		$ret = [];
+		$ret = [ ];
 		foreach ( reset( $pages )->templates as $page ) {
 			if ( preg_match( "!$baseTitle\/[^\/]+\/\d!", $page->title ) !== false ) {
-				$ret[] = new PageRiconferma( $page->title );
+				$ret[ ] = new PageRiconferma( $page->title );
 			}
 		}
 		return $ret;
@@ -105,21 +103,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;
 	}
 }

includes/Task/ClosePages.php

Spacing +53 added lines, -54 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task;
 
@@ -15,7 +15,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function run() : TaskResult {
+	public function run () : TaskResult {
 		$this->getLogger()->info( 'Starting task ClosePages' );
 
 		$pages = $this->getPagesList();
@@ -52,12 +52,12 @@ 
 	 *
 	 * @return PageRiconferma[]
 	 */
-	protected function getPagesList() : array {
+	protected function getPagesList () : array {
 		$allPages = $this->getDataProvider()->getOpenPages();
-		$ret = [];
+		$ret = [ ];
 		foreach ( $allPages as $page ) {
 			if ( time() > $page->getEndTimestamp() ) {
-				$ret[] = $page;
+				$ret[ ] = $page;
 			}
 		}
 		return $ret;
@@ -69,11 +69,11 @@ 
 	 * @param PageRiconferma[] $pages
 	 * @return PageRiconferma[]
 	 */
-	private function getFailures( array $pages ) : array {
-		$ret = [];
+	private function getFailures ( array $pages ) : array {
+		$ret = [ ];
 		foreach ( $pages as $page ) {
 			if ( $page->getOutcome() & PageRiconferma::OUTCOME_FAIL ) {
-				$ret[] = $page;
+				$ret[ ] = $page;
 			}
 		}
 		return $ret;
@@ -82,7 +82,7 @@ 
 	/**
 	 * @param PageRiconferma $page
 	 */
-	protected function addVoteCloseText( PageRiconferma $page ) {
+	protected function addVoteCloseText ( PageRiconferma $page ) {
 		$content = $page->getContent();
 		$beforeReg = '!è necessario ottenere una maggioranza .+ votanti\.!';
 		$newContent = preg_replace( $beforeReg, '$0' . "\n" . $page->getOutcomeText(), $content );
@@ -100,13 +100,13 @@ 
 	 * @param PageRiconferma[] $pages
 	 * @see UpdatesAround::addToMainPage()
 	 */
-	protected function removeFromMainPage( array $pages ) {
+	protected function removeFromMainPage ( array $pages ) {
 		$this->getLogger()->info(
 			'Removing from main: ' . implode( ', ', array_map( 'strval', $pages ) )
 		);
 
 		$mainPage = new Page( $this->getConfig()->get( 'ric-main-page' ) );
-		$translations = [];
+		$translations = [ ];
 		foreach ( $pages as $page ) {
 			$translations[ '{{' . $page->getTitle() . '}}' ] = '';
 		}
@@ -124,17 +124,17 @@ 
 	 *
 	 * @param PageRiconferma[] $pages
 	 */
-	protected function addToArchive( array $pages ) {
+	protected function addToArchive ( array $pages ) {
 		$this->getLogger()->info(
 			'Adding to archive: ' . implode( ', ', array_map( 'strval', $pages ) )
 		);
 
-		$simple = $votes = [];
+		$simple = $votes = [ ];
 		foreach ( $pages as $page ) {
 			if ( $page->isVote() ) {
-				$votes[] = $page;
+				$votes[ ] = $page;
 			} else {
-				$simple[] = $page;
+				$simple[ ] = $page;
 			}
 		}
 
@@ -151,21 +151,21 @@ 
 	 * @param string $archiveTitle
 	 * @param array $pages
 	 */
-	private function reallyAddToArchive( string $archiveTitle, array $pages ) {
+	private function reallyAddToArchive ( string $archiveTitle, array $pages ) {
 		$curTitle = "$archiveTitle/" . date( 'Y' );
 
 		$append = '';
-		$archivedList = [];
+		$archivedList = [ ];
 		foreach ( $pages as $page ) {
 			$append .= '{{' . $page->getTitle() . "}}\n";
-			$archivedList[] = $page->getUserNum();
+			$archivedList[ ] = $page->getUserNum();
 		}
 
 		if ( count( $archivedList ) > 1 ) {
 			$last = array_pop( $archivedList );
 			$userNums = implode( ', ', $archivedList ) . " e $last";
 		} else {
-			$userNums = $archivedList[0];
+			$userNums = $archivedList[ 0 ];
 		}
 
 		$summary = $this->msg( 'close-archive-summary' )
@@ -184,15 +184,14 @@ 
 	 * @param PageRiconferma $page
 	 * @see CreatePages::updateBasePage()
 	 */
-	protected function updateBasePage( PageRiconferma $page ) {
+	protected function updateBasePage ( PageRiconferma $page ) {
 		$this->getLogger()->info( "Updating base page for $page" );
 
 		$basePage = new Page( $page->getBaseTitle() );
 		$current = $basePage->getContent();
 
 		$outcomeText = $page->getOutcome() & PageRiconferma::OUTCOME_FAIL ?
-			'non riconfermato' :
-			'riconfermato';
+			'non riconfermato' : 'riconfermato';
 		$text = $page->isVote() ? "votazione: $outcomeText" : 'riconferma tacita';
 
 		$newContent = str_replace( 'riconferma in corso', $text, $current );
@@ -208,16 +207,16 @@ 
 	 * @param PageRiconferma[] $pages
 	 * @see UpdatesAround::addVote()
 	 */
-	protected function updateVote( array $pages ) {
+	protected function updateVote ( array $pages ) {
 		$this->getLogger()->info(
 			'Updating votazioni: ' . implode( ', ', array_map( 'strval', $pages ) )
 		);
 		$votePage = new Page( $this->getConfig()->get( 'ric-vote-page' ) );
 		$content = $votePage->getContent();
 
-		$titles = [];
+		$titles = [ ];
 		foreach ( $pages as $page ) {
-			$titles[] = preg_quote( $page->getTitle() );
+			$titles[ ] = preg_quote( $page->getTitle() );
 		}
 
 		$titleReg = implode( '|', array_map( 'preg_quote', $titles ) );
@@ -248,7 +247,7 @@ 
 	 * @param array $pages
 	 * @see UpdatesAround::addNews()
 	 */
-	protected function updateNews( array $pages ) {
+	protected function updateNews ( array $pages ) {
 		$simpleAmount = $voteAmount = 0;
 		foreach ( $pages as $page ) {
 			if ( $page->isVote() ) {
@@ -268,12 +267,12 @@ 
 		$simpleReg = '!(\| *riconferme[ _]tacite[ _]amministratori *= *)(\d+)!';
 		$voteReg = '!(\| *riconferme[ _]voto[ _]amministratori *= *)(\d+)!';
 
-		$simpleMatches = $voteMatches = [];
+		$simpleMatches = $voteMatches = [ ];
 		preg_match( $simpleReg, $content, $simpleMatches );
 		preg_match( $voteReg, $content, $voteMatches );
 
-		$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, $content );
 		$newContent = preg_replace( $voteReg, '${1}' . $newVote, $newContent );
 
@@ -293,7 +292,7 @@ 
 	 *
 	 * @param PageRiconferma[] $pages
 	 */
-	protected function updateAdminList( array $pages ) {
+	protected function updateAdminList ( array $pages ) {
 		$this->getLogger()->info(
 			'Updating admin list: ' . implode( ', ', array_map( 'strval', $pages ) )
 		);
@@ -301,17 +300,17 @@ 
 		$newContent = $adminsPage->getContent();
 		$newDate = date( 'Ymd', strtotime( '+1 year' ) );
 
-		$riconfNames = $removeNames = [];
+		$riconfNames = $removeNames = [ ];
 		foreach ( $pages as $page ) {
 			$user = $page->getUser();
 			$reg = "!(\{\{Amministratore\/riga\|$user.+\| *)\d+( *\|(?: *pausa)? *\}\}\n)!";
 			if ( $page->getOutcome() & PageRiconferma::OUTCOME_FAIL ) {
 				// Remove the line
 				$newContent = preg_replace( $reg, '', $newContent );
-				$removeNames[] = $user;
+				$removeNames[ ] = $user;
 			} else {
 				$newContent = preg_replace( $reg, '$1' . $newDate . '$2', $newContent );
-				$riconfNames[] = $user;
+				$riconfNames[ ] = $user;
 			}
 		}
 
@@ -319,7 +318,7 @@ 
 			$lastUser = array_pop( $riconfNames );
 			$riconfList = implode( ', ', $riconfNames ) . " e $lastUser";
 		} elseif ( $riconfNames ) {
-			$riconfList = $riconfNames[0];
+			$riconfList = $riconfNames[ 0 ];
 		} else {
 			$riconfList = 'nessuno';
 		}
@@ -328,7 +327,7 @@ 
 			$lastUser = array_pop( $removeNames );
 			$removeList = implode( ', ', $removeNames ) . " e $lastUser";
 		} elseif ( $removeNames ) {
-			$removeList = $removeNames[0];
+			$removeList = $removeNames[ 0 ];
 		} else {
 			$removeList = 'nessuno';
 		}
@@ -351,13 +350,13 @@ 
 	/**
 	 * @param PageRiconferma[] $pages
 	 */
-	protected function updateCUList( array $pages ) {
+	protected function updateCUList ( array $pages ) {
 		$this->getLogger()->info( 'Checking if CU list needs updating.' );
 		$cuList = new Page( $this->getConfig()->get( 'cu-list-title' ) );
 		$admins = $this->getDataProvider()->getUsersList();
 		$newContent = $cuList->getContent();
 
-		$riconfNames = $removeNames = [];
+		$riconfNames = $removeNames = [ ];
 		foreach ( $pages as $page ) {
 			$user = $page->getUser();
 			if ( array_key_exists( 'checkuser', $admins[ $user ] ) ) {
@@ -365,10 +364,10 @@ 
 				if ( $page->getOutcome() & PageRiconferma::OUTCOME_FAIL ) {
 					// Remove the line
 					$newContent = preg_replace( $reg, '', $newContent );
-					$removeNames[] = $user;
+					$removeNames[ ] = $user;
 				} else {
 					$newContent = preg_replace( $reg, '$1{{subst:#time:j F Y}}$2', $newContent );
-					$riconfNames[] = $user;
+					$riconfNames[ ] = $user;
 				}
 			}
 		}
@@ -385,7 +384,7 @@ 
 			$lastUser = array_pop( $riconfNames );
 			$riconfList = implode( ', ', $riconfNames ) . " e $lastUser";
 		} elseif ( $riconfNames ) {
-			$riconfList = $riconfNames[0];
+			$riconfList = $riconfNames[ 0 ];
 		} else {
 			$riconfList = 'nessuno';
 		}
@@ -394,7 +393,7 @@ 
 			$lastUser = array_pop( $removeNames );
 			$removeList = implode( ', ', $removeNames ) . " e $lastUser";
 		} elseif ( $removeNames ) {
-			$removeList = $removeNames[0];
+			$removeList = $removeNames[ 0 ];
 		} else {
 			$removeList = 'nessuno';
 		}
@@ -416,17 +415,17 @@ 
 	/**
 	 * @param PageRiconferma[] $pages
 	 */
-	protected function updateBurList( array $pages ) {
+	protected function updateBurList ( array $pages ) {
 		$this->getLogger()->info( 'Checking if bur list needs updating.' );
 		$admins = $this->getDataProvider()->getUsersList();
 
-		$remove = [];
+		$remove = [ ];
 		foreach ( $pages as $page ) {
 			$user = $page->getUser();
 			if ( array_key_exists( 'bureaucrat', $admins[ $user ] ) &&
 				$page->getOutcome() & PageRiconferma::OUTCOME_FAIL
 			) {
-				$remove[] = $user;
+				$remove[ ] = $user;
 			}
 		}
 
@@ -445,7 +444,7 @@ 
 			$lastUser = array_pop( $remove );
 			$removeList = implode( ', ', $remove ) . " e $lastUser";
 		} else {
-			$removeList = $remove[0];
+			$removeList = $remove[ 0 ];
 		}
 
 		$summary = $this->msg( 'bur-list-update-summary' )
@@ -464,7 +463,7 @@ 
 	 *
 	 * @param PageRiconferma[] $pages
 	 */
-	protected function requestRemoval( array $pages ) {
+	protected function requestRemoval ( array $pages ) {
 		$this->getLogger()->info(
 			'Requesting removal on meta for: ' . implode( ', ', array_map( 'strval', $pages ) )
 		);
@@ -508,14 +507,14 @@ 
 	 *
 	 * @param PageRiconferma[] $pages
 	 */
-	protected function updateAnnunci( array $pages ) {
+	protected function updateAnnunci ( array $pages ) {
 		$this->getLogger()->info( 'Updating annunci' );
 
-		$names = [];
+		$names = [ ];
 		$text = '';
 		foreach ( $pages as $page ) {
 			$user = $page->getUser();
-			$names[] = $user;
+			$names[ ] = $user;
 			$text .= "{{Breve|admin|{{subst:#time:j}}|[[Utente:$user|]] " .
 				"non è stato riconfermato [[WP:A|amministratore]].}}\n";
 		}
@@ -538,7 +537,7 @@ 
 			$lastUser = array_pop( $names );
 			$namesList = implode( ', ', $names ) . " e $lastUser";
 		} else {
-			$namesList = $names[0];
+			$namesList = $names[ 0 ];
 		}
 
 		$summary = $this->msg( 'annunci-summary' )
@@ -557,16 +556,16 @@ 
 	 *
 	 * @param PageRiconferma[] $pages
 	 */
-	protected function updateUltimeNotizie( array $pages ) {
+	protected function updateUltimeNotizie ( array $pages ) {
 		$this->getLogger()->info( 'Updating ultime notizie' );
 		$notiziePage = new Page( $this->getConfig()->get( 'ultimenotizie-title' ) );
 
-		$names = [];
+		$names = [ ];
 		$text = '';
 		foreach ( $pages as $page ) {
 			$user = $page->getUser();
 			$title = $page->getTitle();
-			$names[] = $user;
+			$names[ ] = $user;
 			$text .= "'''{{subst:#time:j F}}''': [[Utente:$user|]] non è stato [[$title|riconfermato]] " .
 				'[[WP:A|amministratore]]; ora gli admin sono {{subst:#expr: {{NUMBEROFADMINS}} - 1}}.';
 		}
@@ -585,7 +584,7 @@ 
 			$lastUser = array_pop( $names );
 			$namesList = implode( ', ', $names ) . " e $lastUser";
 		} else {
-			$namesList = $names[0];
+			$namesList = $names[ 0 ];
 		}
 
 		$summary = $this->msg( 'ultimenotizie-summary' )

includes/Config.php

Spacing +13 added lines, -13 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -12,12 +12,12 @@ 
 	/** @var self */
 	private static $instance;
 	/** @var array */
-	private $opts = [];
+	private $opts = [ ];
 
 	/**
 	 * Use self::init() and self::getInstance()
 	 */
-	private function __construct() {
+	private function __construct () {
 	}
 
 	/**
@@ -26,16 +26,16 @@ 
 	 * @param array $defaults
 	 * @throws ConfigException
 	 */
-	public static function init( array $defaults ) {
+	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( 'msg-title', $defaults['msg-title'] );
-		$inst->set( 'username', $defaults['username'] );
-		$inst->set( 'password', $defaults['password'] );
+		$inst->set( 'list-title', $defaults[ 'list-title' ] );
+		$inst->set( 'msg-title', $defaults[ 'msg-title' ] );
+		$inst->set( 'username', $defaults[ 'username' ] );
+		$inst->set( 'password', $defaults[ 'password' ] );
 		self::$instance = $inst;
 
 		// On-wiki values
@@ -54,7 +54,7 @@ 
 	 * @param string $key
 	 * @return string
 	 */
-	public function getWikiMessage( string $key ) : string {
+	public function getWikiMessage ( string $key ) : string {
 		static $messages = null;
 		if ( $messages === null ) {
 			try {
@@ -65,7 +65,7 @@ 
 			}
 		}
 		// @phan-suppress-next-line PhanTypeArraySuspiciousNullable
-		return $messages[$key];
+		return $messages[ $key ];
 	}
 	/**
 	 * Set a config value.
@@ -73,7 +73,7 @@ 
 	 * @param string $key
 	 * @param mixed $value
 	 */
-	protected function set( string $key, $value ) {
+	protected function set ( string $key, $value ) {
 		$this->opts[ $key ] = $value;
 	}
 
@@ -83,7 +83,7 @@ 
 	 * @return self
 	 * @throws ConfigException
 	 */
-	public static function getInstance() : self {
+	public static function getInstance () : self {
 		if ( !self::$instance ) {
 			throw new ConfigException( 'Config not yet initialized' );
 		}
@@ -97,7 +97,7 @@ 
 	 * @return mixed
 	 * @throws ConfigException
 	 */
-	public function get( string $opt ) {
+	public function get ( string $opt ) {
 		if ( !isset( $this->opts[ $opt ] ) ) {
 			throw new ConfigException( "Config option '$opt' not set." );
 		}

includes/Request/RequestBase.php

Spacing +22 added lines, -22 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -29,14 +29,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;
 	}
@@ -47,7 +47,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 {
@@ -61,7 +61,7 @@ 
 	 *
 	 * @return self For chaining
 	 */
-	public function setPost() : self {
+	public function setPost () : self {
 		$this->method = 'POST';
 		return $this;
 	}
@@ -72,7 +72,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;
 	}
@@ -82,14 +82,14 @@ 
 	 *
 	 * @return \stdClass
 	 */
-	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 ) ) {
@@ -107,9 +107,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 );
 
@@ -125,17 +125,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;
 		}
 	}
@@ -146,7 +146,7 @@ 
 	 * @param \stdClass $res
 	 * @throws APIRequestException
 	 */
-	protected function handleErrorAndWarnings( $res ) {
+	protected function handleErrorAndWarnings ( $res ) {
 		if ( isset( $res->error ) ) {
 			switch ( $res->error->code ) {
 				case 'missingtitle':
@@ -172,7 +172,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 );
 
@@ -189,7 +189,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;
@@ -207,14 +207,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;
 	}
@@ -225,7 +225,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/Request/NativeRequest.php

Spacing +5 added lines, -5 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -9,7 +9,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	protected function reallyMakeRequest( string $params ) : string {
+	protected function reallyMakeRequest ( string $params ) : string {
 		$context = [
 			'http' => [
 				'method' => $this->method,
@@ -18,7 +18,7 @@ 
 		];
 		$url = $this->url;
 		if ( $this->method === 'POST' ) {
-			$context['http']['content'] = $params;
+			$context[ 'http' ][ 'content' ] = $params;
 		} else {
 			$url = "$url?$params";
 		}
@@ -27,8 +27,8 @@ 
 
 		foreach ( $http_response_header as $header ) {
 			$bits = explode( ':', $header, 2 );
-			if ( trim( $bits[0] ) === 'Set-Cookie' ) {
-				$this->newCookies[] = $bits[1];
+			if ( trim( $bits[ 0 ] ) === 'Set-Cookie' ) {
+				$this->newCookies[ ] = $bits[ 1 ];
 			}
 		}
 

includes/Page.php

Spacing +10 added lines, -10 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -17,7 +17,7 @@ 
 	 * @param string $title
 	 * @param string $domain The site where the page lives, if different from default
 	 */
-	public function __construct( string $title, string $domain = DEFAULT_URL ) {
+	public function __construct ( string $title, string $domain = DEFAULT_URL ) {
 		$this->title = $title;
 		$this->controller = new WikiController( $domain );
 	}
@@ -25,7 +25,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function getTitle() : string {
+	public function getTitle () : string {
 		return $this->title;
 	}
 
@@ -35,7 +35,7 @@ 
 	 * @param int|null $section A section number to retrieve the content of that section
 	 * @return string
 	 */
-	public function getContent( int $section = null ) : string {
+	public function getContent ( int $section = null ) : string {
 		if ( $this->content === null ) {
 			$this->content = $this->controller->getPageContent( $this->title, $section );
 		}
@@ -47,16 +47,16 @@ 
 	 *
 	 * @param array $params
 	 */
-	public function edit( array $params ) {
+	public function edit ( array $params ) {
 		$params = [
 			'title' => $this->getTitle()
 		] + $params;
 
 		$this->controller->editPage( $params );
-		if ( isset( $params['text'] ) ) {
-			$this->content = $params['text'];
-		} elseif ( isset( $params['appendtext'] ) ) {
-			$this->content .= $params['appendtext'];
+		if ( isset( $params[ 'text' ] ) ) {
+			$this->content = $params[ 'text' ];
+		} elseif ( isset( $params[ 'appendtext' ] ) ) {
+			$this->content .= $params[ 'appendtext' ];
 		} else {
 			// Clear the cache anyway
 			( new Logger )->warning( 'Resetting content cache. Params: ' . var_export( $params, true ) );
@@ -69,7 +69,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function __toString() {
+	public function __toString () {
 		return $this->getTitle();
 	}
 }

includes/WikiController.php

Spacing +19 added lines, -19 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -24,7 +24,7 @@ 
 	/**
 	 * @param string $domain The URL of the wiki, if different from default
 	 */
-	public function __construct( string $domain = DEFAULT_URL ) {
+	public function __construct ( string $domain = DEFAULT_URL ) {
 		$this->logger = new Logger;
 		$this->domain = $domain;
 	}
@@ -37,7 +37,7 @@ 
 	 * @return string
 	 * @throws MissingPageException
 	 */
-	public function getPageContent( string $title, int $section = null ) : string {
+	public function getPageContent ( string $title, int $section = null ) : string {
 		$this->logger->debug( "Retrieving page $title" );
 		$params = [
 			'action' => 'query',
@@ -48,7 +48,7 @@ 
 		];
 
 		if ( $section !== null ) {
-			$params['rvsection'] = $section;
+			$params[ 'rvsection' ] = $section;
 		}
 
 		$req = RequestBase::newFromParams( $params )->setUrl( $this->domain );
@@ -58,7 +58,7 @@ 
 			throw new MissingPageException( $title );
 		}
 
-		return $page->revisions[0]->slots->main->{ '*' };
+		return $page->revisions[ 0 ]->slots->main->{ '*' };
 	}
 
 	/**
@@ -67,7 +67,7 @@ 
 	 * @param array $params
 	 * @throws EditException
 	 */
-	public function editPage( array $params ) {
+	public function editPage ( array $params ) {
 		$this->login();
 
 		$params = [
@@ -92,7 +92,7 @@ 
 	 * @return string
 	 * @fixme Not the right place for this
 	 */
-	public static function getTimeWithArticle( int $timestamp ) : string {
+	public static function getTimeWithArticle ( int $timestamp ) : string {
 		$oldLoc = setlocale( LC_TIME, 'it_IT', 'Italian_Italy', 'Italian' );
 		$timeString = strftime( '%e %B alle %R', $timestamp );
 		// Remove the left space if day has a single digit
@@ -111,16 +111,16 @@ 
 	 * @fixme Not the right place for this
 	 * @todo Is there a better way?
 	 */
-	public static function getTimestampFromLocalTime( string $timeString ) : int {
+	public static function getTimestampFromLocalTime ( string $timeString ) : int {
 		$oldLoc = setlocale( LC_TIME, 'it_IT', 'Italian_Italy', 'Italian' );
 		$bits = strptime( $timeString, '%e %m %Y alle %H:%M' );
 		$timestamp = mktime(
-			$bits['tm_hour'],
-			$bits['tm_min'],
+			$bits[ 'tm_hour' ],
+			$bits[ 'tm_min' ],
 			0,
-			$bits['tm_mon'] + 1,
-			$bits['tm_mday'],
-			$bits['tm_year'] + 1900
+			$bits[ 'tm_mon' ] + 1,
+			$bits[ 'tm_mday' ],
+			$bits[ 'tm_year' ] + 1900
 		);
 		setlocale( LC_TIME, $oldLoc );
 
@@ -130,7 +130,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 ) {
 			$this->logger->debug( 'Already logged in' );
 			return;
@@ -157,7 +157,7 @@ 
 
 		self::$loggedIn = true;
 		// Clear tokens cache
-		$this->tokens = [];
+		$this->tokens = [ ];
 		$this->logger->info( 'Login succeeded' );
 	}
 
@@ -167,7 +167,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',
@@ -190,7 +190,7 @@ 
 	 * @param string $title
 	 * @return int
 	 */
-	public function getPageCreationTS( string $title ) : int {
+	public function getPageCreationTS ( string $title ) : int {
 		$params = [
 			'action' => 'query',
 			'prop' => 'revisions',
@@ -203,7 +203,7 @@ 
 
 		$res = RequestBase::newFromParams( $params )->setUrl( $this->domain )->execute();
 		$data = $res->query->pages;
-		return strtotime( reset( $data )->revisions[0]->timestamp );
+		return strtotime( reset( $data )->revisions[ 0 ]->timestamp );
 	}
 
 	/**
@@ -212,7 +212,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();
 

includes/Task/UpdateList.php

Spacing +17 added lines, -17 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Task;
 
@@ -18,7 +18,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function run() : TaskResult {
+	public function run () : TaskResult {
 		$this->getLogger()->info( 'Starting task UpdateList' );
 		$this->actualList = $this->getActualAdmins();
 		$this->botList = $this->getDataProvider()->getUsersList();
@@ -53,7 +53,7 @@ 
 	/**
 	 * @return array
 	 */
-	protected function getActualAdmins() : array {
+	protected function getActualAdmins () : array {
 		$this->getLogger()->debug( 'Retrieving admins - API' );
 		$params = [
 			'action' => 'query',
@@ -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->getConfig()->get( 'exclude-admins' );
 		foreach ( $data->query->allusers as $u ) {
 			if ( in_array( $u->name, $blacklist ) ) {
@@ -89,22 +89,22 @@ 
 	 *
 	 * @return array[]
 	 */
-	protected function getMissingGroups() : array {
-		$missing = [];
+	protected function getMissingGroups () : array {
+		$missing = [ ];
 		foreach ( $this->actualList as $adm => $groups ) {
-			$groupsList = [];
+			$groupsList = [ ];
 			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 ] );
 			}
 
 			foreach ( $groupsList as $group ) {
 				try {
 					$missing[ $adm ][ $group ] = $this->getFlagDate( $adm, $group );
 				} catch ( TaskException $e ) {
-					$this->errors[] = $e->getMessage();
+					$this->errors[ ] = $e->getMessage();
 				}
 			}
 		}
@@ -119,7 +119,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;
@@ -154,7 +154,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 ) ) {
@@ -176,8 +176,8 @@ 
 	 *
 	 * @return array[]
 	 */
-	protected function getExtraGroups() : array {
-		$extra = [];
+	protected function getExtraGroups () : array {
+		$extra = [ ];
 		foreach ( $this->botList as $name => $groups ) {
 			if ( !isset( $this->actualList[ $name ] ) ) {
 				$extra[ $name ] = $groups;
@@ -193,7 +193,7 @@ 
 	 *
 	 * @param array $newContent
 	 */
-	protected function doUpdateList( array $newContent ) {
+	protected function doUpdateList ( array $newContent ) {
 		$this->getLogger()->info( 'Updating admin list' );
 
 		$params = [
@@ -212,7 +212,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 ] ) ) {

run.php

Spacing +3 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 /**
  * Entry point for the bot, called by CLI
  */
@@ -38,9 +38,8 @@ 
 
 /* URL (for debugging purpose) */
 $urlParam = getopt( '', [ 'force-url:' ] );
-$url = isset( $urlParam['force-url'] ) ?
-	$urlParam['force-url'] :
-	'https://it.wikipedia.org/w/api.php';
+$url = isset( $urlParam[ 'force-url' ] ) ?
+	$urlParam[ 'force-url' ] : 'https://it.wikipedia.org/w/api.php';
 
 define( 'DEFAULT_URL', $url );