Overall improvements

nova-framework · Jul 1, 2019 · c5a0a5f · c5a0a5f
1 parent 93d6214
commit c5a0a5f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/app/Bootstrap.php b/app/Bootstrap.php
@@ -8,17 +8,18 @@
 //--------------------------------------------------------------------------
 
 if (CONFIG_STORE === 'database') {
+
     // Retrieve the Option items, caching them for 24 hours.
     $options = Cache::remember('system_options', 1440, function ()
     {
-        return Option::getResults();
+        return Option::all();
     });
 
     // Setup the information stored on the Option instances into Configuration.
     foreach ($options as $option) {
-        list ($key, $value) = $option->getConfigItem();
+        $key = $option->getConfigKey();
 
-        Config::set($key, $value);
+        Config::set($key, $option->value);
     }
 }
 

diff --git a/app/Models/Option.php b/app/Models/Option.php
@@ -33,35 +33,31 @@ public function setValueAttribute($value)
         $this->attributes['value'] = $this->maybeEncode($value);
     }
 
-    public function getConfigItem()
+    public function getConfigKey()
     {
         if (! empty($namespace = $this->getAttribute('namespace'))) {
-            $key = $namespace .'::';
-        } else {
-            $key = '';
+            $namespace .= '::';
         }
 
-        $key .= $this->getAttribute('group');
+        $key = $namespace .$this->getAttribute('group');
 
         if (! empty($item = $this->getAttribute('item'))) {
-            $key .= '.' .$item;
+            return $key .'.' .$item;
         }
 
-        return array($key, $this->getAttribute('value'));
+        return $key;
     }
 
-    public static function getResults()
+    public static function all($columns = array('*'))
     {
-        $instance = new static();
-
         try {
-            return $instance->newQuery()->get();
+            return parent::all($columns);
         }
         catch (PDOException | QueryException $e) {
             //
         }
 
-        return $instance->newCollection();
+        return with(new static())->newCollection();
     }
 
     public static function set($key, $value)
@@ -75,11 +71,11 @@ public static function set($key, $value)
 
     protected static function getItemResolver()
     {
-        if (! isset(static::$itemResolver)) {
-            return static::$itemResolver = new NamespacedItemResolver();
+        if (isset(static::$itemResolver)) {
+            return static::$itemResolver;
         }
 
-        return static::$itemResolver;
+        return static::$itemResolver = new NamespacedItemResolver();
     }
 
     /**

diff --git a/app/Platform/Bootstrap.php b/app/Platform/Bootstrap.php
@@ -14,7 +14,7 @@
 // Define The Application Version
 //--------------------------------------------------------------------------
 
-define('VERSION', '4.1.12');
+define('VERSION', '4.1.13');
 
 //--------------------------------------------------------------------------
 // Set PHP Error Reporting Options