diff --git a/README.md b/README.md
index 46c07cc..df5b40f 100644
--- a/README.md
+++ b/README.md
@@ -176,17 +176,19 @@ $keyPair = KeyPair::fromPrivateKey($privateKey);
 ### Algorithm Support
 
 ```php
+use Biscuit\Auth\Algorithm;
+
 // Ed25519 is the default algorithm (recommended)
 $keypair1 = new KeyPair(); // Uses Ed25519
 $keypair2 = KeyPair::newWithAlgorithm(); // Uses Ed25519 by default
 
 // Explicitly use Secp256r1
-$keypair3 = KeyPair::newWithAlgorithm(1); // ALGORITHM_SECP256R1
+$keypair3 = KeyPair::newWithAlgorithm(Algorithm::Secp256r1);
 
 // Key import defaults to Ed25519
 $publicKey = PublicKey::fromBytes($bytes); // Defaults to Ed25519
-$publicKey = PublicKey::fromBytes($bytes, 0); // Explicit Ed25519
-$publicKey = PublicKey::fromBytes($bytes, 1); // Explicit Secp256r1
+$publicKey = PublicKey::fromBytes($bytes, Algorithm::Ed25519); // Explicit Ed25519
+$publicKey = PublicKey::fromBytes($bytes, Algorithm::Secp256r1); // Explicit Secp256r1
 ```
 
 ## Testing
diff --git a/mago.toml b/mago.toml
index 40a9644..dc83af9 100644
--- a/mago.toml
+++ b/mago.toml
@@ -1,9 +1,10 @@
 # Welcome to Mago!
 # For full documentation, see https://mago.carthage.software/tools/overview
-php-version = "8.4.0"
+php-version = "8.5.0"
 
 [source]
-paths = ["tests/"]
+workspace = "."
+paths = ["stubs/Biscuit/", "tests/"]
 includes = ["vendor"]
 excludes = []
 
@@ -19,12 +20,18 @@ integrations = ["phpunit"]
 ambiguous-function-call = { enabled = false }
 literal-named-argument = { enabled = false }
 halstead = { effort-threshold = 7000 }
+strict-types = { enabled = false }
 too-many-methods = { enabled = false }
 
 [analyzer]
 find-unused-definitions = true
 find-unused-expressions = false
 analyze-dead-code = false
-check-throws = true
+memoize-properties = true
 allow-possibly-undefined-array-keys = true
+check-throws = false
 perform-heuristic-checks = true
+strict-list-index-checks = false
+no-boolean-literal-comparison = false
+check-missing-type-hints = false
+register-super-globals = true
diff --git a/src/lib.rs b/src/lib.rs
index 254fb20..1ef2445 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,20 +4,25 @@ use std::str::FromStr;
 use biscuit_auth::builder::Algorithm as BiscuitAlgorithm;
 use biscuit_auth::{KeyPair as BiscuitKeyPair, ThirdPartyBlock as BiscuitThirdPartyBlock};
 use ext_php_rs::binary_slice::BinarySlice;
-use ext_php_rs::zend::{ce, ModuleEntry};
+use ext_php_rs::zend::{ModuleEntry, ce};
 use ext_php_rs::{info_table_end, info_table_row, info_table_start, prelude::*};
 
-// TODO: refactor this to use enum when ext-php-rs supports it
-#[php_const]
-pub const ALGORITHM_ED25519: i64 = 0;
-#[php_const]
-pub const ALGORITHM_SECP256R1: i64 = 1;
+/// Algorithm enum for cryptographic key operations
+#[php_enum]
+#[php(name = "Biscuit\\Auth\\Algorithm")]
+pub enum Algorithm {
+    #[php(value = 0)]
+    Ed25519,
+    #[php(name = "Secp256r1", value = 1)]
+    Secp256r1,
+}
 
-fn algorithm_from_int(value: i64) -> PhpResult<BiscuitAlgorithm> {
-    match value {
-        0 => Ok(BiscuitAlgorithm::Ed25519),
-        1 => Ok(BiscuitAlgorithm::Secp256r1),
-        _ => Err(PhpException::default("Invalid algorithm".to_string())),
+impl From<Algorithm> for BiscuitAlgorithm {
+    fn from(alg: Algorithm) -> Self {
+        match alg {
+            Algorithm::Ed25519 => BiscuitAlgorithm::Ed25519,
+            Algorithm::Secp256r1 => BiscuitAlgorithm::Secp256r1,
+        }
     }
 }
 
@@ -761,9 +766,9 @@ impl KeyPair {
     }
 
     #[php(name = "newWithAlgorithm")]
-    pub fn new_with_algorithm(alg: Option<i64>) -> PhpResult<Self> {
-        let algorithm = algorithm_from_int(alg.unwrap_or(0))?;
-        Ok(Self(BiscuitKeyPair::new_with_algorithm(algorithm)))
+    pub fn new_with_algorithm(alg: Option<Algorithm>) -> Self {
+        let algorithm = alg.unwrap_or(Algorithm::Ed25519).into();
+        Self(BiscuitKeyPair::new_with_algorithm(algorithm))
     }
 
     #[php(name = "fromPrivateKey")]
@@ -794,8 +799,8 @@ impl PublicKey {
     }
 
     #[php(name = "fromBytes")]
-    pub fn from_bytes(data: BinarySlice<u8>, alg: Option<i64>) -> PhpResult<Self> {
-        let algorithm = algorithm_from_int(alg.unwrap_or(0))?;
+    pub fn from_bytes(data: BinarySlice<u8>, alg: Option<Algorithm>) -> PhpResult<Self> {
+        let algorithm = alg.unwrap_or(Algorithm::Ed25519).into();
         biscuit_auth::PublicKey::from_bytes(data.as_ref(), algorithm)
             .map(Self)
             .map_err(|e| PhpException::from_class::<InvalidPublicKey>(e.to_string()))
@@ -842,8 +847,8 @@ impl PrivateKey {
     }
 
     #[php(name = "fromBytes")]
-    pub fn from_bytes(data: BinarySlice<u8>, alg: Option<i64>) -> PhpResult<Self> {
-        let algorithm = algorithm_from_int(alg.unwrap_or(0))?;
+    pub fn from_bytes(data: BinarySlice<u8>, alg: Option<Algorithm>) -> PhpResult<Self> {
+        let algorithm = alg.unwrap_or(Algorithm::Ed25519).into();
         biscuit_auth::PrivateKey::from_bytes(data.as_ref(), algorithm)
             .map(Self)
             .map_err(|e| PhpException::from_class::<InvalidPrivateKey>(e.to_string()))
@@ -965,6 +970,7 @@ pub extern "C" fn php_module_info(_module: *mut ModuleEntry) {
 pub fn get_module(module: ModuleBuilder) -> ModuleBuilder {
     module
         .info_function(php_module_info)
+        .enumeration::<Algorithm>()
         .class::<Biscuit>()
         .class::<UnverifiedBiscuit>()
         .class::<Authorizer>()
diff --git a/stubs/Biscuit/Auth/Algorithm.php b/stubs/Biscuit/Auth/Algorithm.php
new file mode 100644
index 0000000..8cfbda6
--- /dev/null
+++ b/stubs/Biscuit/Auth/Algorithm.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Biscuit\Auth;
+
+/**
+ * Algorithm enum for cryptographic key operations.
+ */
+enum Algorithm: int
+{
+    case Ed25519 = 0;
+    case Secp256r1 = 1;
+}
diff --git a/stubs/Biscuit/Auth/Authorizer.php b/stubs/Biscuit/Auth/Authorizer.php
index 7c59af7..ae3b669 100644
--- a/stubs/Biscuit/Auth/Authorizer.php
+++ b/stubs/Biscuit/Auth/Authorizer.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,35 +7,33 @@
 
 class Authorizer implements \Stringable
 {
-    public function authorize() : int
+    public function authorize(): int
     {
     }
 
-    public function query(\Biscuit\Auth\Rule $rule) : array
+    public function query(\Biscuit\Auth\Rule $rule): array
     {
     }
 
-    public function base64Snapshot() : string
+    public function base64Snapshot(): string
     {
     }
 
-    public function rawSnapshot() : array
+    public function rawSnapshot(): array
     {
     }
 
-    public static function fromBase64Snapshot(string $input) : \Biscuit\Auth\Authorizer
+    public static function fromBase64Snapshot(string $input): \Biscuit\Auth\Authorizer
     {
     }
 
-    public static function fromRawSnapshot(string $input) : \Biscuit\Auth\Authorizer
+    public static function fromRawSnapshot(string $input): \Biscuit\Auth\Authorizer
     {
     }
 
-    public function __toString() : string
+    public function __toString(): string
     {
     }
 
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 }
diff --git a/stubs/Biscuit/Auth/AuthorizerBuilder.php b/stubs/Biscuit/Auth/AuthorizerBuilder.php
index 0db4c56..e46ff73 100644
--- a/stubs/Biscuit/Auth/AuthorizerBuilder.php
+++ b/stubs/Biscuit/Auth/AuthorizerBuilder.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,27 +7,27 @@
 
 class AuthorizerBuilder implements \Stringable
 {
-    public function addCode(string $source) : void
+    public function addCode(string $source): void
     {
     }
 
-    public function addCodeWithParams(string $source, array $params, array $scope_params) : void
+    public function addCodeWithParams(string $source, array $params, array $scope_params): void
     {
     }
 
-    public function addFact(\Biscuit\Auth\Fact $fact) : void
+    public function addFact(\Biscuit\Auth\Fact $fact): void
     {
     }
 
-    public function addRule(\Biscuit\Auth\Rule $rule) : void
+    public function addRule(\Biscuit\Auth\Rule $rule): void
     {
     }
 
-    public function addCheck(\Biscuit\Auth\Check $check) : void
+    public function addCheck(\Biscuit\Auth\Check $check): void
     {
     }
 
-    public function addPolicy(\Biscuit\Auth\Policy $policy) : void
+    public function addPolicy(\Biscuit\Auth\Policy $policy): void
     {
     }
 
@@ -42,35 +43,33 @@ public function mergeBlock(\Biscuit\Auth\BlockBuilder $block)
     {
     }
 
-    public function base64Snapshot() : string
+    public function base64Snapshot(): string
     {
     }
 
-    public function rawSnapshot() : array
+    public function rawSnapshot(): array
     {
     }
 
-    public static function fromBase64Snapshot(string $input) : \Biscuit\Auth\AuthorizerBuilder
+    public static function fromBase64Snapshot(string $input): \Biscuit\Auth\AuthorizerBuilder
     {
     }
 
-    public static function fromRawSnapshot(string $input) : \Biscuit\Auth\AuthorizerBuilder
+    public static function fromRawSnapshot(string $input): \Biscuit\Auth\AuthorizerBuilder
     {
     }
 
-    public function build(\Biscuit\Auth\Biscuit $token) : \Biscuit\Auth\Authorizer
+    public function build(#[\SensitiveParameter] \Biscuit\Auth\Biscuit $token): \Biscuit\Auth\Authorizer
     {
     }
 
-    public function buildUnauthenticated() : \Biscuit\Auth\Authorizer
+    public function buildUnauthenticated(): \Biscuit\Auth\Authorizer
     {
     }
 
-    public function __toString() : string
+    public function __toString(): string
     {
     }
 
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 }
diff --git a/stubs/Biscuit/Auth/Biscuit.php b/stubs/Biscuit/Auth/Biscuit.php
index 44eed70..32aacf7 100644
--- a/stubs/Biscuit/Auth/Biscuit.php
+++ b/stubs/Biscuit/Auth/Biscuit.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,59 +7,59 @@
 
 class Biscuit implements \Stringable
 {
-    public static function builder() : \Biscuit\Auth\BiscuitBuilder
+    public static function builder(): \Biscuit\Auth\BiscuitBuilder
     {
     }
 
-    public static function fromBytes(string $data, \Biscuit\Auth\PublicKey $root) : \Biscuit\Auth\Biscuit
+    public static function fromBytes(string $data, \Biscuit\Auth\PublicKey $root): \Biscuit\Auth\Biscuit
     {
     }
 
-    public static function fromBase64(string $data, \Biscuit\Auth\PublicKey $root) : \Biscuit\Auth\Biscuit
+    public static function fromBase64(string $data, \Biscuit\Auth\PublicKey $root): \Biscuit\Auth\Biscuit
     {
     }
 
-    public function toBytes() : array
+    public function toBytes(): array
     {
     }
 
-    public function toBase64() : string
+    public function toBase64(): string
     {
     }
 
-    public function blockCount() : int
+    public function blockCount(): int
     {
     }
 
-    public function blockSource(int $index) : string
+    public function blockSource(int $index): string
     {
     }
 
-    public function append(\Biscuit\Auth\BlockBuilder $block) : \Biscuit\Auth\Biscuit
+    public function append(\Biscuit\Auth\BlockBuilder $block): \Biscuit\Auth\Biscuit
     {
     }
 
-    public function appendThirdParty(\Biscuit\Auth\PublicKey $external_key, \Biscuit\Auth\ThirdPartyBlock $block) : \Biscuit\Auth\Biscuit
-    {
+    public function appendThirdParty(
+        \Biscuit\Auth\PublicKey $external_key,
+        \Biscuit\Auth\ThirdPartyBlock $block,
+    ): \Biscuit\Auth\Biscuit {
     }
 
-    public function thirdPartyRequest() : \Biscuit\Auth\ThirdPartyRequest
+    public function thirdPartyRequest(): \Biscuit\Auth\ThirdPartyRequest
     {
     }
 
-    public function revocationIds() : array
+    public function revocationIds(): array
     {
     }
 
-    public function blockExternalKey(int $index) : ?\Biscuit\Auth\PublicKey
+    public function blockExternalKey(int $index): null|\Biscuit\Auth\PublicKey
     {
     }
 
-    public function __toString() : string
+    public function __toString(): string
     {
     }
 
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 }
diff --git a/stubs/Biscuit/Auth/BiscuitBuilder.php b/stubs/Biscuit/Auth/BiscuitBuilder.php
index 7f26583..bddef55 100644
--- a/stubs/Biscuit/Auth/BiscuitBuilder.php
+++ b/stubs/Biscuit/Auth/BiscuitBuilder.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,15 +7,15 @@
 
 class BiscuitBuilder implements \Stringable
 {
-    public function build(\Biscuit\Auth\PrivateKey $root) : \Biscuit\Auth\Biscuit
+    public function build(\Biscuit\Auth\PrivateKey $root): \Biscuit\Auth\Biscuit
     {
     }
 
-    public function addCode(string $source) : void
+    public function addCode(string $source): void
     {
     }
 
-    public function addCodeWithParams(string $source, array $params, array $scope_params) : void
+    public function addCodeWithParams(string $source, array $params, array $scope_params): void
     {
     }
 
@@ -22,15 +23,15 @@ public function merge(\Biscuit\Auth\BlockBuilder $other)
     {
     }
 
-    public function addFact(\Biscuit\Auth\Fact $fact) : void
+    public function addFact(\Biscuit\Auth\Fact $fact): void
     {
     }
 
-    public function addRule(\Biscuit\Auth\Rule $rule) : void
+    public function addRule(\Biscuit\Auth\Rule $rule): void
     {
     }
 
-    public function addCheck(\Biscuit\Auth\Check $check) : void
+    public function addCheck(\Biscuit\Auth\Check $check): void
     {
     }
 
@@ -38,11 +39,9 @@ public function setRootKeyId(int $root_key_id)
     {
     }
 
-    public function __toString() : string
+    public function __toString(): string
     {
     }
 
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 }
diff --git a/stubs/Biscuit/Auth/BlockBuilder.php b/stubs/Biscuit/Auth/BlockBuilder.php
index 52f82a0..6c9723f 100644
--- a/stubs/Biscuit/Auth/BlockBuilder.php
+++ b/stubs/Biscuit/Auth/BlockBuilder.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,23 +7,23 @@
 
 class BlockBuilder implements \Stringable
 {
-    public function addFact(\Biscuit\Auth\Fact $fact) : void
+    public function addFact(\Biscuit\Auth\Fact $fact): void
     {
     }
 
-    public function addRule(\Biscuit\Auth\Rule $rule) : void
+    public function addRule(\Biscuit\Auth\Rule $rule): void
     {
     }
 
-    public function addCheck(\Biscuit\Auth\Check $check) : void
+    public function addCheck(\Biscuit\Auth\Check $check): void
     {
     }
 
-    public function addCode(string $source) : void
+    public function addCode(string $source): void
     {
     }
 
-    public function addCodeWithParams(string $source, array $params, array $scope_params) : void
+    public function addCodeWithParams(string $source, array $params, array $scope_params): void
     {
     }
 
@@ -30,11 +31,9 @@ public function merge(\Biscuit\Auth\BlockBuilder $other)
     {
     }
 
-    public function __toString() : string
+    public function __toString(): string
     {
     }
 
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 }
diff --git a/stubs/Biscuit/Auth/Check.php b/stubs/Biscuit/Auth/Check.php
index 54c250d..19549d8 100644
--- a/stubs/Biscuit/Auth/Check.php
+++ b/stubs/Biscuit/Auth/Check.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,19 +7,17 @@
 
 class Check implements \Stringable
 {
-    public function set(string $name, mixed $value) : void
+    public function set(string $name, mixed $value): void
     {
     }
 
-    public function setScope(string $name, \Biscuit\Auth\PublicKey $key) : void
+    public function setScope(string $name, \Biscuit\Auth\PublicKey $key): void
     {
     }
 
-    public function __toString() : string
+    public function __toString(): string
     {
     }
 
-    public function __construct(string $source)
-    {
-    }
+    public function __construct(string $source) {}
 }
diff --git a/stubs/Biscuit/Auth/Fact.php b/stubs/Biscuit/Auth/Fact.php
index 6ae0bcd..7db2ba8 100644
--- a/stubs/Biscuit/Auth/Fact.php
+++ b/stubs/Biscuit/Auth/Fact.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,19 +7,17 @@
 
 class Fact implements \Stringable
 {
-    public function set(string $name, mixed $value) : void
+    public function set(string $name, mixed $value): void
     {
     }
 
-    public function name() : string
+    public function name(): string
     {
     }
 
-    public function __toString() : string
+    public function __toString(): string
     {
     }
 
-    public function __construct(string $source)
-    {
-    }
+    public function __construct(string $source) {}
 }
diff --git a/stubs/Biscuit/Auth/KeyPair.php b/stubs/Biscuit/Auth/KeyPair.php
index 4442f27..3e3c276 100644
--- a/stubs/Biscuit/Auth/KeyPair.php
+++ b/stubs/Biscuit/Auth/KeyPair.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,23 +7,21 @@
 
 class KeyPair
 {
-    public static function newWithAlgorithm(?int $alg = null) : \Biscuit\Auth\KeyPair
+    public static function newWithAlgorithm(null|Algorithm $alg = null): \Biscuit\Auth\KeyPair
     {
     }
 
-    public static function fromPrivateKey(\Biscuit\Auth\PrivateKey $private_key) : \Biscuit\Auth\KeyPair
+    public static function fromPrivateKey(\Biscuit\Auth\PrivateKey $private_key): \Biscuit\Auth\KeyPair
     {
     }
 
-    public function public() : \Biscuit\Auth\PublicKey
+    public function public(): \Biscuit\Auth\PublicKey
     {
     }
 
-    public function private() : \Biscuit\Auth\PrivateKey
+    public function private(): \Biscuit\Auth\PrivateKey
     {
     }
 
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 }
diff --git a/stubs/Biscuit/Auth/Policy.php b/stubs/Biscuit/Auth/Policy.php
index cff6580..4d9acb7 100644
--- a/stubs/Biscuit/Auth/Policy.php
+++ b/stubs/Biscuit/Auth/Policy.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,19 +7,17 @@
 
 class Policy implements \Stringable
 {
-    public function set(string $name, mixed $value) : void
+    public function set(string $name, mixed $value): void
     {
     }
 
-    public function setScope(string $name, \Biscuit\Auth\PublicKey $key) : void
+    public function setScope(string $name, \Biscuit\Auth\PublicKey $key): void
     {
     }
 
-    public function __toString() : string
+    public function __toString(): string
     {
     }
 
-    public function __construct(string $source)
-    {
-    }
+    public function __construct(string $source) {}
 }
diff --git a/stubs/Biscuit/Auth/PrivateKey.php b/stubs/Biscuit/Auth/PrivateKey.php
index bf7a760..edb537b 100644
--- a/stubs/Biscuit/Auth/PrivateKey.php
+++ b/stubs/Biscuit/Auth/PrivateKey.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,31 +7,29 @@
 
 class PrivateKey implements \Stringable
 {
-    public static function fromBytes(string $data, ?int $alg = null) : \Biscuit\Auth\PrivateKey
+    public static function fromBytes(string $data, null|Algorithm $alg = null): \Biscuit\Auth\PrivateKey
     {
     }
 
-    public static function fromPem(string $pem) : \Biscuit\Auth\PrivateKey
+    public static function fromPem(string $pem): \Biscuit\Auth\PrivateKey
     {
     }
 
-    public static function fromDer(string $der) : \Biscuit\Auth\PrivateKey
+    public static function fromDer(string $der): \Biscuit\Auth\PrivateKey
     {
     }
 
-    public function toBytes() : array
+    public function toBytes(): array
     {
     }
 
-    public function toHex() : string
+    public function toHex(): string
     {
     }
 
-    public function __toString() : string
+    public function __toString(): string
     {
     }
 
-    public function __construct(string $data)
-    {
-    }
+    public function __construct(string $data) {}
 }
diff --git a/stubs/Biscuit/Auth/PublicKey.php b/stubs/Biscuit/Auth/PublicKey.php
index fe09392..360be87 100644
--- a/stubs/Biscuit/Auth/PublicKey.php
+++ b/stubs/Biscuit/Auth/PublicKey.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,31 +7,29 @@
 
 class PublicKey implements \Stringable
 {
-    public static function fromBytes(string $data, ?int $alg = null) : \Biscuit\Auth\PublicKey
+    public static function fromBytes(string $data, null|Algorithm $alg = null): \Biscuit\Auth\PublicKey
     {
     }
 
-    public static function fromPem(string $pem) : \Biscuit\Auth\PublicKey
+    public static function fromPem(string $pem): \Biscuit\Auth\PublicKey
     {
     }
 
-    public static function fromDer(string $der) : \Biscuit\Auth\PublicKey
+    public static function fromDer(string $der): \Biscuit\Auth\PublicKey
     {
     }
 
-    public function toBytes() : array
+    public function toBytes(): array
     {
     }
 
-    public function toHex() : string
+    public function toHex(): string
     {
     }
 
-    public function __toString() : string
+    public function __toString(): string
     {
     }
 
-    public function __construct(string $data)
-    {
-    }
+    public function __construct(string $data) {}
 }
diff --git a/stubs/Biscuit/Auth/Rule.php b/stubs/Biscuit/Auth/Rule.php
index 647c588..39a7e56 100644
--- a/stubs/Biscuit/Auth/Rule.php
+++ b/stubs/Biscuit/Auth/Rule.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,19 +7,17 @@
 
 class Rule implements \Stringable
 {
-    public function set(string $name, mixed $value) : void
+    public function set(string $name, mixed $value): void
     {
     }
 
-    public function setScope(string $name, \Biscuit\Auth\PublicKey $key) : void
+    public function setScope(string $name, \Biscuit\Auth\PublicKey $key): void
     {
     }
 
-    public function __toString() : string
+    public function __toString(): string
     {
     }
 
-    public function __construct(string $source)
-    {
-    }
+    public function __construct(string $source) {}
 }
diff --git a/stubs/Biscuit/Auth/ThirdPartyBlock.php b/stubs/Biscuit/Auth/ThirdPartyBlock.php
index a265c5d..42c0d9b 100644
--- a/stubs/Biscuit/Auth/ThirdPartyBlock.php
+++ b/stubs/Biscuit/Auth/ThirdPartyBlock.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,7 +7,5 @@
 
 class ThirdPartyBlock
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 }
diff --git a/stubs/Biscuit/Auth/ThirdPartyRequest.php b/stubs/Biscuit/Auth/ThirdPartyRequest.php
index bdcd7c0..43b180c 100644
--- a/stubs/Biscuit/Auth/ThirdPartyRequest.php
+++ b/stubs/Biscuit/Auth/ThirdPartyRequest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,11 +7,11 @@
 
 class ThirdPartyRequest
 {
-    public function createBlock(\Biscuit\Auth\PrivateKey $private_key, \Biscuit\Auth\BlockBuilder $block) : \Biscuit\Auth\ThirdPartyBlock
-    {
+    public function createBlock(
+        \Biscuit\Auth\PrivateKey $private_key,
+        \Biscuit\Auth\BlockBuilder $block,
+    ): \Biscuit\Auth\ThirdPartyBlock {
     }
 
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 }
diff --git a/stubs/Biscuit/Auth/UnverifiedBiscuit.php b/stubs/Biscuit/Auth/UnverifiedBiscuit.php
index 08337f5..600c283 100644
--- a/stubs/Biscuit/Auth/UnverifiedBiscuit.php
+++ b/stubs/Biscuit/Auth/UnverifiedBiscuit.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,35 +7,33 @@
 
 class UnverifiedBiscuit
 {
-    public static function fromBase64(string $data) : \Biscuit\Auth\UnverifiedBiscuit
+    public static function fromBase64(string $data): \Biscuit\Auth\UnverifiedBiscuit
     {
     }
 
-    public function rootKeyId() : ?int
+    public function rootKeyId(): null|int
     {
     }
 
-    public function blockCount() : int
+    public function blockCount(): int
     {
     }
 
-    public function blockSource(int $index) : string
+    public function blockSource(int $index): string
     {
     }
 
-    public function append(\Biscuit\Auth\BlockBuilder $block) : \Biscuit\Auth\UnverifiedBiscuit
+    public function append(\Biscuit\Auth\BlockBuilder $block): \Biscuit\Auth\UnverifiedBiscuit
     {
     }
 
-    public function revocationIds() : array
+    public function revocationIds(): array
     {
     }
 
-    public function verify(\Biscuit\Auth\PublicKey $root) : \Biscuit\Auth\Biscuit
+    public function verify(\Biscuit\Auth\PublicKey $root): \Biscuit\Auth\Biscuit
     {
     }
 
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 }
diff --git a/stubs/Biscuit/Exception/AuthorizerError.php b/stubs/Biscuit/Exception/AuthorizerError.php
index 5d92c13..8f3693a 100644
--- a/stubs/Biscuit/Exception/AuthorizerError.php
+++ b/stubs/Biscuit/Exception/AuthorizerError.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,7 +7,5 @@
 
 class AuthorizerError extends \Exception
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 }
diff --git a/stubs/Biscuit/Exception/InvalidCheck.php b/stubs/Biscuit/Exception/InvalidCheck.php
index c89d96c..cd83208 100644
--- a/stubs/Biscuit/Exception/InvalidCheck.php
+++ b/stubs/Biscuit/Exception/InvalidCheck.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,7 +7,5 @@
 
 class InvalidCheck extends \Exception
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 }
diff --git a/stubs/Biscuit/Exception/InvalidFact.php b/stubs/Biscuit/Exception/InvalidFact.php
index e15d8cd..ad515fd 100644
--- a/stubs/Biscuit/Exception/InvalidFact.php
+++ b/stubs/Biscuit/Exception/InvalidFact.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,7 +7,5 @@
 
 class InvalidFact extends \Exception
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 }
diff --git a/stubs/Biscuit/Exception/InvalidPolicy.php b/stubs/Biscuit/Exception/InvalidPolicy.php
index b92aa2b..c38a3fb 100644
--- a/stubs/Biscuit/Exception/InvalidPolicy.php
+++ b/stubs/Biscuit/Exception/InvalidPolicy.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,7 +7,5 @@
 
 class InvalidPolicy extends \Exception
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 }
diff --git a/stubs/Biscuit/Exception/InvalidPrivateKey.php b/stubs/Biscuit/Exception/InvalidPrivateKey.php
index eba8c04..45fe4f1 100644
--- a/stubs/Biscuit/Exception/InvalidPrivateKey.php
+++ b/stubs/Biscuit/Exception/InvalidPrivateKey.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,7 +7,5 @@
 
 class InvalidPrivateKey extends \Exception
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 }
diff --git a/stubs/Biscuit/Exception/InvalidPublicKey.php b/stubs/Biscuit/Exception/InvalidPublicKey.php
index ad45a0a..b6a3398 100644
--- a/stubs/Biscuit/Exception/InvalidPublicKey.php
+++ b/stubs/Biscuit/Exception/InvalidPublicKey.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,7 +7,5 @@
 
 class InvalidPublicKey extends \Exception
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 }
diff --git a/stubs/Biscuit/Exception/InvalidRule.php b/stubs/Biscuit/Exception/InvalidRule.php
index e5a4dd2..aa0e1eb 100644
--- a/stubs/Biscuit/Exception/InvalidRule.php
+++ b/stubs/Biscuit/Exception/InvalidRule.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,7 +7,5 @@
 
 class InvalidRule extends \Exception
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 }
diff --git a/stubs/Biscuit/Exception/InvalidTerm.php b/stubs/Biscuit/Exception/InvalidTerm.php
index 5e8f1b7..573c4dc 100644
--- a/stubs/Biscuit/Exception/InvalidTerm.php
+++ b/stubs/Biscuit/Exception/InvalidTerm.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,7 +7,5 @@
 
 class InvalidTerm extends \Exception
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 }
diff --git a/stubs/Biscuit/Exception/ThirdPartyRequestError.php b/stubs/Biscuit/Exception/ThirdPartyRequestError.php
index 140682d..60d466b 100644
--- a/stubs/Biscuit/Exception/ThirdPartyRequestError.php
+++ b/stubs/Biscuit/Exception/ThirdPartyRequestError.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * auto generated file by PHPExtensionStubGenerator
  */
@@ -6,7 +7,5 @@
 
 class ThirdPartyRequestError extends \Exception
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 }
diff --git a/tests/BiscuitTest.php b/tests/BiscuitTest.php
index 0e6958d..4d36dbc 100644
--- a/tests/BiscuitTest.php
+++ b/tests/BiscuitTest.php
@@ -4,7 +4,6 @@
 
 namespace Biscuit\Tests;
 
-use Biscuit\Auth\Algorithm;
 use Biscuit\Auth\Authorizer;
 use Biscuit\Auth\AuthorizerBuilder;
 use Biscuit\Auth\Biscuit;
diff --git a/tests/KeyPairTest.php b/tests/KeyPairTest.php
index e500de8..865f2c5 100644
--- a/tests/KeyPairTest.php
+++ b/tests/KeyPairTest.php
@@ -4,6 +4,7 @@
 
 namespace Biscuit\Tests;
 
+use Biscuit\Auth\Algorithm;
 use Biscuit\Auth\KeyPair;
 use Biscuit\Auth\PrivateKey;
 use Biscuit\Auth\PublicKey;
@@ -31,7 +32,7 @@ public function testNewWithAlgorithmDefault(): void
 
     public function testNewWithAlgorithmEd25519(): void
     {
-        $keyPair = KeyPair::newWithAlgorithm(0);
+        $keyPair = KeyPair::newWithAlgorithm(Algorithm::Ed25519);
 
         static::assertInstanceOf(KeyPair::class, $keyPair);
         static::assertStringStartsWith('ed25519/', $keyPair->public()->toHex());
@@ -39,7 +40,7 @@ public function testNewWithAlgorithmEd25519(): void
 
     public function testNewWithAlgorithmSecp256r1(): void
     {
-        $keyPair = KeyPair::newWithAlgorithm(1);
+        $keyPair = KeyPair::newWithAlgorithm(Algorithm::Secp256r1);
 
         static::assertInstanceOf(KeyPair::class, $keyPair);
         static::assertStringStartsWith('secp256r1/', $keyPair->public()->toHex());
@@ -112,7 +113,7 @@ public function testPrivateKeyFromBytesWithExplicitAlgorithm(): void
         $privateKey = new PrivateKey($privateKeyHex);
 
         $bytes = $privateKey->toBytes();
-        $reconstructed = PrivateKey::fromBytes(pack('C*', ...$bytes), 0);
+        $reconstructed = PrivateKey::fromBytes(pack('C*', ...$bytes), Algorithm::Ed25519);
 
         static::assertSame($privateKeyHex, $reconstructed->toHex());
     }
@@ -187,7 +188,7 @@ public function testPublicKeyFromBytesWithExplicitAlgorithm(): void
         $publicKey = new PublicKey($publicKeyHex);
 
         $bytes = $publicKey->toBytes();
-        $reconstructed = PublicKey::fromBytes(pack('C*', ...$bytes), 0);
+        $reconstructed = PublicKey::fromBytes(pack('C*', ...$bytes), Algorithm::Ed25519);
 
         static::assertSame($publicKeyHex, $reconstructed->toHex());
     }