Daimona / BotRiconferme

includes/TaskResult.php

Spacing +7 added lines, -7 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -17,7 +17,7 @@ 
 	 * @param int $status One of the Task::STATUS_* constants
 	 * @param string[] $errors
 	 */
-	public function __construct( int $status, array $errors = [] ) {
+	public function __construct(int $status, array $errors = []) {
 		$this->status = $status;
 		$this->errors = $errors;
 	}
@@ -39,25 +39,25 @@ 
 	/**
 	 * @param TaskResult $that
 	 */
-	public function merge( TaskResult $that ) {
+	public function merge(TaskResult $that) {
 		$this->status |= $that->status;
-		$this->errors = array_merge( $this->errors, $that->errors );
+		$this->errors = array_merge($this->errors, $that->errors);
 	}
 
 	/**
 	 * @return string
 	 */
 	public function __toString() {
-		if ( $this->isOK() ) {
+		if ($this->isOK()) {
 			$stat = 'OK';
 			$errs = "\tNo errors.";
 		} else {
 			$stat = 'ERROR';
 			$formattedErrs = [];
-			foreach ( $this->errors as $err ) {
+			foreach ($this->errors as $err) {
 				$formattedErrs[] = "\t - $err";
 			}
-			$errs = implode( "\n", $formattedErrs );
+			$errs = implode("\n", $formattedErrs);
 		}
 		return "=== RESULT ===\n - Status: $stat\n - Errors:\n$errs\n";
 	}

includes/Bot.php

Spacing +12 added lines, -12 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -14,13 +14,13 @@ 
 	 * Entry point for the whole process
 	 */
 	public function run() {
-		$this->logger->info( 'Starting full process.' );
+		$this->logger->info('Starting full process.');
 		$manager = new TaskManager;
-		$res = $manager->run( TaskManager::MODE_COMPLETE );
-		if ( $res->isOK() ) {
-			$this->logger->info( 'Execution completed successfully.' );
+		$res = $manager->run(TaskManager::MODE_COMPLETE);
+		if ($res->isOK()) {
+			$this->logger->info('Execution completed successfully.');
 		} else {
-			$this->logger->error( "Execution failed.\n$res" );
+			$this->logger->error("Execution failed.\n$res");
 		}
 	}
 
@@ -29,14 +29,14 @@ 
 	 *
 	 * @param string $task
 	 */
-	public function runSingle( string $task ) {
-		$this->logger->info( "Starting single task $task." );
+	public function runSingle(string $task) {
+		$this->logger->info("Starting single task $task.");
 		$manager = new TaskManager;
-		$res = $manager->run( TaskManager::MODE_SINGLE, $task );
-		if ( $res->isOK() ) {
-			$this->logger->info( "Execution of $task completed successfully." );
+		$res = $manager->run(TaskManager::MODE_SINGLE, $task);
+		if ($res->isOK()) {
+			$this->logger->info("Execution of $task completed successfully.");
 		} else {
-			$this->logger->error( "Execution of $task failed.\n$res" );
+			$this->logger->error("Execution of $task failed.\n$res");
 		}
 	}
 }

includes/TaskManager.php

Spacing +21 added lines, -21 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -29,7 +29,7 @@ 
 	 * Should only be used for debugging purpose.
 	 */
 	public static function resetLastRunDate() {
-		file_put_contents( self::LOG_FILE, '' );
+		file_put_contents(self::LOG_FILE, '');
 	}
 
 	/**
@@ -37,12 +37,12 @@ 
 	 * @param string|null $taskName Only used in MODE_SINGLE
 	 * @return TaskResult
 	 */
-	public function run( int $mode, string $taskName = null ) : TaskResult {
+	public function run(int $mode, string $taskName = null) : TaskResult {
 		$this->provider = new TaskDataProvider;
-		if ( $mode === self::MODE_COMPLETE ) {
+		if ($mode === self::MODE_COMPLETE) {
 			return $this->runAllTasks();
 		} else {
-			return $this->runTask( $taskName );
+			return $this->runTask($taskName);
 		}
 	}
 
@@ -50,9 +50,9 @@ 
 	 * @return TaskResult
 	 */
 	protected function runAllTasks() : TaskResult {
-		if ( self::getLastFullRunDate() === date( 'd/m/Y' ) ) {
+		if (self::getLastFullRunDate() === date('d/m/Y')) {
 			// Really avoid executing twice the same day
-			return new TaskResult( TaskResult::STATUS_ERROR, [ 'A full run was already executed today.' ] );
+			return new TaskResult(TaskResult::STATUS_ERROR, ['A full run was already executed today.']);
 		}
 
 		// Order matters here
@@ -63,12 +63,12 @@ 
 			'user-notice'
 		];
 
-		$res = new TaskResult( TaskResult::STATUS_OK );
+		$res = new TaskResult(TaskResult::STATUS_OK);
 		do {
-			$res->merge( $this->runTask( current( $list ) ) );
-		} while ( $res->isOK() && next( $list ) );
+			$res->merge($this->runTask(current($list)));
+		} while ($res->isOK() && next($list));
 
-		if ( $res->isOK() ) {
+		if ($res->isOK()) {
 			self::setLastFullRunDate();
 		}
 
@@ -79,8 +79,8 @@ 
 	 * @return string|null d/m/Y or null if no last run registered
 	 */
 	public static function getLastFullRunDate() : ?string {
-		if ( file_exists( self::LOG_FILE ) ) {
-			return file_get_contents( self::LOG_FILE ) ?: null;
+		if (file_exists(self::LOG_FILE)) {
+			return file_get_contents(self::LOG_FILE) ?: null;
 		} else {
 			return null;
 		}
@@ -90,13 +90,13 @@ 
 	 * @param string $task Defined in self::TASKS_MAP
 	 * @return TaskResult
 	 */
-	protected function runTask( string $task ) : TaskResult {
-		if ( !isset( self::TASKS_MAP[ $task ] ) ) {
-			throw new \InvalidArgumentException( "'$task' is not a valid task." );
+	protected function runTask(string $task) : TaskResult {
+		if (!isset(self::TASKS_MAP[$task])) {
+			throw new \InvalidArgumentException("'$task' is not a valid task.");
 		}
 
-		$class = self::TASKS_MAP[ $task ];
-		return $this->getTaskInstance( $class )->run();
+		$class = self::TASKS_MAP[$task];
+		return $this->getTaskInstance($class)->run();
 	}
 
 	/**
@@ -105,11 +105,11 @@ 
 	 * @param string $class
 	 * @return Task
 	 */
-	private function getTaskInstance( string $class ) : Task {
-		return new $class( $this->provider );
+	private function getTaskInstance(string $class) : Task {
+		return new $class($this->provider);
 	}
 
 	public static function setLastFullRunDate() {
-		file_put_contents( self::LOG_FILE, date( 'd/m/Y' ) );
+		file_put_contents(self::LOG_FILE, date('d/m/Y'));
 	}
 }

run.php

Spacing +20 added lines, -20 removed lines

@@ -1,12 +1,12 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 require __DIR__ . '/vendor/autoload.php';
 
 use BotRiconferme\Config;
 use BotRiconferme\Bot;
 
-if ( PHP_SAPI !== 'cli' ) {
-	exit( 'CLI only!' );
+if (PHP_SAPI !== 'cli') {
+	exit('CLI only!');
 }
 
 /** MAIN PARAMS */
@@ -27,9 +27,9 @@ 
 	'config-title:'
 ];
 
-$vals = getopt( '', $params );
-if ( count( $vals ) !== count( $params ) ) {
-	exit( 'Not enough params!' );
+$vals = getopt('', $params);
+if (count($vals) !== count($params)) {
+	exit('Not enough params!');
 }
 
 /* PASSWORD */
@@ -42,38 +42,38 @@ 
  * --use-password-file
  * which will look for a $PWFILE file in the current directory containing only the plain password
  */
-$pwParams = getopt( '', [
+$pwParams = getopt('', [
 	'password:',
 	'use-password-file'
-] );
+]);
 
-if ( isset( $pwParams[ 'password' ] ) ) {
-	$pw = $pwParams[ 'password' ];
-} elseif ( isset( $pwParams[ 'use-password-file' ] ) ) {
-	if ( file_exists( $PWFILE ) ) {
-		$pw = trim( file_get_contents( $PWFILE ) );
+if (isset($pwParams['password'])) {
+	$pw = $pwParams['password'];
+} elseif (isset($pwParams['use-password-file'])) {
+	if (file_exists($PWFILE)) {
+		$pw = trim(file_get_contents($PWFILE));
 	} else {
-		exit( 'Please create a password.txt file to use with use-password-file' );
+		exit('Please create a password.txt file to use with use-password-file');
 	}
 } else {
-	exit( 'Please provide a password or use a password file' );
+	exit('Please provide a password or use a password file');
 }
 
-$vals[ 'password' ] = $pw;
+$vals['password'] = $pw;
 
 /* START */
 
-Config::init( $vals );
+Config::init($vals);
 
 $bot = new Bot();
 
 /*
  * E.g. --task=update-list
  */
-$taskOpts = getopt( '', [ 'task:' ] );
+$taskOpts = getopt('', ['task:']);
 
-if ( $taskOpts ) {
-	$bot->runSingle( $taskOpts[ 'task' ] );
+if ($taskOpts) {
+	$bot->runSingle($taskOpts['task']);
 } else {
 	$bot->run();
 }

includes/Request/RequestBase.php

Spacing +50 added lines, -50 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -35,8 +35,8 @@ 
 	 * @param array $params
 	 * @param bool $isPOST
 	 */
-	protected function __construct( array $params, bool $isPOST = false ) {
-		$this->params = [ 'format' => 'json' ] + $params;
+	protected function __construct(array $params, bool $isPOST = false) {
+		$this->params = ['format' => 'json'] + $params;
 		$this->method = $isPOST ? 'POST' : 'GET';
 	}
 
@@ -47,11 +47,11 @@ 
 	 * @param bool $isPOST
 	 * @return self
 	 */
-	public static function newFromParams( array $params, bool $isPOST = false ) : self {
-		if ( extension_loaded( 'curl' ) ) {
-			$ret = new CurlRequest( $params, $isPOST );
+	public static function newFromParams(array $params, bool $isPOST = false) : self {
+		if (extension_loaded('curl')) {
+			$ret = new CurlRequest($params, $isPOST);
 		} else {
-			$ret = new NativeRequest( $params, $isPOST );
+			$ret = new NativeRequest($params, $isPOST);
 		}
 		return $ret;
 	}
@@ -65,19 +65,19 @@ 
 		$curParams = $this->params;
 		$sets = [];
 		do {
-			$res = $this->makeRequestInternal( $curParams );
+			$res = $this->makeRequestInternal($curParams);
 
-			$this->handleErrorAndWarnings( $res );
+			$this->handleErrorAndWarnings($res);
 			$sets[] = $res;
 
 			$finished = true;
-			if ( isset( $res->continue ) ) {
-				$curParams = array_merge( $curParams, get_object_vars( $res->continue ) );
+			if (isset($res->continue)) {
+				$curParams = array_merge($curParams, get_object_vars($res->continue));
 				$finished = false;
 			}
-		} while ( !$finished );
+		} while (!$finished);
 
-		return $this->mergeSets( $sets );
+		return $this->mergeSets($sets);
 	}
 
 	/**
@@ -86,16 +86,16 @@ 
 	 * @param array $params
 	 * @return \stdClass
 	 */
-	private function makeRequestInternal( array $params ) : \stdClass {
-		if ( $this->method === 'POST' ) {
+	private function makeRequestInternal(array $params) : \stdClass {
+		if ($this->method === 'POST') {
 			$params['maxlag'] = self::MAXLAG;
 		}
-		$params = http_build_query( $params );
+		$params = http_build_query($params);
 
-		$body = $this->reallyMakeRequest( $params );
+		$body = $this->reallyMakeRequest($params);
 
-		$this->setCookies( $this->newCookies );
-		return json_decode( $body );
+		$this->setCookies($this->newCookies);
+		return json_decode($body);
 	}
 
 	/**
@@ -104,16 +104,16 @@ 
 	 * @param string $params
 	 * @return string
 	 */
-	abstract protected function reallyMakeRequest( string $params ) : string;
+	abstract protected function reallyMakeRequest(string $params) : string;
 
 	/**
 	 * @param array $cookies
 	 */
-	protected function setCookies( array $cookies ) {
-		foreach ( $cookies as $cookie ) {
-			$bits = explode( ';', $cookie );
-			list( $name, $value ) = explode( '=', $bits[0] );
-			self::$cookiesToSet[ $name ] = $value;
+	protected function setCookies(array $cookies) {
+		foreach ($cookies as $cookie) {
+			$bits = explode(';', $cookie);
+			list($name, $value) = explode('=', $bits[0]);
+			self::$cookiesToSet[$name] = $value;
 		}
 	}
 
@@ -121,9 +121,9 @@ 
 	 * @param \stdClass $res
 	 * @throws APIRequestException
 	 */
-	protected function handleErrorAndWarnings( $res ) {
-		if ( isset( $res->error ) ) {
-			switch ( $res->error->code ) {
+	protected function handleErrorAndWarnings($res) {
+		if (isset($res->error)) {
+			switch ($res->error->code) {
 				case 'missingtitle':
 					$ex = new MissingPageException;
 					break;
@@ -131,13 +131,13 @@ 
 					$ex = new ProtectedPageException;
 					break;
 				default:
-					$ex = new APIRequestException( $res->error->code . ' - ' . $res->error->info );
+					$ex = new APIRequestException($res->error->code . ' - ' . $res->error->info);
 			}
 			throw $ex;
-		} elseif ( isset( $res->warnings ) ) {
-			$act = $this->params[ 'action' ];
+		} elseif (isset($res->warnings)) {
+			$act = $this->params['action'];
 			$warning = $res->warnings->$act;
-			throw new APIRequestException( reset( $warning ) );
+			throw new APIRequestException(reset($warning));
 		}
 	}
 
@@ -147,16 +147,16 @@ 
 	 * @param \stdClass[] $sets
 	 * @return array
 	 */
-	private function mergeSets( array $sets ) : array {
-		$sets = $this->objectToArray( $sets );
+	private function mergeSets(array $sets) : array {
+		$sets = $this->objectToArray($sets);
 		// Use the first set as template
-		$ret = array_shift( $sets );
+		$ret = array_shift($sets);
 		$act = $this->params['action'];
 
-		foreach ( $sets as $set ) {
+		foreach ($sets as $set) {
 			$ret[$act] = array_merge_recursive(
-				$this->objectToArray( $ret[$act] ),
-				$this->objectToArray( $set[$act] )
+				$this->objectToArray($ret[$act]),
+				$this->objectToArray($set[$act])
 			);
 		}
 		return $ret;
@@ -169,14 +169,14 @@ 
 	 * @param \stdClass|array $objOrArray
 	 * @return array
 	 */
-	private function objectToArray( $objOrArray ) : array {
+	private function objectToArray($objOrArray) : array {
 		$array = [];
-		if ( is_object( $objOrArray ) ) {
-			$objOrArray = get_object_vars( $objOrArray );
+		if (is_object($objOrArray)) {
+			$objOrArray = get_object_vars($objOrArray);
 		}
-		foreach ( $objOrArray as $key => $value ) {
-			if ( is_object( $value ) || is_array( $value ) ) {
-				$value = $this->objectToArray( $value );
+		foreach ($objOrArray as $key => $value) {
+			if (is_object($value) || is_array($value)) {
+				$value = $this->objectToArray($value);
 			}
 			$array[$key] = $value;
 		}
@@ -188,12 +188,12 @@ 
 	 */
 	protected function getHeaders() :array {
 		$ret = self::HEADERS;
-		if ( self::$cookiesToSet ) {
+		if (self::$cookiesToSet) {
 			$cookies = [];
-			foreach ( self::$cookiesToSet as $cname => $cval ) {
-				$cookies[] = trim( "$cname=$cval" );
+			foreach (self::$cookiesToSet as $cname => $cval) {
+				$cookies[] = trim("$cname=$cval");
 			}
-			$ret[] = 'Cookie: ' . implode( '; ', $cookies );
+			$ret[] = 'Cookie: ' . implode('; ', $cookies);
 		}
 		return $ret;
 	}
@@ -202,9 +202,9 @@ 
 	 * @param array $headers
 	 * @return string
 	 */
-	protected function buildHeadersString( array $headers ) : string {
+	protected function buildHeadersString(array $headers) : string {
 		$ret = '';
-		foreach ( $headers as $header ) {
+		foreach ($headers as $header) {
 			$ret .= "$header\r\n";
 		}
 		return $ret;

includes/Request/CurlRequest.php

Spacing +21 added lines, -21 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -11,32 +11,32 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	protected function reallyMakeRequest( string $params ) : string {
+	protected function reallyMakeRequest(string $params) : string {
 		$curl = curl_init();
-		curl_setopt( $curl, CURLOPT_RETURNTRANSFER, true );
-		curl_setopt( $curl, CURLOPT_HEADER, true );
-		curl_setopt( $curl, CURLOPT_HEADERFUNCTION, [ $this, 'headersHandler' ] );
-		curl_setopt( $curl, CURLOPT_HTTPHEADER, $this->getHeaders() );
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($curl, CURLOPT_HEADER, true);
+		curl_setopt($curl, CURLOPT_HEADERFUNCTION, [$this, 'headersHandler']);
+		curl_setopt($curl, CURLOPT_HTTPHEADER, $this->getHeaders());
 
 		$url = self::$url;
-		if ( $this->method === 'POST' ) {
-			curl_setopt( $curl, CURLOPT_URL, $url );
-			curl_setopt( $curl, CURLOPT_POST, true );
-			curl_setopt( $curl, CURLOPT_POSTFIELDS, $params );
+		if ($this->method === 'POST') {
+			curl_setopt($curl, CURLOPT_URL, $url);
+			curl_setopt($curl, CURLOPT_POST, true);
+			curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
 		} else {
-			curl_setopt( $curl, CURLOPT_URL, "$url?$params" );
+			curl_setopt($curl, CURLOPT_URL, "$url?$params");
 		}
 
-		$result = curl_exec( $curl );
+		$result = curl_exec($curl);
 
-		if ( $result === false ) {
-			throw new APIRequestException( curl_error( $curl ) );
+		if ($result === false) {
+			throw new APIRequestException(curl_error($curl));
 		}
 
 		// Extract response body
-		$headerSize = curl_getinfo( $curl, CURLINFO_HEADER_SIZE );
-		$body = substr( $result, $headerSize );
-		curl_close( $curl );
+		$headerSize = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
+		$body = substr($result, $headerSize);
+		curl_close($curl);
 
 		return $body;
 	}
@@ -49,12 +49,12 @@ 
 	 * @return int
 	 * @internal Only used as CB for cURL
 	 */
-	public function headersHandler( $ch, string $header ) : int {
-		$bits = explode( ':', $header, 2 );
-		if ( trim( $bits[0] ) === 'Set-Cookie' ) {
+	public function headersHandler($ch, string $header) : int {
+		$bits = explode(':', $header, 2);
+		if (trim($bits[0]) === 'Set-Cookie') {
 			$this->newCookies[] = $bits[1];
 		}
 		// @phan-suppress-next-line PhanTypeMismatchReturn WTF? Why does phan thinks this is a string?
-		return strlen( $header );
+		return strlen($header);
 	}
 }

includes/Request/NativeRequest.php

Spacing +9 added lines, -9 removed lines

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

includes/Exception/APIRequestException.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Exception;
 

includes/Exception/ConfigException.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Exception;