Daimona / BotRiconferme

includes/ContextSource.php

Spacing +6 added lines, -6 removed lines

@@ -16,9 +16,9 @@ 
 	private $controller;
 
 	public function __construct() {
-		$this->setLogger( new Logger );
-		$this->setConfig( Config::getInstance() );
-		$this->setController( new WikiController );
+		$this->setLogger(new Logger);
+		$this->setConfig(Config::getInstance());
+		$this->setController(new WikiController);
 	}
 
 	/**
@@ -31,7 +31,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function setLogger( LoggerInterface $logger ) {
+	public function setLogger(LoggerInterface $logger) {
 		$this->logger = $logger;
 	}
 
@@ -45,7 +45,7 @@ 
 	/**
 	 * @param Config $cfg
 	 */
-	protected function setConfig( Config $cfg ) {
+	protected function setConfig(Config $cfg) {
 		$this->config = $cfg;
 	}
 
@@ -59,7 +59,7 @@ 
 	/**
 	 * @param WikiController $controller
 	 */
-	protected function setController( WikiController $controller ) {
+	protected function setController(WikiController $controller) {
 		$this->controller = $controller;
 	}
 }

includes/TaskDataProvider.php

Spacing +20 added lines, -22 removed lines

@@ -13,20 +13,20 @@ 
 	 * @return 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 );
+		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->users = [];
-			foreach ( $listUsers as $user => $groups ) {
-				$timestamp = $this->getValidTimestamp( $groups );
+			foreach ($listUsers as $user => $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;
+					$this->users[$user] = $groups;
 				}
 			}
 		}
@@ -40,17 +40,15 @@ 
 	 * @param array $groups
 	 * @return int
 	 */
-	private function getValidTimestamp( 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;
+	private function getValidTimestamp(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 = max($bureaucrat, $checkuser);
+		if ($timestamp === 0) {
+			$timestamp = \DateTime::createFromFormat('d/m/Y', $groups['sysop'])->getTimestamp();
 		}
 		return $timestamp;
 	}
@@ -58,8 +56,8 @@ 
 	/**
 	 * @param string $name
 	 */
-	public function removeUser( string $name ) {
-		unset( $this->users[ $name ] );
+	public function removeUser(string $name) {
+		unset($this->users[$name]);
 	}
 
 	/**
@@ -72,7 +70,7 @@ 
 	/**
 	 * @param string $title
 	 */
-	public function addCreatedPages( string $title ) {
+	public function addCreatedPages(string $title) {
 		$this->createdPages[] = $title;
 	}
 }

includes/Request/RequestBase.php

Spacing +50 added lines, -50 removed lines

@@ -32,8 +32,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';
 	}
 
@@ -44,11 +44,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;
 	}
@@ -62,19 +62,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);
 	}
 
 	/**
@@ -83,16 +83,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;
@@ -105,14 +105,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;
 		}
@@ -125,18 +125,18 @@ 
 	 * @param array $params
 	 * @return \stdClass
 	 */
-	private function makeRequestInternal( array $params ) : \stdClass {
-		$url = Config::getInstance()->get( 'url' );
+	private function makeRequestInternal(array $params) : \stdClass {
+		$url = Config::getInstance()->get('url');
 
-		if ( $this->method === 'POST' ) {
+		if ($this->method === 'POST') {
 			$params['maxlag'] = self::MAXLAG;
 		}
-		$params = http_build_query( $params );
+		$params = http_build_query($params);
 
-		$body = $this->reallyMakeRequest( $url, $params );
+		$body = $this->reallyMakeRequest($url, $params);
 
-		$this->setCookies( $this->newCookies );
-		return json_decode( $body );
+		$this->setCookies($this->newCookies);
+		return json_decode($body);
 	}
 
 	/**
@@ -146,16 +146,16 @@ 
 	 * @param string $params
 	 * @return string
 	 */
-	abstract protected function reallyMakeRequest( string $url, string $params ) : string;
+	abstract protected function reallyMakeRequest(string $url, 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;
 		}
 	}
 
@@ -163,9 +163,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;
@@ -173,13 +173,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));
 		}
 	}
 
@@ -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

@@ -11,31 +11,31 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	protected function reallyMakeRequest( string $url, string $params ) : string {
+	protected function reallyMakeRequest(string $url, 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() );
-
-		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_RETURNTRANSFER, true);
+		curl_setopt($curl, CURLOPT_HEADER, true);
+		curl_setopt($curl, CURLOPT_HEADERFUNCTION, [$this, 'headersHandler']);
+		curl_setopt($curl, CURLOPT_HTTPHEADER, $this->getHeaders());
+
+		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;
 	}
@@ -48,12 +48,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 +8 added lines, -8 removed lines

@@ -9,24 +9,24 @@
 	/**
 	 * @inheritDoc
 	 */
-	protected function reallyMakeRequest( string $url, string $params ) : string {
+	protected function reallyMakeRequest(string $url, string $params) : string {
 		$context = [
 			'http' => [
 				'method' => $this->method,
-				'header' => $this->buildHeadersString( $this->getHeaders() )
+				'header' => $this->buildHeadersString($this->getHeaders())
 			]
 		];
-		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/MissingPageException.php

Spacing +3 added lines, -3 removed lines

@@ -6,9 +6,9 @@
 	/**
 	 * @param string|null $title
 	 */
-	public function __construct( string $title = null ) {
-		if ( $title ) {
-			parent::__construct( "The specified page doesn't exist: $title" );
+	public function __construct(string $title = null) {
+		if ($title) {
+			parent::__construct("The specified page doesn't exist: $title");
 		} else {
 			parent::__construct();
 		}

includes/Exception/ProtectedPageException.php

Spacing +3 added lines, -3 removed lines

@@ -6,9 +6,9 @@
 	/**
 	 * @param string|null $title
 	 */
-	public function __construct( string $title = null ) {
-		if ( $title ) {
-			parent::__construct( "The specified page is protected: $title" );
+	public function __construct(string $title = null) {
+		if ($title) {
+			parent::__construct("The specified page is protected: $title");
 		} else {
 			parent::__construct();
 		}

includes/Logger.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,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/Task/UserNotice.php

Spacing +15 added lines, -15 removed lines

@@ -9,39 +9,39 @@
 	 * @inheritDoc
 	 */
 	public function run() : TaskResult {
-		$this->getLogger()->info( 'Starting task UserNotice' );
+		$this->getLogger()->info('Starting task UserNotice');
 
 		$ricNums = [];
-		foreach ( $this->getDataProvider()->getCreatedPages() as $page ) {
-			$bits = explode( '/', $page );
-			$num = intval( array_pop( $bits ) );
-			$ricNums[ array_pop( $bits ) ] = $num;
+		foreach ($this->getDataProvider()->getCreatedPages() as $page) {
+			$bits = explode('/', $page);
+			$num = intval(array_pop($bits));
+			$ricNums[array_pop($bits)] = $num;
 		}
 
-		foreach ( $this->getDataProvider()->getUsersToProcess() as $user => $_ ) {
-			$this->addMsg( $user, $ricNums[ $user ] );
+		foreach ($this->getDataProvider()->getUsersToProcess() as $user => $_) {
+			$this->addMsg($user, $ricNums[$user]);
 		}
 
-		$this->getLogger()->info( 'Task UserNotice completed successfully' );
-		return new TaskResult( self::STATUS_OK );
+		$this->getLogger()->info('Task UserNotice completed successfully');
+		return new TaskResult(self::STATUS_OK);
 	}
 
 	/**
 	 * @param string $user
 	 * @param int $ricNum
 	 */
-	protected function addMsg( string $user, int $ricNum ) {
-		$this->getLogger()->info( "Leaving msg to $user" );
-		$msg = str_replace( '$num', "$ricNum", $this->getConfig()->get( 'user-notice-msg' ) );
+	protected function addMsg(string $user, int $ricNum) {
+		$this->getLogger()->info("Leaving msg to $user");
+		$msg = str_replace('$num', "$ricNum", $this->getConfig()->get('user-notice-msg'));
 
 		$params = [
 			'title' => "User talk:$user",
 			'section' => 'new',
 			'text' => $msg,
-			'sectiontitle' => $this->getConfig()->get( 'user-notice-title' ),
-			'summary' => $this->getConfig()->get( 'user-notice-summary' )
+			'sectiontitle' => $this->getConfig()->get('user-notice-title'),
+			'summary' => $this->getConfig()->get('user-notice-summary')
 		];
 
-		$this->getController()->editPage( $params );
+		$this->getController()->editPage($params);
 	}
 }