Daimona / BotRiconferme

includes/Exception/TaskException.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/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;
 

includes/Exception/LoginException.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/Logger.php

Spacing +3 added lines, -3 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -11,7 +11,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function log( $level, $message, array $context = [] ) {
-		error_log( "$level - $message" );
+	public function log ( $level, $message, array $context = [ ] ) {
+		error_log ( "$level - $message" );
 	}
 }

includes/TaskDataProvider.php

Spacing +19 added lines, -21 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme;
 
@@ -10,26 +10,26 @@ 
 	private $users;
 
 	/** @var string[] */
-	private $createdPages = [];
+	private $createdPages = [ ];
 
 	/**
 	 * Get a list of users to execute tasks on.
 	 *
 	 * @return array[]
 	 */
-	public function getUsersToProcess() : array {
+	public function getUsersToProcess () : array {
 		if ( $this->users === null ) {
-			$this->getLogger()->debug( 'Retrieving users list' );
-			$content = $this->getController()->getPageContent( $this->getConfig()->get( 'list-title' ) );
-			$listUsers = json_decode( $content, true );
+			$this->getLogger ()->debug ( 'Retrieving users list' );
+			$content = $this->getController ()->getPageContent ( $this->getConfig ()->get ( 'list-title' ) );
+			$listUsers = json_decode ( $content, true );
 
-			$this->users = [];
+			$this->users = [ ];
 			foreach ( $listUsers as $user => $groups ) {
-				$timestamp = $this->getValidTimestamp( $groups );
+				$timestamp = $this->getValidTimestamp ( $groups );
 
-				if ( date( 'd/m', $timestamp ) === date( 'd/m' ) &&
+				if ( date ( 'd/m', $timestamp ) === date ( 'd/m' ) &&
 					// Don't trigger if the date is actually today
-					date( 'd/m/Y', $timestamp ) !== date( 'd/m/Y' )
+					date ( 'd/m/Y', $timestamp ) !== date ( 'd/m/Y' )
 				) {
 					$this->users[ $user ] = $groups;
 				}
@@ -45,17 +45,15 @@ 
 	 * @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 );
+		$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;
 	}
@@ -65,21 +63,21 @@ 
 	 *
 	 * @param string $name
 	 */
-	public function removeUser( string $name ) {
+	public function removeUser ( string $name ) {
 		unset( $this->users[ $name ] );
 	}
 
 	/**
 	 * @return string[]
 	 */
-	public function getCreatedPages() : array {
+	public function getCreatedPages () : array {
 		return $this->createdPages;
 	}
 
 	/**
 	 * @param string $title
 	 */
-	public function addCreatedPages( string $title ) {
-		$this->createdPages[] = $title;
+	public function addCreatedPages ( string $title ) {
+		$this->createdPages[ ] = $title;
 	}
 }

includes/Request/RequestBase.php

Spacing +46 added lines, -46 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -29,7 +29,7 @@ 
 	/** @var string */
 	protected $method;
 	/** @var string[] */
-	protected $newCookies = [];
+	protected $newCookies = [ ];
 
 	/**
 	 * Use self::newFromParams, which will provide the right class to use
@@ -37,7 +37,7 @@ 
 	 * @param array $params
 	 * @param bool $isPOST
 	 */
-	protected function __construct( array $params, bool $isPOST = false ) {
+	protected function __construct ( array $params, bool $isPOST = false ) {
 		$this->params = [ 'format' => 'json' ] + $params;
 		$this->method = $isPOST ? 'POST' : 'GET';
 	}
@@ -49,11 +49,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;
 	}
@@ -63,23 +63,23 @@ 
 	 *
 	 * @return array
 	 */
-	public function execute() : array {
+	public function execute () : array {
 		$curParams = $this->params;
-		$sets = [];
+		$sets = [ ];
 		do {
-			$res = $this->makeRequestInternal( $curParams );
+			$res = $this->makeRequestInternal ( $curParams );
 
-			$this->handleErrorAndWarnings( $res );
-			$sets[] = $res;
+			$this->handleErrorAndWarnings ( $res );
+			$sets[ ] = $res;
 
 			$finished = true;
 			if ( isset( $res->continue ) ) {
-				$curParams = array_merge( $curParams, get_object_vars( $res->continue ) );
+				$curParams = array_merge ( $curParams, get_object_vars ( $res->continue ) );
 				$finished = false;
 			}
 		} while ( !$finished );
 
-		return $this->mergeSets( $sets );
+		return $this->mergeSets ( $sets );
 	}
 
 	/**
@@ -88,16 +88,16 @@ 
 	 * @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 );
+		$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 );
 	}
 
 	/**
@@ -106,17 +106,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] );
+			$bits = explode ( ';', $cookie );
+			list( $name, $value ) = explode ( '=', $bits[ 0 ] );
 			self::$cookiesToSet[ $name ] = $value;
 		}
 	}
@@ -127,7 +127,7 @@ 
 	 * @param \stdClass $res
 	 * @throws APIRequestException
 	 */
-	protected function handleErrorAndWarnings( $res ) {
+	protected function handleErrorAndWarnings ( $res ) {
 		if ( isset( $res->error ) ) {
 			switch ( $res->error->code ) {
 				case 'missingtitle':
@@ -137,13 +137,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' ];
 			$warning = $res->warnings->$act;
-			throw new APIRequestException( reset( $warning ) );
+			throw new APIRequestException ( reset ( $warning ) );
 		}
 	}
 
@@ -153,16 +153,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 );
-		$act = $this->params['action'];
+		$ret = array_shift ( $sets );
+		$act = $this->params[ 'action' ];
 
 		foreach ( $sets as $set ) {
-			$ret[$act] = array_merge_recursive(
-				$this->objectToArray( $ret[$act] ),
-				$this->objectToArray( $set[$act] )
+			$ret[ $act ] = array_merge_recursive (
+				$this->objectToArray ( $ret[ $act ] ),
+				$this->objectToArray ( $set[ $act ] )
 			);
 		}
 		return $ret;
@@ -175,16 +175,16 @@ 
 	 * @param \stdClass|array $objOrArray
 	 * @return array
 	 */
-	private function objectToArray( $objOrArray ) : array {
-		$array = [];
-		if ( is_object( $objOrArray ) ) {
-			$objOrArray = get_object_vars( $objOrArray );
+	private function objectToArray ( $objOrArray ) : array {
+		$array = [ ];
+		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 );
+			if ( is_object ( $value ) || is_array ( $value ) ) {
+				$value = $this->objectToArray ( $value );
 			}
-			$array[$key] = $value;
+			$array[ $key ] = $value;
 		}
 		return $array;
 	}
@@ -194,14 +194,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;
 	}
@@ -212,7 +212,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 +9 added lines, -9 removed lines

@@ -1,4 +1,4 @@ 
-<?php declare( strict_types=1 );
+<?php declare(strict_types=1);
 
 namespace BotRiconferme\Request;
 
@@ -9,26 +9,26 @@ 
 	/**
 	 * @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' ) {
-			$context['http']['content'] = $params;
+			$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' ) {
-				$this->newCookies[] = $bits[1];
+			$bits = explode ( ':', $header, 2 );
+			if ( trim ( $bits[ 0 ] ) === 'Set-Cookie' ) {
+				$this->newCookies[ ] = $bits[ 1 ];
 			}
 		}
 

includes/Request/CurlRequest.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;
 
@@ -11,36 +11,36 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	protected function reallyMakeRequest( string $params ) : string {
-		$curl = curl_init();
+	protected function reallyMakeRequest ( string $params ) : string {
+		$curl = curl_init ();
 		if ( $curl === false ) {
-			throw new APIRequestException( 'Cannot open cURL handler.' );
+			throw new APIRequestException ( 'Cannot open cURL handler.' );
 		}
-		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 );
+			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 ) );
+			throw new APIRequestException ( curl_error ( $curl ) );
 		}
 
 		// Extract response body
-		$headerSize = curl_getinfo( $curl, CURLINFO_HEADER_SIZE );
+		$headerSize = curl_getinfo ( $curl, CURLINFO_HEADER_SIZE );
 		/** @var string $result Because RETURNTRANSFER is set */
-		$body = substr( $result, $headerSize );
-		curl_close( $curl );
+		$body = substr ( $result, $headerSize );
+		curl_close ( $curl );
 
 		return $body;
 	}
@@ -53,12 +53,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' ) {
-			$this->newCookies[] = $bits[1];
+	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 );
 	}
 }