Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions src/Auditable.php
Original file line number Diff line number Diff line change
Expand Up @@ -361,14 +361,6 @@ protected function resolveUser()

$userResolver = Config::get('audit.user.resolver');

if (is_null($userResolver) && Config::has('audit.resolver') && ! Config::has('audit.user.resolver')) {
trigger_error(
'The config file audit.php is not updated to the new version 13.0. Please see https://laravel-auditing.com/guide/upgrading.html',
E_USER_DEPRECATED
);
$userResolver = Config::get('audit.resolver.user');
}

if (is_subclass_of($userResolver, \OwenIt\Auditing\Contracts\UserResolver::class)) {
return call_user_func([$userResolver, 'resolve'], $this);
}
Expand All @@ -381,11 +373,9 @@ protected function runResolvers(): array
$resolved = [];
$resolvers = Config::get('audit.resolvers', []);
if (empty($resolvers) && Config::has('audit.resolver')) {
trigger_error(
'The config file audit.php is not updated to the new version 13.0. Please see https://laravel-auditing.com/guide/upgrading.html',
E_USER_DEPRECATED
throw new AuditingException(
'The config file audit.php is not updated. Please see https://laravel-auditing.com/guide/upgrading.html'
);
$resolvers = Config::get('audit.resolver', []);
}

foreach ($resolvers as $name => $implementation) {
Expand Down
15 changes: 0 additions & 15 deletions src/Contracts/IpAddressResolver.php

This file was deleted.

2 changes: 1 addition & 1 deletion src/Contracts/Resolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

interface Resolver
{
/** @return string */
/** @return mixed */
public static function resolve(Auditable $auditable);
}
15 changes: 0 additions & 15 deletions src/Contracts/UrlResolver.php

This file was deleted.

17 changes: 0 additions & 17 deletions src/Contracts/UserAgentResolver.php

This file was deleted.