Minor fixes

src/Contracts/Store.php

@@ -16,8 +16,8 @@ interface Store
     /**
      * Get a specific key from the settings data.
      *
-     * @param  string|array  $key
-     * @param  mixed         $default
+     * @param  string  $key
+     * @param  mixed   $default
      *
      * @return mixed
      */

src/SettingsManager.php

@@ -24,7 +24,7 @@ class SettingsManager extends Manager implements SettingsManagerContract
      */
     public function getDefaultDriver()
     {
-        return $this->app['config']->get('settings.default', 'json');
+        return $this->config()->get('settings.default', 'json');
     }
 
     /* -----------------------------------------------------------------
@@ -82,7 +82,7 @@ private function getConfig($key, $default = null)
      */
     private function registerDriver($driver, array $configs)
     {
-        $this->extend($driver, function () use ($driver, $configs) {
+        $this->extend($driver, function () use ($configs) {
             return new $configs['driver'](
                 $this->app, Arr::get($configs, 'options', [])
             );

src/Stores/AbstractStore.php

@@ -77,8 +77,8 @@ abstract protected function postOptions(array $options);
     /**
      * Get a specific key from the settings data.
      *
-     * @param  string|array  $key
-     * @param  mixed         $default
+     * @param  string  $key
+     * @param  mixed   $default
      *
      * @return mixed
      */

src/Stores/DatabaseStore.php

@@ -187,12 +187,12 @@ public function forget($key)
         $segments = explode('.', $key);
         array_pop($segments);
 
-        while ($segments) {
+        while ( ! empty($segments)) {
             $segment = implode('.', $segments);
+
             // non-empty array - exit out of the loop
-            if ($this->get($segment)) {
-                break;
-            }
+            if ($this->get($segment)) break;
+
             // remove the empty array and move on to the next segment
             $this->forget($segment);
             array_pop($segments);

src/Stores/JsonStore.php

@@ -72,7 +72,7 @@ protected function read()
             throw new RuntimeException("Invalid JSON file in [{$this->path}]");
         }
 
-        return $data;
+        return (array) $data;
     }
 
     /**