Simplify package

CHANGELOG.md

@@ -4,8 +4,17 @@
 
 ### Changed
 
-- `Innmind\HttpAuthentication\Authenticator::__invoke()` now returns an `Innmind\Immutable\Attempt`
-- All resolvers now return an `Innmind\Immutable\Attempt`
+- All authenticators now return an `Innmind\Immutable\Attempt`
+- All authenticators can return any type inside the `Attempt`
+
+### Removed
+
+- All resolvers have been replaced by `callable`s
+- `Innmind\HttpAuthentication\ViaStorage`
+- `Innmind\HttpAuthentication\Any`
+- `Innmind\HttpAuthentication\ValidateAuthorizationHeader`
+- `Innmind\HttpAuthentication\Authenticator`
+- `Innmind\HttpAuthentication\Identity`
 
 ## 4.0.0 - 2023-11-01
 

src/ViaAuthorization.php

@@ -3,7 +3,6 @@
 
 namespace Innmind\HttpAuthentication;
 
-use Innmind\HttpAuthentication\ViaAuthorization\Resolver;
 use Innmind\Http\{
     ServerRequest,
     Header\Authorization,
@@ -14,15 +13,25 @@
     Predicate\Instance,
 };
 
-final class ViaAuthorization implements Authenticator
+/**
+ * @template T
+ */
+final class ViaAuthorization
 {
-    private Resolver $resolve;
+    /** @var callable(AuthorizationValue): Attempt<T> */
+    private $resolve;
 
-    public function __construct(Resolver $resolve)
+    /**
+     * @param callable(AuthorizationValue): Attempt<T> $resolve
+     */
+    public function __construct(callable $resolve)
     {
         $this->resolve = $resolve;
     }
 
+    /**
+     * @return Attempt<T>
+     */
     public function __invoke(ServerRequest $request): Attempt
     {
         return $request

src/ViaBasicAuthorization.php

@@ -3,22 +3,31 @@
 
 namespace Innmind\HttpAuthentication;
 
-use Innmind\HttpAuthentication\ViaBasicAuthorization\Resolver;
 use Innmind\Http\{
     ServerRequest,
     Header\Authorization,
 };
 use Innmind\Immutable\Attempt;
 
-final class ViaBasicAuthorization implements Authenticator
+/**
+ * @template T
+ */
+final class ViaBasicAuthorization
 {
-    private Resolver $resolve;
+    /** @var callable(string, string): Attempt<T> */
+    private $resolve;
 
-    public function __construct(Resolver $resolve)
+    /**
+     * @param callable(string, string): Attempt<T> $resolve
+     */
+    public function __construct(callable $resolve)
     {
         $this->resolve = $resolve;
     }
 
+    /**
+     * @return Attempt<T>
+     */
     public function __invoke(ServerRequest $request): Attempt
     {
         return $request

src/ViaForm.php

@@ -3,25 +3,35 @@
 
 namespace Innmind\HttpAuthentication;
 
-use Innmind\HttpAuthentication\ViaForm\Resolver;
 use Innmind\Http\{
     ServerRequest,
+    ServerRequest\Form,
     Method,
 };
 use Innmind\Immutable\{
     Maybe,
     Attempt,
 };
 
-final class ViaForm implements Authenticator
+/**
+ * @template T
+ */
+final class ViaForm
 {
-    private Resolver $resolve;
+    /** @var callable(Form): Attempt<T> */
+    private $resolve;
 
-    public function __construct(Resolver $resolve)
+    /**
+     * @param callable(Form): Attempt<T> $resolve
+     */
+    public function __construct(callable $resolve)
     {
         $this->resolve = $resolve;
     }
 
+    /**
+     * @return Attempt<T>
+     */
     public function __invoke(ServerRequest $request): Attempt
     {
         return Maybe::just($request)