Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/Config/Services.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ public static function settings(bool $getShared = true): Settings
return static::getSharedInstance('settings');
}

return new Settings();
return new Settings(config('Settings'));
}
}
13 changes: 9 additions & 4 deletions src/Settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down
11 changes: 11 additions & 0 deletions tests/SettingsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down