Chore/phpcs cleanup

composer.json

@@ -45,6 +45,6 @@
         "lint": "parallel-lint",
         "phpstan": "phpstan analyse --memory-limit=512M",
         "psalm": "psalm",
-        "phpcs": "phpcs --standard=PSR12"
+        "phpcs": "phpcs --standard=PSR12 --exclude=Generic.Files.LineLength"
     }
 }

src/Config/Constants.php

@@ -22,7 +22,7 @@ class Constants
 
     public static string $ORG_CLAIM = 'org';
 
-    public static function getValidIdentityClaims()
+    public static function getValidIdentityClaims(): array
     {
         return array_merge(
             self::$VALID_IDENTITY_STRING_CLAIMS,
@@ -31,7 +31,7 @@ public static function getValidIdentityClaims()
         );
     }
 
-    public static function getValidScopes()
+    public static function getValidScopes(): array
     {
         return array_merge(
             self::$VALID_IDENTITY_STRING_CLAIMS,

src/Config/HelloConfig.php

@@ -10,6 +10,11 @@ class HelloConfig implements ConfigInterface
     private string $logoutApiRoute;
     private bool $sameSiteStrict;
     private ?string $clientId;
+
+    /**
+     * Include encrypted cookie in auth response
+     * @var ?bool $cookieToken
+     */
     private ?bool $cookieToken = null;
     private ?string $redirectURI;
     private string $helloDomain;
@@ -52,7 +57,7 @@ public function __construct(
             'loggedOut' => '/',
             'error' => '/error',
         ],
-        ?bool $cookieToken = null,
+        ?bool $cookieToken = null, // include encrypted cookie in auth response
         ?bool $logDebug = null,
         ?array $error = null
     ) {

src/Exception/CallbackException.php

@@ -11,9 +11,9 @@ class CallbackException extends Exception
 
     public function __construct(
         array $errorDetails,
-        $message = "Callback Exception",
-        $code = 0,
-        Throwable $previous = null
+        string $message = "Callback Exception",
+        int $code = 0,
+        ?Throwable $previous = null
     ) {
         $this->errorDetails = $errorDetails;
         parent::__construct($message, $code, $previous);

src/Exception/SameSiteCallbackException.php

@@ -10,9 +10,9 @@ class SameSiteCallbackException extends Exception
     private array $errorDetails;
 
     public function __construct(
-        $message = "Same Site Callback Exception",
-        $code = 0,
-        Throwable $previous = null
+        string $message = "Same Site Callback Exception",
+        int $code = 0,
+        ?Throwable $previous = null
     ) {
         parent::__construct($message, $code, $previous);
     }

src/Handler/Callback.php

@@ -16,6 +16,7 @@
 use HelloCoop\Lib\TokenParser;
 use Exception;
 use HelloCoop\Utils\CurlWrapper;
+use Throwable;
 
 class Callback
 {
@@ -260,13 +261,13 @@ public function handleCallback(): ?string
      *
      * @param array $error Error details including 'target_uri', 'error', and 'error_description'.
      * @param string $errorMessage A message describing the error.
-     * @param \Throwable|null $previous Previous exception for chaining (optional).
+     * @param Throwable|null $previous Previous exception for chaining (optional).
      *
      * @return string The error page URL.
      *
      * @throws CallbackException If no error URI is provided.
      */
-    private function sendErrorPage(array $error, string $errorMessage, \Throwable $previous = null): string
+    private function sendErrorPage(array $error, string $errorMessage, ?Throwable $previous = null): string
     {
         $error_uri = $error['target_uri'] ?? $this->config->getRoutes()['error'] ?? null;
         if ($error_uri) {

src/HelloClient.php

@@ -31,9 +31,9 @@ class HelloClient
 
     public function __construct(
         ConfigInterface $config,
-        HelloRequestInterface $helloRequest = null,
-        HelloResponseInterface $helloResponse = null,
-        PageRendererInterface $pageRenderer = null
+        ?HelloRequestInterface $helloRequest = null,
+        ?HelloResponseInterface $helloResponse = null,
+        ?PageRendererInterface $pageRenderer = null
     ) {
         $this->config = $config;
         $this->helloRequest = $helloRequest ??= new HelloRequest();

src/Lib/PKCE.php

@@ -4,7 +4,7 @@
 
 class PKCE
 {
-    const VERIFIER_LENGTH = 43;
+    public const VERIFIER_LENGTH = 43;
 
     /** Generate cryptographically strong random string
      * @param int $size The desired length of the string

src/Type/AuthCookie.php

@@ -5,7 +5,8 @@
 use InvalidArgumentException;
 
 // Authentication cookie class, extending Claims
-class AuthCookie extends Claims {
+class AuthCookie extends Claims
+{
     /** @var int */
     public $iat;
 
@@ -15,29 +16,33 @@ class AuthCookie extends Claims {
      */
     public $extraProperties = [];
 
-    public function __construct(string $sub, int $iat) {
+    public function __construct(string $sub, int $iat)
+    {
         parent::__construct($sub);
         $this->iat = $iat;
     }
 
     /**
      * Add an extra property.
      */
-    public function setExtraProperty(string $key, $value): void {
+    public function setExtraProperty(string $key, $value): void
+    {
         $this->extraProperties[$key] = $value;
     }
 
     /**
      * Get an extra property.
      */
-    public function getExtraProperty(string $key) {
+    public function getExtraProperty(string $key)
+    {
         return $this->extraProperties[$key] ?? null;
     }
 
     /**
      * Create an instance from an array of key-value pairs.
      */
-    public static function fromArray(array $data): self {
+    public static function fromArray(array $data): self
+    {
         if (!isset($data['sub'], $data['iat'])) {
             throw new InvalidArgumentException('Missing required keys "sub" or "iat".');
         }
@@ -52,11 +57,12 @@ public static function fromArray(array $data): self {
 
         return $instance;
     }
-    
+
     /**
      * Convert the instance to an array of key-value pairs.
      */
-    public function toArray(): array {
+    public function toArray(): array
+    {
         return array_merge(['sub' => $this->sub, 'iat' => $this->iat], $this->extraProperties);
     }
-}
+}

src/Type/AuthUpdates.php

@@ -1,49 +1,61 @@
 <?php
 
 namespace HelloCoop\Type;
-class AuthUpdates extends Claims implements \ArrayAccess {
+
+class AuthUpdates extends Claims implements \ArrayAccess
+{
     private array $additionalProperties = [];
 
-    public function __construct(string $sub, int $iat, array $updates = []) {
-        parent::__construct($sub, $iat);
+    public function __construct(string $sub, array $updates = [])
+    {
+        parent::__construct($sub);
         $this->additionalProperties = $updates;
     }
 
     // Magic methods for dynamic properties
-    public function __set(string $name, $value): void {
+    public function __set(string $name, $value): void
+    {
         $this->additionalProperties[$name] = $value;
     }
 
-    public function __get(string $name) {
+    public function __get(string $name)
+    {
         return $this->additionalProperties[$name] ?? null;
     }
 
-    public function __isset(string $name): bool {
+    public function __isset(string $name): bool
+    {
         return isset($this->additionalProperties[$name]);
     }
 
-    public function __unset(string $name): void {
+    public function __unset(string $name): void
+    {
         unset($this->additionalProperties[$name]);
     }
 
     // ArrayAccess implementation
-    public function offsetExists($offset): bool {
+    public function offsetExists($offset): bool
+    {
         return isset($this->additionalProperties[$offset]);
     }
 
-    public function offsetGet($offset) {
+    public function offsetGet($offset): ?string
+    {
         return $this->additionalProperties[$offset] ?? null;
     }
 
-    public function offsetSet($offset, $value): void {
+    public function offsetSet($offset, $value): void
+    {
         $this->additionalProperties[$offset] = $value;
     }
 
-    public function offsetUnset($offset): void {
+    public function offsetUnset($offset): void
+    {
         unset($this->additionalProperties[$offset]);
     }
 
-    public function toArray(): array {
+    public function toArray(): array
+    {
         return array_merge(get_object_vars($this), $this->additionalProperties);
     }
-}
+}

src/Type/Claims.php

@@ -6,13 +6,17 @@
 use HelloCoop\Type\Common\OptionalAccountClaimsTrait;
 use HelloCoop\Type\Common\OptionalOrgClaimTrait;
 
-class Claims {
-    use OptionalStringClaimsTrait, OptionalAccountClaimsTrait, OptionalOrgClaimTrait;
+class Claims
+{
+    use OptionalStringClaimsTrait;
+    use OptionalAccountClaimsTrait;
+    use OptionalOrgClaimTrait;
 
     /** @var string */
     public $sub;
 
-    public function __construct(string $sub) {
+    public function __construct(string $sub)
+    {
         $this->sub = $sub;
     }
-}
+}

src/Type/Common/OptionalAccountClaimsTrait.php

@@ -2,10 +2,11 @@
 
 namespace HelloCoop\Type\Common;
 
-trait OptionalAccountClaimsTrait {
+trait OptionalAccountClaimsTrait
+{
     /**
      * @var array<string, array{id: string, username: string}>
      * An associative array of account claims (e.g., ['github' => ['id' => '123', 'username' => 'user']]).
      */
     public $claims = [];
-}
+}

src/Type/Common/OptionalOrgClaimTrait.php

@@ -2,10 +2,11 @@
 
 namespace HelloCoop\Type\Common;
 
-trait OptionalOrgClaimTrait {
+trait OptionalOrgClaimTrait
+{
     /**
      * @var array{id: string, domain: string}|null
      * Optional organization claim.
      */
     public $org;
-}
+}

src/Type/Common/OptionalStringClaimsTrait.php

@@ -1,14 +1,16 @@
 <?php
 
 namespace HelloCoop\Type\Common;
-trait OptionalStringClaimsTrait {
-    public $name;
-    public $nickname;
-    public $preferred_username;
-    public $given_name;
-    public $family_name;
-    public $email;
-    public $phone;
-    public $picture;
-    public $ethereum;
-}
+
+trait OptionalStringClaimsTrait
+{
+    public string $name;
+    public string $nickname;
+    public string $preferred_username;
+    public string $given_name;
+    public string $family_name;
+    public string $email;
+    public string $phone;
+    public string $picture;
+    public string $ethereum;
+}

src/Type/OIDC.php

@@ -4,20 +4,23 @@
 
 use InvalidArgumentException;
 
-class OIDC {
+class OIDC
+{
     public string $codeVerifier;
     public string $nonce;
     public string $redirectUri;
     public string $targetUri;
 
-    public function __construct(string $codeVerifier, string $nonce, string $redirectUri, string $targetUri) {
+    public function __construct(string $codeVerifier, string $nonce, string $redirectUri, string $targetUri)
+    {
         $this->codeVerifier = $codeVerifier;
         $this->nonce = $nonce;
         $this->redirectUri = $redirectUri;
         $this->targetUri = $targetUri;
     }
 
-    public static function fromArray(array $data): self {
+    public static function fromArray(array $data): self
+    {
         if (!isset($data['code_verifier'])) {
             throw new InvalidArgumentException('Missing code_verifier');
         }
@@ -42,7 +45,8 @@ public static function fromArray(array $data): self {
         );
     }
 
-    public function toArray(): array {
+    public function toArray(): array
+    {
         return [
             'code_verifier' => $this->codeVerifier,
             'nonce' => $this->nonce,
@@ -51,4 +55,3 @@ public function toArray(): array {
         ];
     }
 }
-

tests/Config/HelloConfigBuilderTest.php

@@ -8,7 +8,7 @@
 
 class HelloConfigBuilderTest extends TestCase
 {
-    public function testHelloConfigBuilderBuildsConfigCorrectly()
+    public function testHelloConfigBuilderBuildsConfigCorrectly(): void
     {
         // Arrange: Create the builder and set values
         $builder = new HelloConfigBuilder();