Merge branch 'dev' of github.com:doubleleft/hook into dev

config/preferences.php

@@ -1,6 +1,28 @@
 <?php
 
 return array(
+    /**
+     * Application timezone
+     * --------------------
+     */
     'timezone' => 'America/Sao_Paulo',
-    'debug' => true
+
+    /**
+     * Debug mode
+     * ----------
+     * If true, outputs all database queries and
+     * requests on application's log file.
+     */
+    'debug' => true,
+
+    /**
+     * Cache
+     * -----
+     *
+     * Available options:
+     *
+     * - filesystem
+     * - database
+     */
+    'cache' => 'database'
 );

src/Cache/Cache.php

@@ -12,7 +12,6 @@ public static function getInstance()
     {
         if (!static::$instance) {
             $connection = \DLModel::getConnectionResolver()->connection();
-
             $cache_manager = $connection->getCacheManager();
             $default_driver = $cache_manager->getDefaultDriver();
             static::$instance = $cache_manager->driver($default_driver);

src/Hook.php

@@ -2,17 +2,15 @@
 // global helpers
 require __DIR__ . '/bootstrap/helpers.php';
 
-$config = array();
-$preferences = require(__DIR__ . '/../config/preferences.php');
-date_default_timezone_set($preferences['timezone']);
+$config = require(__DIR__ . '/../config/preferences.php');
+date_default_timezone_set($config['timezone']);
 
-if ($preferences['debug']) {
+if ($config['debug']) {
     ini_set('display_errors', 1);
     error_reporting(E_ALL);
 }
 
-$config['debug'] = $preferences['debug'];
-$config['log.enabled'] = $preferences['debug'];
+$config['log.enabled'] = $config['debug'];
 
 // Merge settings with security config
 $config = array_merge($config, require(__DIR__ . '/../config/security.php'));

src/bootstrap/connection.php

@@ -53,21 +53,31 @@ class_alias('\Illuminate\Database\Eloquent\Model', 'DLModel');
 
 // Setup cache manager
 $connection->setCacheManager(function () {
-    return new Illuminate\Cache\CacheManager(array(
-        'db' => \DLModel::getConnectionResolver(),
-        'encrypter' => Hook\Encryption\Encrypter::getInstance(),
-
-        // 'files' => new \Illuminate\Filesystem\Filesystem(),
-        'config' => array(
-            'cache.driver' => 'database',
-            'cache.connection' => 'default',
-            'cache.table' => 'cache',
-            'cache.prefix' => ''
-
-            // 'cache.driver' => 'file',
-            // 'cache.path' => storage_dir() . '/cache'
-        )
-    ));
+    $cache_driver = \Slim\Slim::getInstance()->config('cache');
+
+    if ($cache_driver == "filesystem") {
+        $config = array(
+            'files' => new \Illuminate\Filesystem\Filesystem(),
+            'config' => array(
+                'cache.driver' => 'file',
+                'cache.path' => storage_dir() . '/cache'
+            )
+        );
+
+    } else if ($cache_driver == "database") {
+        $config = array(
+            'db' => \DLModel::getConnectionResolver(),
+            'encrypter' => Hook\Encryption\Encrypter::getInstance(),
+            'config' => array(
+                'cache.driver' => 'database',
+                'cache.connection' => 'default',
+                'cache.table' => 'cache',
+                'cache.prefix' => ''
+            )
+        );
+    }
+
+    return new Illuminate\Cache\CacheManager($config);
 });
 
 //