Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

auditExclude merge versus replace #969

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

auditExclude merge versus replace #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2be6f07
allows for merging excludes into the config exclude list
gravitymedianet Sep 18, 2024
ece16e5
Update Auditable.php - Merge local model auditExclude with config exc…
gravitymedianet Sep 18, 2024
6d8ca0f
Update audit.php
gravitymedianet Sep 18, 2024
124aa52
Update Auditable.php - check for global auditExclude property
gravitymedianet Sep 18, 2024
f0cbfbf
Merge pull request #1 from gravitymedianet/gravitymedianet-audit-excl…
gravitymedianet Sep 18, 2024
dac39b9
Update Auditable.php
gravitymedianet Sep 18, 2024
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
13 changes: 13 additions & 0 deletions config/audit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,19 @@

'exclude' => [],

/*
|--------------------------------------------------------------------------
| Global exclusion merge
|--------------------------------------------------------------------------
|
| If set to true, the local model auditExclude array values will be
| merged with the config exclude array values instead of replacing
| them.
|
*/

'exclude_merge' => false,

/*
|--------------------------------------------------------------------------
| Empty Values
Expand Down
6 changes: 6 additions & 0 deletions src/Auditable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,12 @@ protected function resolveAuditExclusions()
*/
public function getAuditExclude(): array
{
if (
$this->auditExcludeMerge ?? Config::get('audit.exclude_merge', false)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that you decided not to follow the instructions

the false is not necessary, the default is null and the null on a if is already false

if ($this->auditExcludeMerge ?? Config::get('audit.exclude_merge')) {

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologies, now I understand. Code updated.

Copy link

@parallels999 parallels999 Sep 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code updated.

the 'false' is still there 😕

) {
erikn69 marked this conversation as resolved.
Show resolved Hide resolved
return array_merge($this->auditExclude ?? [], Config::get('audit.exclude', []));
}

return $this->auditExclude ?? Config::get('audit.exclude', []);
}

Expand Down