Skip to content

Commit

Permalink
Fix Laravel 11 event auto-discovery by registering listeners in Audit…
Browse files Browse the repository at this point in the history
…ingServiceProvider (#916)

* Register event listeners directly in AuditingServiceProvider for L11 compatibility
Eliminate AuditingEventServiceProvider which interfered with L11 event auto-discovery, EventServiceProvider::shouldDiscoverEvents()

* Use Event facade to register listeners
  • Loading branch information
onlime committed Apr 29, 2024
1 parent a08c673 commit 2be6a9c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 41 deletions.
38 changes: 0 additions & 38 deletions src/AuditingEventServiceProvider.php

This file was deleted.

11 changes: 8 additions & 3 deletions src/AuditingServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@

namespace OwenIt\Auditing;

use Illuminate\Contracts\Support\DeferrableProvider;
use Illuminate\Support\Facades\Event;
use Illuminate\Support\ServiceProvider;
use OwenIt\Auditing\Console\AuditDriverCommand;
use OwenIt\Auditing\Console\AuditResolverCommand;
use OwenIt\Auditing\Console\InstallCommand;
use OwenIt\Auditing\Contracts\Auditor;
use OwenIt\Auditing\Events\AuditCustom;
use OwenIt\Auditing\Events\DispatchAudit;
use OwenIt\Auditing\Listeners\ProcessDispatchAudit;
use OwenIt\Auditing\Listeners\RecordCustomAudit;

class AuditingServiceProvider extends ServiceProvider
{
Expand All @@ -20,6 +24,9 @@ public function boot()
{
$this->registerPublishing();
$this->mergeConfigFrom(__DIR__ . '/../config/audit.php', 'audit');

Event::listen(AuditCustom::class, RecordCustomAudit::class);
Event::listen(DispatchAudit::class, ProcessDispatchAudit::class);
}

/**
Expand All @@ -38,8 +45,6 @@ public function register()
$this->app->singleton(Auditor::class, function ($app) {
return new \OwenIt\Auditing\Auditor($app);
});

$this->app->register(AuditingEventServiceProvider::class);
}

/**
Expand Down

0 comments on commit 2be6a9c

Please sign in to comment.