bugfix and nullable return types

Author: justijndepover

src/Drivers/Database.php

@@ -24,7 +24,7 @@ public function all(): Collection
         $this->resetScopes();
     }
 
-    public function get(string $key, string $default = ''): string
+    public function get(string $key, string $default = null): ?string
     {
         $this->fetchSettings();
 

src/Settings.php

@@ -8,7 +8,7 @@ interface Settings
 {
     public function all(): Collection;
 
-    public function get(string $key, string $default = ''): string;
+    public function get(string $key, string $default = null): ?string;
 
     public function set($key, string $value = null): void;
 

src/helpers.php

@@ -5,7 +5,7 @@ function settings(string $key = null, string $default = null)
     {
         $settings = app()->make(Justijndepover\Settings\Settings::class);
 
-        if (!is_null($key)) {
+        if (! is_null($key)) {
             return $settings->get($key, $default);
         }
 

tests/Feature/DatabaseSettingsTest.php

@@ -86,6 +86,7 @@ public function it_can_check_if_value_exists()
         ]);
 
         $this->assertEquals($this->settings->has('name'), true);
+        $this->assertEquals($this->settings->has('name2'), false);
     }
 
     /** @test */
@@ -148,6 +149,17 @@ public function it_can_delete_a_single_value()
         $this->assertEquals(DB::table('settings')->count(), 1);
     }
 
+    /** @test */
+    public function it_has_a_helper_method()
+    {
+        DB::table('settings')->insert([
+            'key' => 'name',
+            'value' => 'value',
+        ]);
+
+        $this->assertEquals(settings('name'), 'value');
+    }
+
     /** @test */
     public function it_has_a_facade_accessor()
     {
@@ -265,4 +277,14 @@ public function it_has_a_working_user_setting_trait()
         $this->assertEquals($user->settings->get('name'), 'value');
         $this->assertEquals($user->settings()->get('name'), 'value');
     }
+
+    /** @test */
+    public function it_can_return_a_default_value()
+    {
+        $value = $this->settings->get('key');
+        $this->assertEquals($value, null);
+
+        $value = $this->settings->get('key', 'value');
+        $this->assertEquals($value, 'value');
+    }
 }