From 10ffb1bbae6e8676953aa8cef3b1f65963ff0df9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 15:49:45 +0900
Subject: [PATCH 1/5] refactor: remove unneeded `return`

Settings::set() returns void.
---
 src/Helpers/setting_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Helpers/setting_helper.php b/src/Helpers/setting_helper.php
index fa91380..b190085 100644
--- a/src/Helpers/setting_helper.php
+++ b/src/Helpers/setting_helper.php
@@ -22,6 +22,6 @@ function setting(?string $key = null, $value = null)
         }
 
         // Setting the value
-        return $setting->set($key, $value);
+        $setting->set($key, $value);
     }
 }

From 19c8d3c0610a7560b7e2936ba09691ee221cde3e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 15:52:09 +0900
Subject: [PATCH 2/5] docs: improve @return

---
 src/Helpers/setting_helper.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Helpers/setting_helper.php b/src/Helpers/setting_helper.php
index b190085..c2457f8 100644
--- a/src/Helpers/setting_helper.php
+++ b/src/Helpers/setting_helper.php
@@ -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)) {

From 4255258200101193234d056939b3a8c1f9bcb6d5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 15:55:02 +0900
Subject: [PATCH 3/5] docs: remove uneeded @var

---
 src/Config/Services.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Config/Services.php b/src/Config/Services.php
index d7862f5..f08a742 100644
--- a/src/Config/Services.php
+++ b/src/Config/Services.php
@@ -30,7 +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);

From 2c929ab5738e9e244f8e418feeffc5354ffb9061 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 15:55:20 +0900
Subject: [PATCH 4/5] refactor: run php-cs-fixer

---
 src/Config/Services.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Config/Services.php b/src/Config/Services.php
index f08a742..5a26837 100644
--- a/src/Config/Services.php
+++ b/src/Config/Services.php
@@ -30,7 +30,7 @@ public static function settings(?SettingsConfig $config = null, bool $getShared
             return static::getSharedInstance('settings', $config);
         }
 
-        $config = $config ?? config('Settings');
+        $config ??= config('Settings');
 
         return new Settings($config);
     }

From b233e113dbd1fa4c5ec64d59bdae0b9f29778dd5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 25 Apr 2022 08:31:14 +0900
Subject: [PATCH 5/5] refactor: remove intermediate variable

---
 src/Config/Services.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Config/Services.php b/src/Config/Services.php
index 5a26837..f4fca95 100644
--- a/src/Config/Services.php
+++ b/src/Config/Services.php
@@ -30,8 +30,6 @@ public static function settings(?SettingsConfig $config = null, bool $getShared
             return static::getSharedInstance('settings', $config);
         }
 
-        $config ??= config('Settings');
-
-        return new Settings($config);
+        return new Settings($config ?? config('Settings'));
     }
 }