Daimona / BotRiconferme

includes/Config.php

Spacing +7 added lines, -7 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -13,7 +13,7 @@ 
 	/** @var self */
 	private static $instance;
 	/** @var array */
-	private $opts = [];
+	private $opts = [ ];
 	/** @var Wiki */
 	private $wiki;
 
@@ -22,7 +22,7 @@ 
 	 *
 	 * @param Wiki $wiki
 	 */
-	private function __construct( Wiki $wiki ) {
+	private function __construct ( Wiki $wiki ) {
 		$this->wiki = $wiki;
 	}
 
@@ -33,7 +33,7 @@ 
 	 * @param Wiki $wiki
 	 * @throws ConfigException
 	 */
-	public static function init( string $configTitle, Wiki $wiki ) : void {
+	public static function init ( string $configTitle, Wiki $wiki ) : void {
 		if ( self::$instance ) {
 			throw new ConfigException( 'Config was already initialized' );
 		}
@@ -59,7 +59,7 @@ 
 	 * @param string $key
 	 * @param mixed $value
 	 */
-	protected function set( string $key, $value ) : void {
+	protected function set ( string $key, $value ) : void {
 		$this->opts[ $key ] = $value;
 	}
 
@@ -69,7 +69,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' );
 		}
@@ -83,7 +83,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/Wiki/Page/PageBotList.php

Spacing +18 added lines, -20 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Wiki\Page;
 
@@ -18,7 +18,7 @@ 
 	 * @private Use self::get()
 	 * @param Wiki $wiki
 	 */
-	public function __construct( Wiki $wiki ) {
+	public function __construct ( Wiki $wiki ) {
 		// phpcs:ignore MediaWiki.NamingConventions.ValidGlobalName.allowedPrefix
 		global $globalListTitle;
 		parent::__construct( $globalListTitle, $wiki );
@@ -30,7 +30,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 );
@@ -42,16 +42,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();
 	}
@@ -62,17 +62,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,14 +79,14 @@ 
 	 * @param array $groups
 	 * @return bool
 	 */
-	public static function isOverrideExpired( array $groups ) : bool {
-		if ( !isset( $groups['override'] ) ) {
+	public static function isOverrideExpired ( array $groups ) : bool {
+		if ( !isset( $groups[ 'override' ] ) ) {
 			return false;
 		}
 
 		$flagTS = self::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;
 
 		return time() > $usualTS + $delay && time() > $overrideTS + $delay;
@@ -99,9 +97,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 );
@@ -116,7 +114,7 @@ 
 	 *
 	 * @return array[]
 	 */
-	public function getDecodedContent() : array {
+	public function getDecodedContent () : array {
 		return json_decode( $this->getContent(), true );
 	}
 }

includes/CLI.php

Spacing +12 added lines, -12 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -57,14 +57,14 @@ 
 	/**
 	 * @return bool
 	 */
-	public static function isCLI() : bool {
+	public static function isCLI () : bool {
 		return PHP_SAPI === 'cli';
 	}
 
 	/**
 	 * Populate options and check for required ones
 	 */
-	public function __construct() {
+	public function __construct () {
 		$opts = getopt( self::SHORT_OPTS, self::LONG_OPTS );
 		$this->checkRequiredOpts( $opts );
 		$this->checkConflictingOpts( $opts );
@@ -75,7 +75,7 @@ 
 	/**
 	 * @param array $opts
 	 */
-	private function checkRequiredOpts( array $opts ) : void {
+	private function checkRequiredOpts ( array $opts ) : void {
 		$missingOpts = array_diff( self::REQUIRED_OPTS, array_keys( $opts ) );
 		if ( $missingOpts ) {
 			exit( 'Required options missing: ' . implode( ', ', $missingOpts ) );
@@ -91,7 +91,7 @@ 
 	/**
 	 * @param array $opts
 	 */
-	private function checkConflictingOpts( array $opts ) : void {
+	private function checkConflictingOpts ( array $opts ) : void {
 		$hasPw = array_key_exists( 'password', $opts );
 		$hasPwFile = array_key_exists( 'use-password-file', $opts );
 		if ( $hasPw && $hasPwFile ) {
@@ -108,11 +108,11 @@ 
 	/**
 	 * @param array &$opts
 	 */
-	private function canonicalize( array &$opts ) : void {
+	private function canonicalize ( array &$opts ) : void {
 		if ( array_key_exists( 'use-password-file', $opts ) ) {
 			$pw = trim( file_get_contents( self::PASSWORD_FILE ) );
-			$opts['password'] = $pw;
-			unset( $opts['use-password-file'] );
+			$opts[ 'password' ] = $pw;
+			unset( $opts[ 'use-password-file' ] );
 		}
 	}
 
@@ -121,14 +121,14 @@ 
 	 * @param mixed|null $default
 	 * @return mixed
 	 */
-	public function getOpt( string $opt, $default = null ) {
-		return $this->opts[$opt] ?? $default;
+	public function getOpt ( string $opt, $default = null ) {
+		return $this->opts[ $opt ] ?? $default;
 	}
 
 	/**
 	 * @return array Either [ 'task' => taskname ] or [ 'subtask' => subtaskname ]
 	 */
-	public function getTaskOpt() : array {
+	public function getTaskOpt () : array {
 		return array_intersect_key(
 			$this->opts,
 			[ 'task' => true, 'subtask' => true ]
@@ -138,7 +138,7 @@ 
 	/**
 	 * @return string|null
 	 */
-	public function getURL() : ?string {
+	public function getURL () : ?string {
 		return $this->getOpt( 'force-url' );
 	}
 }