Merge pull request #15 from codeigniter4/config-inject

Author: MGatner

src/Config/Services.php

@@ -29,6 +29,6 @@ public static function settings(bool $getShared = true): Settings
             return static::getSharedInstance('settings');
         }
 
-        return new Settings();
+        return new Settings(config('Settings'));
     }
 }

src/Settings.php

@@ -2,6 +2,8 @@
 
 namespace Sparks\Settings;
 
+use Sparks\Settings\Config\Settings as SettingsConfig;
+
 /**
  * Allows developers a single location to store and
  * retrieve settings that were original set in config files
@@ -27,18 +29,21 @@ class Settings
     /**
      * Grabs instances of our handlers.
      */
-    public function __construct()
+    public function __construct(?SettingsConfig $config = null)
     {
-        foreach (config('Settings')->handlers as $handler) {
-            $class = config('Settings')->{$handler}['class'] ?? null;
+        /** @var SettingsConfig $config */
+        $config = $config ?? config('Settings');
+
+        foreach ($config->handlers as $handler) {
+            $class = $config->{$handler}['class'] ?? null;
 
             if ($class === null) {
                 continue;
             }
 
             $this->handlers[$handler] = new $class();
 
-            $writeable = config('Settings')->{$handler}['writeable'] ?? null;
+            $writeable = $config->{$handler}['writeable'] ?? null;
 
             if ($writeable) {
                 $this->writeHandler = $handler;

tests/SettingsTest.php

@@ -16,6 +16,17 @@ final class SettingsTest extends TestCase
 {
     use DatabaseTestTrait;
 
+    public function testSettingsUsesParameter()
+    {
+        $config           = config('Settings');
+        $config->handlers = [];
+
+        $settings = new Settings($config);
+        $result   = $this->getPrivateProperty($settings, 'handlers');
+
+        $this->assertSame([], $result);
+    }
+
     public function testSettingsGetsFromConfig()
     {
         $settings = new Settings();