update

Author: asbiin

src/Events/EventDispatcher.php

@@ -19,6 +19,7 @@ public function __construct(
      *
      * @return object
      */
+    #[\Override]
     public function dispatch(object $event)
     {
         $this->dispatcher->dispatch($event);

src/Http/Controllers/ConfirmableKeyController.php

@@ -13,20 +13,11 @@
 
 class ConfirmableKeyController extends Controller
 {
-    /**
-     * The guard implementation.
-     *
-     * @var \Illuminate\Contracts\Auth\StatefulGuard
-     */
-    protected $guard;
-
     /**
      * Create a new controller instance.
      */
-    public function __construct(StatefulGuard $guard)
-    {
-        $this->guard = $guard;
-    }
+    public function __construct(
+        protected StatefulGuard $guard) {}
 
     /**
      * Confirm the user's key.

src/WebauthnServiceProvider.php

@@ -35,6 +35,7 @@
 use LaravelWebauthn\Http\Responses\RegisterViewResponse;
 use LaravelWebauthn\Http\Responses\UpdateResponse;
 use LaravelWebauthn\Services\Webauthn;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
@@ -46,7 +47,6 @@
 use Symfony\Component\Serializer\SerializerInterface;
 use Webauthn\AttestationStatement\AndroidKeyAttestationStatementSupport;
 use Webauthn\AttestationStatement\AppleAttestationStatementSupport;
-use Webauthn\AttestationStatement\AttestationObjectLoader;
 use Webauthn\AttestationStatement\AttestationStatementSupportManager;
 use Webauthn\AttestationStatement\FidoU2FAttestationStatementSupport;
 use Webauthn\AttestationStatement\NoneAttestationStatementSupport;
@@ -68,6 +68,24 @@
  */
 class WebauthnServiceProvider extends ServiceProvider
 {
+    /**
+     * All of the container singletons that should be registered.
+     *
+     * @var array
+     */
+    public $singletons = [
+        WebauthnFacade::class => Webauthn::class,
+        DestroyResponseContract::class => DestroyResponse::class,
+        LoginSuccessResponseContract::class => LoginSuccessResponse::class,
+        LoginViewResponseContract::class => LoginViewResponse::class,
+        RegisterSuccessResponseContract::class => RegisterSuccessResponse::class,
+        RegisterViewResponseContract::class => RegisterViewResponse::class,
+        UpdateResponseContract::class => UpdateResponse::class,
+        KeyConfirmedResponseContract::class => KeyConfirmedResponse::class,
+        FailedKeyConfirmedResponseContract::class => FailedKeyConfirmedResponse::class,
+        EventDispatcherInterface::class => EventDispatcher::class,
+    ];
+
     /**
      * Bootstrap any application services.
      */
@@ -85,18 +103,14 @@ public function boot(): void
     #[\Override]
     public function register(): void
     {
-        $this->app->bind('webauthn.log', fn ($app) => $app['log']->channel(config('webauthn.log', config('logging.default'))));
-
-        $this->app->singleton(WebauthnFacade::class, Webauthn::class);
-
-        $this->registerResponseBindings();
         $this->bindWebAuthnPackage();
         $this->bindPsrInterfaces();
 
         $this->mergeConfigFrom(
             __DIR__.'/../config/webauthn.php', 'webauthn'
         );
 
+        $this->app->bind('webauthn.log', fn ($app) => $app['log']->channel(config('webauthn.log', config('logging.default'))));
         $this->app->bind(StatefulGuard::class, fn () => Auth::guard(config('webauthn.guard', null)));
     }
 
@@ -116,36 +130,14 @@ private function configureRoutes(): void
         }
     }
 
-    /**
-     * Register the response bindings.
-     */
-    public function registerResponseBindings(): void
-    {
-        $this->app->singleton(DestroyResponseContract::class, DestroyResponse::class);
-        $this->app->singleton(LoginSuccessResponseContract::class, LoginSuccessResponse::class);
-        $this->app->singleton(LoginViewResponseContract::class, LoginViewResponse::class);
-        $this->app->singleton(RegisterSuccessResponseContract::class, RegisterSuccessResponse::class);
-        $this->app->singleton(RegisterViewResponseContract::class, RegisterViewResponse::class);
-        $this->app->singleton(UpdateResponseContract::class, UpdateResponse::class);
-        $this->app->singleton(KeyConfirmedResponseContract::class, KeyConfirmedResponse::class);
-        $this->app->singleton(FailedKeyConfirmedResponseContract::class, FailedKeyConfirmedResponse::class);
-    }
-
     /**
      * Bind all the WebAuthn package services to the Service Container.
      */
     protected function bindWebAuthnPackage(): void
     {
-        $this->app->singleton(EventDispatcher::class);
-        $this->app->resolving(CanDispatchEvents::class, fn (CanDispatchEvents $object) => $object->setEventDispatcher($this->app[EventDispatcher::class]));
+        $this->app->resolving(CanDispatchEvents::class, fn (CanDispatchEvents $object) => $object->setEventDispatcher($this->app[EventDispatcherInterface::class]));
         $this->app->resolving(CanLogData::class, fn (CanLogData $object) => $object->setLogger($this->app['webauthn.log']));
 
-        $this->app->bind(
-            PackedAttestationStatementSupport::class,
-            fn ($app) => new PackedAttestationStatementSupport(
-                algorithmManager: $app[CoseAlgorithmManager::class]
-            )
-        );
         $this->app->bind(
             AttestationStatementSupportManager::class,
             fn ($app) => tap(new AttestationStatementSupportManager, function ($manager) use ($app) {
@@ -168,12 +160,6 @@ protected function bindWebAuthnPackage(): void
                 }
             })
         );
-        $this->app->bind(
-            AttestationObjectLoader::class,
-            fn ($app) => new AttestationObjectLoader(
-                attestationStatementSupportManager: $app[AttestationStatementSupportManager::class]
-            )
-        );
         $this->app->bind(
             SerializerInterface::class,
             fn ($app) => (new \Webauthn\Denormalizer\WebauthnSerializerFactory($app[AttestationStatementSupportManager::class]))->create()