Skip to content

Fix falsy string values like "0" being treated as empty #7

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

Open
ritterg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix falsy string values like "0" being treated as empty #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/Setting.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ public static function getValueAsString(string $key, $default = null)

$setting = static::where('key', $key)->first();

return $setting->valueAsString ?: $default;
return $setting->valueAsString ?? $default;
}

/**
Expand All @@ -223,7 +223,7 @@ public static function hasValue(string $key): bool
{
if (self::has($key) && isset(Setting::allSettings()[$key]['value'])) {
$value = Setting::allSettings()[$key]['value'];
return !empty($value) || $value === false || $value === 0 || $value === '';
return $value !== null;
}

return false;
Expand Down
10 changes: 10 additions & 0 deletions tests/Unit/SettingsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,16 @@ public function test_has_value()
$this->assertFalse(Setting::hasValue('no_value'));
}

public function test_falsy_string_values()
{
Setting::create(['key' => 'zero_string', 'value' => '0', 'type' => 'string']);

$this->assertTrue(Setting::hasValue('zero_string'));
$this->assertSame('0', setting('zero_string'));
$this->assertSame('0', settingAsString('zero_string'));
$this->assertSame('0', Setting::getValueAsString('zero_string'));
}

public function test_set_and_get_setting_array()
{
$array = ['hans' => 'dampf', 'in' => 'allen', 'gassen'];
Expand Down
Loading