nextcloud / twofactor_gateway

lib/Service/SetupService.php

Spacing +3 added lines, -3 removed lines

@@ -60,13 +60,13 @@
 		$gateway = $this->gatewayFactory->get($gatewayName);
 		try {
 			$message = match ($gateway->getSettings()->allow_markdown ?? false) {
-				true => $this->l10n->t('`%s` is your verification code.', [$verificationNumber]),
-				default => $this->l10n->t('%s is your verification code.', [$verificationNumber]),
+				true => $this->l10n->t('`%s` is your verification code.', [ $verificationNumber ]),
+				default => $this->l10n->t('%s is your verification code.', [ $verificationNumber ]),
 			};
 			$gateway->send(
 				$identifier,
 				$message,
-				['code' => $verificationNumber],
+				[ 'code' => $verificationNumber ],
 			);
 		} catch (MessageTransmissionException $ex) {
 			throw new VerificationException($ex->getMessage(), $ex->getCode(), $ex);

lib/Command/Status.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 		parent::__construct('twofactorauth:gateway:status');
 	}
 
-	#[\Override]
+	#[\Override ]
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$fqcn = $this->gatewayFactory->getFqcnList();
 		foreach ($fqcn as $fqcn) {
@@ -30,7 +30,7 @@ 
 			$gateway = $this->gatewayFactory->get($fqcn);
 			$isConfigured = $gateway->isComplete();
 			$settings = $gateway->getSettings();
-			$output->writeln($settings->name . ': ' . ($isConfigured ? 'configured' : 'not configured'));
+			$output->writeln($settings->name.': '.($isConfigured ? 'configured' : 'not configured'));
 		}
 		return 0;
 	}

lib/Provider/Settings.php

Spacing +2 added lines, -2 removed lines

@@ -22,11 +22,11 @@
 		 *
 		 * @var FieldDefinition[]
 		 */
-		public array $fields = [],
+		public array $fields = [ ],
 	) {
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function jsonSerialize(): mixed {
 		return [
 			'name' => $this->name,

lib/Provider/Channel/Signal/Gateway.php

Spacing +19 added lines, -19 removed lines

@@ -42,7 +42,7 @@ 
 		parent::__construct($appConfig);
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function createSettings(): Settings {
 		return new Settings(
 			name: 'Signal',
@@ -61,20 +61,20 @@ 
 		);
 	}
 
-	#[\Override]
-	public function send(string $identifier, string $message, array $extra = []): void {
+	#[\Override ]
+	public function send(string $identifier, string $message, array $extra = [ ]): void {
 		$client = $this->clientService->newClient();
 		// determine type of gateway
 
 		// test for native signal-cli JSON RPC.
 		$response = $client->post(
-			$this->getUrl() . '/api/v1/rpc',
+			$this->getUrl().'/api/v1/rpc',
 			[
 				'http_errors' => false,
 				'json' => [
 					'jsonrpc' => '2.0',
 					'method' => 'version',
-					'id' => 'version_' . $this->timeFactory->getTime(),
+					'id' => 'version_'.$this->timeFactory->getTime(),
 				],
 			]);
 		if ($response->getStatusCode() === 200 || $response->getStatusCode() === 201) {
@@ -90,12 +90,12 @@ 
 				'account' => $this->getAccount(), // mandatory for native RPC API
 			];
 			$response = $response = $client->post(
-				$this->getUrl() . '/api/v1/rpc',
+				$this->getUrl().'/api/v1/rpc',
 				[
 					'json' => [
 						'jsonrpc' => '2.0',
 						'method' => 'send',
-						'id' => 'code_' . $this->timeFactory->getTime(),
+						'id' => 'code_'.$this->timeFactory->getTime(),
 						'params' => $params,
 					],
 				]);
@@ -103,12 +103,12 @@ 
 			$json = json_decode($body, true);
 			$statusCode = $response->getStatusCode();
 			// The 201 "created" is probably a bug.
-			if ($statusCode < 200 || $statusCode >= 300 || is_null($json) || !is_array($json) || ($json['jsonrpc'] ?? null) != '2.0' || !isset($json['result']['timestamp'])) {
+			if ($statusCode < 200 || $statusCode >= 300 || is_null($json) || !is_array($json) || ($json[ 'jsonrpc' ] ?? null) != '2.0' || !isset($json[ 'result' ][ 'timestamp' ])) {
 				throw new MessageTransmissionException("error reported by Signal gateway, status=$statusCode, body=$body}");
 			}
 		} else {
 			// Try gateway in the style of https://gitlab.com/morph027/signal-cli-dbus-rest-api
-			$response = $client->get($this->getUrl() . '/v1/about');
+			$response = $client->get($this->getUrl().'/v1/about');
 			if ($response->getStatusCode() === 200) {
 				// Not so "ńew style" gateway, see
 				// https://gitlab.com/morph027/signal-cli-dbus-rest-api
@@ -116,7 +116,7 @@ 
 				// https://github.com/bbernhard/signal-cli-rest-api
 				$body = $response->getBody();
 				$json = json_decode($body, true);
-				$versions = $json['versions'] ?? [];
+				$versions = $json[ 'versions' ] ?? [ ];
 				if (is_array($versions) && in_array('v2', $versions)) {
 					$json = [
 						'recipients' => $identifier,
@@ -124,17 +124,17 @@ 
 					];
 					$account = $this->getAccount();
 					if ($account != self::ACCOUNT_UNNECESSARY) {
-						$json['account'] = $account;
+						$json[ 'account' ] = $account;
 					}
 					$response = $client->post(
-						$this->getUrl() . '/v2/send',
+						$this->getUrl().'/v2/send',
 						[
 							'json' => $json,
 						]
 					);
 				} else {
 					$response = $client->post(
-						$this->getUrl() . '/v1/send/' . $identifier,
+						$this->getUrl().'/v1/send/'.$identifier,
 						[
 							'json' => [ 'message' => $message ],
 						]
@@ -143,13 +143,13 @@ 
 				$body = (string)$response->getBody();
 				$json = json_decode($body, true);
 				$status = $response->getStatusCode();
-				if ($status !== 201 || is_null($json) || !is_array($json) || !isset($json['timestamp'])) {
+				if ($status !== 201 || is_null($json) || !is_array($json) || !isset($json[ 'timestamp' ])) {
 					throw new MessageTransmissionException("error reported by Signal gateway, status=$status, body=$body}");
 				}
 			} else {
 				// Try old deprecated gateway https://gitlab.com/morph027/signal-web-gateway
 				$response = $client->post(
-					$this->getUrl() . '/v1/send/' . $identifier,
+					$this->getUrl().'/v1/send/'.$identifier,
 					[
 						'body' => [
 							'to' => $identifier,
@@ -162,24 +162,24 @@ 
 				$json = json_decode($body, true);
 
 				$status = $response->getStatusCode();
-				if ($status !== 200 || is_null($json) || !is_array($json) || !isset($json['success']) || $json['success'] !== true) {
+				if ($status !== 200 || is_null($json) || !is_array($json) || !isset($json[ 'success' ]) || $json[ 'success' ] !== true) {
 					throw new MessageTransmissionException("error reported by Signal gateway, status=$status, body=$body}");
 				}
 			}
 		}
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function cliConfigure(InputInterface $input, OutputInterface $output): int {
 		$settings = $this->getSettings();
 		$helper = new QuestionHelper();
-		$urlQuestion = new Question($settings->fields[0]->prompt, $settings->fields[0]->default);
+		$urlQuestion = new Question($settings->fields[ 0 ]->prompt, $settings->fields[ 0 ]->default);
 		$url = $helper->ask($input, $output, $urlQuestion);
 		$output->writeln("Using $url.");
 
 		$this->setUrl($url);
 
-		$accountQuestion = new Question($settings->fields[1]->prompt, $settings->fields[1]->default);
+		$accountQuestion = new Question($settings->fields[ 1 ]->prompt, $settings->fields[ 1 ]->default);
 		$account = $helper->ask($input, $output, $accountQuestion);
 		if ($account == '') {
 			$account = self::ACCOUNT_UNNECESSARY;

lib/Provider/Channel/WhatsApp/Gateway.php

Spacing +27 added lines, -27 removed lines

@@ -51,7 +51,7 @@ 
 		$this->client = $this->clientService->newClient();
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function createSettings(): Settings {
 		return new Settings(
 			name: 'WhatsApp',
@@ -65,24 +65,24 @@ 
 		);
 	}
 
-	#[\Override]
-	public function send(string $identifier, string $message, array $extra = []): void {
+	#[\Override ]
+	public function send(string $identifier, string $message, array $extra = [ ]): void {
 		$this->logger->debug("sending whatsapp message to $identifier, message: $message");
 
 		$response = $this->getSessionStatus();
 		if ($response !== 'CONNECTED') {
-			throw new MessageTransmissionException('WhatsApp session is not connected. Current status: ' . $response);
+			throw new MessageTransmissionException('WhatsApp session is not connected. Current status: '.$response);
 		}
 
 		$chatId = $this->getChatIdFromPhoneNumber($identifier);
 
 		try {
-			$response = $this->client->post($this->getBaseUrl() . '/client/sendMessage/' . $this->instanceId, [
+			$response = $this->client->post($this->getBaseUrl().'/client/sendMessage/'.$this->instanceId, [
 				'json' => [
 					'chatId' => $chatId,
 					'contentType' => 'string',
 					'content' => $message,
-					'options' => [],
+					'options' => [ ],
 				],
 			]);
 		} catch (\Exception $e) {
@@ -96,10 +96,10 @@ 
 		$this->logger->debug("whatsapp message to chat $identifier sent");
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function cliConfigure(InputInterface $input, OutputInterface $output): int {
 		$helper = new QuestionHelper();
-		$baseUrlQuestion = new Question($this->getSettings()->fields[0]->prompt . ' ');
+		$baseUrlQuestion = new Question($this->getSettings()->fields[ 0 ]->prompt.' ');
 		$this->lazyBaseUrl = $helper->ask($input, $output, $baseUrlQuestion);
 		$this->lazyBaseUrl = rtrim($this->lazyBaseUrl, '/');
 
@@ -108,7 +108,7 @@ 
 				return 1;
 			}
 		} catch (\Exception $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
+			$output->writeln('<error>'.$e->getMessage().'</error>');
 		}
 
 		$this->setBaseUrl($this->lazyBaseUrl);
@@ -118,23 +118,23 @@ 
 
 	private function getChatIdFromPhoneNumber(string $phoneNumber): string {
 		try {
-			$response = $this->client->post($this->getBaseUrl() . '/client/getNumberId/' . $this->instanceId, [
+			$response = $this->client->post($this->getBaseUrl().'/client/getNumberId/'.$this->instanceId, [
 				'json' => [
 					'number' => preg_replace('/\D/', '', $phoneNumber),
 				],
 			]);
 			$json = $response->getBody();
 			$data = json_decode($json, true);
-			if (empty($data['result'])) {
+			if (empty($data[ 'result' ])) {
 				throw new MessageTransmissionException('The phone number is not registered on WhatsApp.');
 			}
-			return $data['result']['_serialized'];
+			return $data[ 'result' ][ '_serialized' ];
 		} catch (ServerException $e) {
 			$content = $e->getResponse()?->getBody()?->getContents();
 			if ($content === null) {
 				throw new MessageTransmissionException('Unknown error');
 			}
-			$errorMessage = json_decode($content, true)['error'] ?? 'Unknown error';
+			$errorMessage = json_decode($content, true)[ 'error' ] ?? 'Unknown error';
 			throw new MessageTransmissionException($errorMessage);
 		}
 	}
@@ -148,7 +148,7 @@ 
 		}
 
 		/** @var string */
-		$this->lazyBaseUrl = $this->__call(__FUNCTION__, []);
+		$this->lazyBaseUrl = $this->__call(__FUNCTION__, [ ]);
 		return $this->lazyBaseUrl;
 	}
 
@@ -164,19 +164,19 @@ 
 
 		$last = null;
 		while (true) {
-			$response = $this->client->get($this->getBaseUrl() . '/session/qr/' . $this->instanceId);
+			$response = $this->client->get($this->getBaseUrl().'/session/qr/'.$this->instanceId);
 			$json = $response->getBody();
 			$data = json_decode($json, true);
-			if ($data['success'] === false) {
-				if ($data['message'] === 'qr code not ready or already scanned') {
+			if ($data[ 'success' ] === false) {
+				if ($data[ 'message' ] === 'qr code not ready or already scanned') {
 					$output->writeln('<error>Session not connected yet, waiting...</error>');
 					sleep(2);
 					continue;
 				}
-				$output->writeln('<error>' . $data['message'] . '</error>');
+				$output->writeln('<error>'.$data[ 'message' ].'</error>');
 				return 1;
 			}
-			$qrCodeContent = $data['qr'];
+			$qrCodeContent = $data[ 'qr' ];
 
 			if ($qrCodeContent !== $last) {
 				$last = $qrCodeContent;
@@ -198,7 +198,7 @@ 
 	}
 
 	private function getSessionStatus(): string {
-		$endpoint = $this->getBaseUrl() . '/session/status/' . $this->instanceId;
+		$endpoint = $this->getBaseUrl().'/session/status/'.$this->instanceId;
 
 		try {
 			$response = $this->client->get($endpoint);
@@ -209,18 +209,18 @@ 
 				return 'not_connected';
 			}
 
-			if (($responseData['success'] ?? null) === false) {
-				$msg = $responseData['message'] ?? '';
-				return in_array($msg, ['session_not_found', 'session_not_connected'], true)
+			if (($responseData[ 'success' ] ?? null) === false) {
+				$msg = $responseData[ 'message' ] ?? '';
+				return in_array($msg, [ 'session_not_found', 'session_not_connected' ], true)
 					? $msg
 					: 'not_connected';
 			}
 
-			return (string)($responseData['state'] ?? 'not_connected');
+			return (string)($responseData[ 'state' ] ?? 'not_connected');
 		} catch (ClientException $e) {
 			return 'not_connected';
 		} catch (RequestException $e) {
-			$this->logger->info('Could not connect to ' . $endpoint, ['exception' => $e]);
+			$this->logger->info('Could not connect to '.$endpoint, [ 'exception' => $e ]);
 			throw new \Exception('Could not connect to the WhatsApp API. Please check the URL.', 1);
 		}
 	}
@@ -239,13 +239,13 @@ 
 	}
 
 	private function getSessionStart(): int {
-		$endpoint = $this->getBaseUrl() . '/session/start/' . $this->instanceId;
+		$endpoint = $this->getBaseUrl().'/session/start/'.$this->instanceId;
 		try {
 			$this->client->get($endpoint);
 		} catch (ClientException $e) {
 			return 1;
 		} catch (RequestException $e) {
-			$this->logger->info('Could not connect to ' . $endpoint, [
+			$this->logger->info('Could not connect to '.$endpoint, [
 				'exception' => $e,
 			]);
 			throw new \Exception('Could not connect to the WhatsApp API. Please check the URL.', 1);

lib/Provider/Channel/SMS/Provider/Drivers/Voipbuster.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 		);
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function send(string $identifier, string $message) {
 		$user = $this->getApiUser();
 		$password = $this->getApiPassword();

lib/Provider/Channel/XMPP/Gateway.php

Spacing +14 added lines, -14 removed lines

@@ -40,7 +40,7 @@ 
 		parent::__construct($appConfig);
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function createSettings(): Settings {
 		return new Settings(
 			name: 'XMPP',
@@ -73,8 +73,8 @@ 
 		);
 	}
 
-	#[\Override]
-	public function send(string $identifier, string $message, array $extra = []): void {
+	#[\Override ]
+	public function send(string $identifier, string $message, array $extra = [ ]): void {
 		$this->logger->debug("sending xmpp message to $identifier, message: $message");
 
 		$sender = $this->getSender();
@@ -82,7 +82,7 @@ 
 		$server = $this->getServer();
 		$method = $this->getMethod();
 		$user = $this->getUsername();
-		$url = $server . $identifier;
+		$url = $server.$identifier;
 
 		if ($method === '1') {
 			$from = $user;
@@ -98,8 +98,8 @@ 
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 			curl_setopt($ch, CURLOPT_POST, 1);
 			curl_setopt($ch, CURLOPT_POSTFIELDS, $message);
-			curl_setopt($ch, CURLOPT_USERPWD, $from . ':' . $password);
-			curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: text/plain']);
+			curl_setopt($ch, CURLOPT_USERPWD, $from.':'.$password);
+			curl_setopt($ch, CURLOPT_HTTPHEADER, [ 'Content-Type: text/plain' ]);
 			$result = curl_exec($ch);
 			curl_close($ch);
 			$this->logger->debug("XMPP message to $identifier sent");
@@ -108,30 +108,30 @@ 
 		}
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function cliConfigure(InputInterface $input, OutputInterface $output): int {
 		$helper = new QuestionHelper();
 		$settings = $this->getSettings();
-		$fields = [];
+		$fields = [ ];
 		foreach ($settings->fields as $field) {
-			$fields[$field->field] = $field;
+			$fields[ $field->field ] = $field;
 		}
 		$sender = '';
 		while (empty($sender) or substr_count($sender, '@') !== 1) {
-			$senderQuestion = new Question($fields['sender']->prompt . ' ');
+			$senderQuestion = new Question($fields[ 'sender' ]->prompt.' ');
 			$sender = $helper->ask($input, $output, $senderQuestion);
 			if (empty($sender)) {
 				$output->writeln('XMPP-JID must not be empty!');
 			} elseif (substr_count($sender, '@') !== 1) {
 				$output->writeln('XMPP-JID not valid!');
 			} else {
-				$username = explode('@', $sender)[0];
+				$username = explode('@', $sender)[ 0 ];
 			}
 		}
 		$output->writeln("Using $sender as XMPP-JID.\nUsing $username as username.");
 		$password = '';
 		while (empty($password)) {
-			$passwordQuestion = new Question($fields['password']->prompt . ' ');
+			$passwordQuestion = new Question($fields[ 'password' ]->prompt.' ');
 			$password = $helper->ask($input, $output, $passwordQuestion);
 			if (empty($password)) {
 				$output->writeln('Password must not be empty!');
@@ -140,7 +140,7 @@ 
 		$output->writeln('Password accepted.');
 		$server = '';
 		while (empty($server)) {
-			$serverQuestion = new Question($fields['server']->prompt . ' ');
+			$serverQuestion = new Question($fields[ 'server' ]->prompt.' ');
 			$server = $helper->ask($input, $output, $serverQuestion);
 			if (empty($server)) {
 				$output->writeln('API path must not be empty!');
@@ -149,7 +149,7 @@ 
 		$output->writeln("Using $server as full URL to access REST/HTTP API.");
 		$method = 0;
 		while (intval($method) < 1 or intval($method) > 2) {
-			echo $fields['method']->prompt . PHP_EOL;
+			echo $fields[ 'method' ]->prompt.PHP_EOL;
 			echo "(1) prosody with mod_rest\n";
 			echo "(2) prosody with mod_post_msg\n";
 			$methodQuestion = new Question('Your choice: ');

lib/Provider/Gateway/Factory.php

Spacing +3 added lines, -3 removed lines

@@ -13,17 +13,17 @@
 
 /** @extends AFactory<AGateway> */
 class Factory extends AFactory {
-	#[\Override]
+	#[\Override ]
 	protected function getPrefix(): string {
 		return 'OCA\\TwoFactorGateway\\Provider\\Channel\\';
 	}
 
-	#[\Override]
+	#[\Override ]
 	protected function getSuffix(): string {
 		return 'Gateway';
 	}
 
-	#[\Override]
+	#[\Override ]
 	protected function getBaseClass(): string {
 		return AGateway::class;
 	}

lib/Provider/FieldDefinition.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	) {
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function jsonSerialize(): mixed {
 		return [
 			'field' => $this->field,