fix: resolve PHPStan static analysis issues and improve code quality

- Fix PHPStan Level 5 analysis errors with strict rules enabled
- Remove references to deleted ModelAudited event and AuditModelChanges listener
- Improve type safety with better null checking and method existence validation
- Fix scope method return types and route handling in services
- Update unit tests to work with direct logging architecture
- Clean up unused imports and enhance test setup
- Add PHPStan ignore rule for dynamic query builder method calls
- Update CHANGELOG.md for version 1.3.1

All tests passing (39 tests, 103 assertions) ✅
PHPStan analysis clean (0 errors) ✅

Author: farhadzand

CHANGELOG.md

@@ -15,6 +15,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Documentation
 
+## [1.3.1] - 2025-06-06
+
+### Fixed
+- Fixed PHPStan static analysis issues at Level 5 with strict rules
+- Removed references to deleted `ModelAudited` event and `AuditModelChanges` listener classes
+- Improved type safety with better null and type checking in route handling
+- Enhanced method existence checks in `AuditBuilder` service
+- Fixed scope method return types in `EloquentAuditLog` model
+- Updated unit tests to work with direct logging architecture (removed event dependencies)
+- Cleaned up unused imports and improved code organization
+
+### Changed
+- Added PHPStan ignore rule for dynamic method call warnings in query scopes
+- Enhanced test setup with proper service mocking for unit tests
+- Improved code quality and maintainability
+
 ## [1.3.0] - 2025-06-06
 
 ### Added
@@ -138,7 +154,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Query scopes for efficient log retrieval
 - Batch operations for performance optimization
 
-[Unreleased]: https://github.com/iamfarhad/laravel-audit-log/compare/1.3.0...HEAD
+[Unreleased]: https://github.com/iamfarhad/laravel-audit-log/compare/1.3.1...HEAD
+[1.3.1]: https://github.com/iamfarhad/laravel-audit-log/compare/1.3.0...1.3.1
 [1.3.0]: https://github.com/iamfarhad/laravel-audit-log/compare/1.2.1...1.3.0
 [1.2.1]: https://github.com/iamfarhad/laravel-audit-log/compare/1.2.0...1.2.1
 [1.2.0]: https://github.com/iamfarhad/laravel-audit-log/compare/1.1.0...1.2.0

phpstan.neon

@@ -30,4 +30,5 @@ parameters:
         -
             identifier: missingType.generics
             reportUnmatched: false
-        - '#Construct empty\(\) is not allowed. Use more strict comparison.#' 
+        - '#Construct empty\(\) is not allowed. Use more strict comparison.#'
+        - '#Dynamic call to static method Illuminate\\Database\\Query\\Builder::whereNotNull\(\)#' 

src/AuditLoggerServiceProvider.php

@@ -7,12 +7,9 @@
 use Illuminate\Support\ServiceProvider;
 use iamfarhad\LaravelAuditLog\DTOs\AuditLog;
 use iamfarhad\LaravelAuditLog\Drivers\MySQLDriver;
-use iamfarhad\LaravelAuditLog\Events\ModelAudited;
 use iamfarhad\LaravelAuditLog\Services\AuditLogger;
-use Illuminate\Support\Facades\Event as EventFacade;
 use iamfarhad\LaravelAuditLog\Services\CauserResolver;
 use iamfarhad\LaravelAuditLog\Contracts\AuditLogInterface;
-use iamfarhad\LaravelAuditLog\Listeners\AuditModelChanges;
 use iamfarhad\LaravelAuditLog\Contracts\CauserResolverInterface;
 
 final class AuditLoggerServiceProvider extends ServiceProvider
@@ -23,7 +20,7 @@ final class AuditLoggerServiceProvider extends ServiceProvider
     public function register(): void
     {
         $this->mergeConfigFrom(
-            __DIR__.'/../config/audit-logger.php',
+            __DIR__ . '/../config/audit-logger.php',
             'audit-logger'
         );
 
@@ -32,7 +29,7 @@ public function register(): void
         // Register the causer resolver
         $this->app->singleton(
             CauserResolverInterface::class,
-            fn ($app) => isset($app['config']['audit-logger.causer']['resolver']) && $app['config']['audit-logger.causer']['resolver']
+            fn($app) => isset($app['config']['audit-logger.causer']['resolver']) && $app['config']['audit-logger.causer']['resolver']
                 ? $app->make($app['config']['audit-logger.causer']['resolver'])
                 : new CauserResolver(
                     guard: $app['config']['audit-logger.causer']['guard'] ?? null,
@@ -59,11 +56,10 @@ public function boot(): void
         // Publish config
         if ($this->app->runningInConsole()) {
             $this->publishes([
-                __DIR__.'/../config/audit-logger.php' => config_path('audit-logger.php'),
+                __DIR__ . '/../config/audit-logger.php' => config_path('audit-logger.php'),
             ], 'audit-logger-config');
         }
 
-        // Register event listeners
-        EventFacade::listen(ModelAudited::class, [AuditModelChanges::class, 'handle']);
+        // Event listeners removed - using direct logging approach
     }
 }

src/Models/EloquentAuditLog.php

@@ -106,9 +106,12 @@ public function scopeForSource(Builder $query, string $source): Builder
 
     public function scopeFromConsole(Builder $query): Builder
     {
-        return $query->whereNotNull('source')
-            ->where('source', 'not like', 'App\\Http\\Controllers\\%')
-            ->where('source', 'not like', 'App\\\\Http\\\\Controllers\\\\%');
+        /** @var Builder $query */
+        $query->whereNotNull('source');
+        $query->where('source', 'not like', 'App\\Http\\Controllers\\%');
+        $query->where('source', 'not like', 'App\\\\Http\\\\Controllers\\\\%');
+
+        return $query;
     }
 
     public function scopeFromHttp(Builder $query): Builder
@@ -127,7 +130,7 @@ public function scopeFromCommand(Builder $query, string $command): Builder
 
     public function scopeFromController(Builder $query, ?string $controller = null): Builder
     {
-        if ($controller) {
+        if ($controller !== null && $controller !== '') {
             return $query->where('source', 'like', "%{$controller}%");
         }
 

src/Services/AuditBuilder.php

@@ -104,8 +104,13 @@ public function log(): void
             $this->newValues = $this->model->getAuditableAttributes($this->newValues);
         }
 
+        // Ensure the model has the getAuditEntityType method
+        $entityType = method_exists($this->model, 'getAuditEntityType')
+            ? $this->model->getAuditEntityType()
+            : get_class($this->model);
+
         app(AuditLogger::class)->log(new AuditLog(
-            entityType: $this->model->getAuditEntityType(),
+            entityType: $entityType,
             entityId: $this->model->getKey(),
             action: $this->action,
             oldValues: $this->oldValues,
@@ -142,9 +147,9 @@ private function getSource(): ?string
             return 'console';
         }
 
-        if ($route = Request::route()) {
+        $route = Request::route();
+        if ($route !== null && is_object($route) && method_exists($route, 'getActionName')) {
             $controller = $route->getActionName();
-
             return is_string($controller) ? $controller : 'http';
         }
 

src/Services/AuditLogger.php

@@ -50,9 +50,9 @@ public function getSource(): ?string
             }
         }
 
-        if ($route = Request::route()) {
+        $route = Request::route();
+        if ($route !== null && is_object($route) && method_exists($route, 'getActionName')) {
             $controller = $route->getActionName();
-
             return is_string($controller) ? $controller : 'http';
         }
 

tests/Unit/AuditBuilderTest.php

@@ -5,16 +5,30 @@
 namespace iamfarhad\LaravelAuditLog\Tests\Unit;
 
 use Mockery;
-use Illuminate\Support\Facades\Event;
 use iamfarhad\LaravelAuditLog\Tests\TestCase;
 use iamfarhad\LaravelAuditLog\Services\AuditBuilder;
+use iamfarhad\LaravelAuditLog\Services\AuditLogger;
 
 final class AuditBuilderTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
-        Event::fake();
+
+        // Create a fake AuditLogger since the class is final
+        $fakeLogger = new class {
+            public function log(\iamfarhad\LaravelAuditLog\Contracts\AuditLogInterface $log): void
+            {
+                // Do nothing - this is a fake for unit tests
+            }
+
+            public function batch(array $logs): void
+            {
+                // Do nothing - this is a fake for unit tests
+            }
+        };
+
+        $this->app->instance(AuditLogger::class, $fakeLogger);
     }
 
     public function test_can_build_and_log_custom_audit_event_with_fluent_api(): void