Daimona / BotRiconferme

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->checkRequired( $opts );
 		$this->canonicalize( $opts );
@@ -74,7 +74,7 @@ 
 	/**
 	 * @param array $opts
 	 */
-	private function checkRequired( array $opts ) {
+	private function checkRequired ( array $opts ) {
 		foreach ( self::REQUIRED_OPTS as $opt ) {
 			if ( !array_key_exists( $opt, $opts ) ) {
 				exit( "Required option $opt missing." );
@@ -99,11 +99,11 @@ 
 	/**
 	 * @param array &$opts
 	 */
-	private function canonicalize( array &$opts ) {
+	private function canonicalize ( array &$opts ) {
 		if ( array_key_exists( 'use-password-file', $opts ) ) {
 			$pw = file_get_contents( self::PASSWORD_FILE );
-			$opts['password'] = $pw;
-			unset( $opts['use-password-file'] );
+			$opts[ 'password' ] = $pw;
+			unset( $opts[ 'use-password-file' ] );
 		}
 	}
 
@@ -111,7 +111,7 @@ 
 	 * These are the options required by Config.
 	 * @return array
 	 */
-	public function getMainOpts() : array {
+	public function getMainOpts () : array {
 		return array_intersect_key(
 			$this->opts,
 			array_fill_keys( Config::REQUIRED_OPTS, true )
@@ -123,14 +123,14 @@ 
 	 * @param mixed $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 ]
@@ -140,7 +140,7 @@ 
 	/**
 	 * @return string|null
 	 */
-	public function getURL() : ?string {
+	public function getURL () : ?string {
 		return $this->getOpt( 'force-url' );
 	}
 }

run.php

Spacing +3 added lines, -3 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 /**
  * Entry point for the bot, called by CLI
  */
@@ -54,9 +54,9 @@ 
 $type = current( array_keys( $taskOpt ) );
 try {
 	if ( $type === 'task' ) {
-		$bot->runTask( $taskOpt['task'] );
+		$bot->runTask( $taskOpt[ 'task' ] );
 	} elseif ( $type === 'subtask' ) {
-		$bot->runSubtask( $taskOpt['subtask'] );
+		$bot->runSubtask( $taskOpt[ 'subtask' ] );
 	} else {
 		$bot->runAll();
 	}