auditExclude merge versus replace #969
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…lude Allows for merging the model's audit exclude with the config default exclude list, instead of replacing it.
When getting the auditExclude values, check for global config audit.exclude_merge property and merge if enabled, instead of replace. Otherwise, check locally at the model level.
…ude-merge AuditExclude merge feature
Simplify the merge condition check
| @@ -144,8 +144,7 @@ protected function resolveAuditExclusions() | |||
| public function getAuditExclude(): array | |||
| { | |||
| if ( | |||
| Config::get('audit.exclude_merge', false) || | |||
| ($this->auditExcludeMerge ?? false) | |||
| $this->auditExcludeMerge ?? Config::get('audit.exclude_merge', false) | |||
There was a problem hiding this comment.
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')) {There was a problem hiding this comment.
Apologies, now I understand. Code updated.
There was a problem hiding this comment.
Code updated.
the 'false' is still there 😕
willpower232
requested changes
Sep 19, 2024
There was a problem hiding this comment.
as mentioned by @parallels999, the , false) is not necessary
it would also be good to see a few tests for the different combinations of the auditExcludeMerge property and the config value
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Allows for merging the local auditExclude values into the global exclude list instead of replacing it.