Fix: apply code style and add native type hints

Author: felixure

Makefile

@@ -8,14 +8,14 @@ qa: phpstan cs
 .PHONY: cs
 cs:
 ifdef GITHUB_ACTION
-	vendor/bin/codesniffer -q --report=checkstyle --extensions="php,phpt" src tests | cs2pr
+	vendor/bin/phpcs -q --report=checkstyle --standard=./ruleset.xml --extensions="php,phpt" src tests | cs2pr
 else
-	vendor/bin/codesniffer --extensions="php,phpt" src tests
+	vendor/bin/phpcs --standard=./ruleset.xml --extensions="php,phpt" src tests
 endif
 
 .PHONY: csf
 csf:
-	vendor/bin/codefixer --extensions="php,phpt" src tests
+	vendor/bin/phpcbf --standard=./ruleset.xml --extensions="php,phpt" src tests
 
 .PHONY: phpstan
 phpstan:

src/DI/GitlabAuthExtension.php

@@ -20,7 +20,7 @@ public function getConfigSchema(): Schema
 		return Expect::structure([
 			'clientId' => Expect::string()->required(),
 			'clientSecret' => Expect::string()->required(),
-            'domain' => Expect::string()->required(),
+			'domain' => Expect::string()->required(),
 			'options' => Expect::array(),
 		]);
 	}
@@ -42,7 +42,7 @@ public function loadConfiguration(): void
 
 		$builder->addDefinition($this->prefix('provider'))
 			->setFactory(GitlabProvider::class, [$providerOptions]);
-    
+
 		$builder->addDefinition($this->prefix('authCodeFlow'))
 			->setFactory(GitlabAuthCodeFlow::class, ['@' . $this->prefix('provider')]);
 	}

src/Flow/AuthCodeFlow.php

@@ -16,11 +16,9 @@ abstract class AuthCodeFlow
 
 	public const SESSION_NAMESPACE = 'contributte.oauth2client';
 
-	/** @var AbstractProvider */
-	protected $provider;
+	protected AbstractProvider $provider;
 
-	/** @var Session */
-	protected $session;
+	protected Session $session;
 
 	public function __construct(AbstractProvider $provider, Session $session)
 	{
@@ -32,7 +30,7 @@ public function __construct(AbstractProvider $provider, Session $session)
 	 * @param string|mixed[]|null $redirectUriOrOptions
 	 * @param mixed[] $options
 	 */
-	public function getAuthorizationUrl($redirectUriOrOptions = null, array $options = []): string
+	public function getAuthorizationUrl(string|array|null $redirectUriOrOptions = null, array $options = []): string
 	{
 		if (is_array($redirectUriOrOptions)) {
 			$options = array_merge($options, $redirectUriOrOptions);
@@ -73,13 +71,14 @@ public function getAccessToken(array $parameters, ?string $redirectUri = null):
 		if (isset($session['state']) && $parameters['state'] !== $session['state']) {
 			unset($session['state']);
 			unset($session['redirect_uri']);
+
 			throw new PossibleCsrfAttackException();
 		}
 
 		$options = array_filter([
 			'code' => $parameters['code'],
 			'redirect_uri' => $redirectUri ?? $session['redirect_uri'] ?? null,
-		]);
+		], fn ($v) => $v !== null);
 
 		// Try to get an access token (using the authorization code grant)
 		return $this->provider->getAccessToken('authorization_code', $options);

src/UI/Components/GenericAuthControl.php

@@ -13,20 +13,17 @@
 class GenericAuthControl extends Control
 {
 
-	/** @var AuthCodeFlow */
-	private $authCodeFlow;
+	/** @var array<callable> */
+	public array $onAuthenticated = [];
 
-	/** @var string|null */
-	private $redirectUri = null;
+	/** @var array<callable> */
+	public array $onFailed = [];
 
-	/** @var string|null */
-	private $templatePath = null;
+	private AuthCodeFlow $authCodeFlow;
 
-	/** @var array<callable>  */
-	public $onAuthenticated = [];
+	private ?string $redirectUri = null;
 
-	/** @var array<callable>  */
-	public $onFailed = [];
+	private ?string $templatePath = null;
 
 	public function __construct(AuthCodeFlow $authCodeFlow, ?string $redirectUri = null)
 	{
@@ -61,6 +58,7 @@ public function authorize(): ?ResourceOwnerInterface
 
 			$user = $this->authCodeFlow->getProvider()->getResourceOwner($accessToken);
 			$this->authenticationSucceed($accessToken, $user);
+
 			return $user;
 		} catch (IdentityProviderException $e) {
 			$this->authenticationFailed();
@@ -69,16 +67,6 @@ public function authorize(): ?ResourceOwnerInterface
 		return null;
 	}
 
-	protected function authenticationFailed(): void
-	{
-		$this->onFailed();
-	}
-
-	protected function authenticationSucceed(AccessToken $accessToken, ResourceOwnerInterface $user): void
-	{
-		$this->onAuthenticated($accessToken, $user);
-	}
-
 	public function render(): void
 	{
 		$template = $this->getTemplate();
@@ -89,4 +77,14 @@ public function render(): void
 		$template->render($this->templatePath ?? __DIR__ . '/GenericAuthControl.latte');
 	}
 
+	protected function authenticationFailed(): void
+	{
+		$this->onFailed();
+	}
+
+	protected function authenticationSucceed(AccessToken $accessToken, ResourceOwnerInterface $user): void
+	{
+		$this->onAuthenticated($accessToken, $user);
+	}
+
 }