feat: Settings - Decouple from shield #1220
Open
+164
−126
Conversation
This file contains hidden or 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
najdanovicivan
commented
Nov 4, 2024
Comment on lines
+47
to
+76
|
|
||
| if (! function_exists('shieldSetting')) { | ||
| /** | ||
| * Provides a wrapper function for settings module. | ||
| * | ||
| * @param mixed $value | ||
| * | ||
| * @return array|bool|float|int|object|string|void|null | ||
| * @phpstan-return ($value is null ? array|bool|float|int|object|string|null : void) | ||
| */ | ||
| function shieldSetting(?string $key = null, $value = null) | ||
| { | ||
| /** @var AuthConfig $config */ | ||
| $config = config('Auth'); | ||
| if($config->useSettings) { | ||
| return setting($key, $value); | ||
| } | ||
|
|
||
| // Getting the value? | ||
| if (!empty($key) && count(func_get_args()) === 1) { | ||
| $parts = explode('.', $key); | ||
| if (count($parts) === 1) { | ||
| throw new InvalidArgumentException('$key must contain both the class and field name, i.e. Foo.bar'); | ||
| } | ||
| return config($parts[0])?->{$parts[1]} ?? null; | ||
| } | ||
|
|
||
| throw new InvalidArgumentException('Settings library is not being used for shield'); | ||
| } | ||
| } |
There was a problem hiding this comment.
This is the important part. With the proposed change call to setting() method will only occur here.
najdanovicivan
changed the title
datamweb
changed the title
|
Yes, it would be great to decouple Shield and Settings packages. Personally, I don't see a lot of sense of having the Settings dependency here, because CodeIgniter already has BaseConfig to handle settings. |
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.
Description
Decouple settings library so it is not required.
Related to #1215
Checklist: