Skip to content

refactor: improve @return of setting() #32

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

Merged
merged 5 commits into from
Apr 25, 2022
Merged

refactor: improve @return of setting() #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
10ffb1b
refactor: remove unneeded `return`
kenjis Apr 21, 2022
19c8d3c
docs: improve @return
kenjis Apr 21, 2022
4255258
docs: remove uneeded @var
kenjis Apr 21, 2022
2c929ab
refactor: run php-cs-fixer
kenjis Apr 21, 2022
b233e11
refactor: remove intermediate variable
kenjis Apr 24, 2022
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
5 changes: 1 addition & 4 deletions src/Config/Services.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ public static function settings(?SettingsConfig $config = null, bool $getShared
return static::getSharedInstance('settings', $config);
}

/** @var SettingsConfig $config */
$config = $config ?? config('Settings');

return new Settings($config);
return new Settings($config ?? config('Settings'));
}
}
7 changes: 5 additions & 2 deletions src/Helpers/setting_helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
<?php

use CodeIgniter\Settings\Settings;

if (! function_exists('setting')) {
/**
* Provides a convenience interface to the Settings service.
*
* @param mixed|null $value
*
* @return mixed
* @return array|bool|float|int|object|Settings|string|void|null
*/
function setting(?string $key = null, $value = null)
{
/** @var Settings $setting */
$setting = service('settings');

if (empty($key)) {
Expand All @@ -22,6 +25,6 @@ function setting(?string $key = null, $value = null)
}

// Setting the value
return $setting->set($key, $value);
$setting->set($key, $value);
}
}