4 files changed, 25 insertions, 25 deletions
diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php
index 39a32cf6..f8d20262 100644
--- a/app/ServiceProvider/ClassProvider.php
+++ b/app/ServiceProvider/ClassProvider.php
@@ -52,6 +52,8 @@ class ClassProvider implements ServiceProviderInterface
         'Core' => array(
             'Template',
             'Session',
+            'MemoryCache',
+            'FileCache',
         ),
         'Integration' => array(
             'GitlabWebhook',
diff --git a/app/ServiceProvider/DatabaseProvider.php b/app/ServiceProvider/DatabaseProvider.php
index 632b0238..4218f5ff 100644
--- a/app/ServiceProvider/DatabaseProvider.php
+++ b/app/ServiceProvider/DatabaseProvider.php
@@ -12,6 +12,7 @@ class DatabaseProvider implements ServiceProviderInterface
     {
         $container['db'] = $this->getInstance();
         $container['db']->stopwatch = DEBUG;
+        $container['db']->log_queries = DEBUG;
     }
 
     /**
diff --git a/app/ServiceProvider/LoggingProvider.php b/app/ServiceProvider/LoggingProvider.php
index f5e70381..5b2cf565 100644
--- a/app/ServiceProvider/LoggingProvider.php
+++ b/app/ServiceProvider/LoggingProvider.php
@@ -4,19 +4,19 @@ namespace ServiceProvider;
 
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
-use Monolog\Logger;
-use Monolog\Handler\StreamHandler;
-use Monolog\Handler\SyslogHandler;
+use SimpleLogger\Logger;
+use SimpleLogger\Syslog;
+use SimpleLogger\File;
 
 class LoggingProvider implements ServiceProviderInterface
 {
     public function register(Container $container)
     {
-        $logger = new Logger('app');
-        $logger->pushHandler(new SyslogHandler('kanboard', LOG_USER, Logger::INFO));
+        $logger = new Logger;
+        $logger->setLogger(new Syslog('kanboard'));
 
         if (DEBUG) {
-            $logger->pushHandler(new StreamHandler(__DIR__.'/../../data/debug.log', Logger::DEBUG));
+            $logger->setLogger(new File(__DIR__.'/../../data/debug.log'));
         }
 
         $container['logger'] = $logger;
diff --git a/app/ServiceProvider/MailerProvider.php b/app/ServiceProvider/MailerProvider.php
index f6b71363..6469a737 100644
--- a/app/ServiceProvider/MailerProvider.php
+++ b/app/ServiceProvider/MailerProvider.php
@@ -12,25 +12,22 @@ class MailerProvider implements ServiceProviderInterface
 {
     public function register(Container $container)
     {
-        $container['mailer'] = $this->getInstance();
-    }
-
-    public function getInstance()
-    {
-        switch (MAIL_TRANSPORT) {
-            case 'smtp':
-                $transport = Swift_SmtpTransport::newInstance(MAIL_SMTP_HOSTNAME, MAIL_SMTP_PORT);
-                $transport->setUsername(MAIL_SMTP_USERNAME);
-                $transport->setPassword(MAIL_SMTP_PASSWORD);
-                $transport->setEncryption(MAIL_SMTP_ENCRYPTION);
-                break;
-            case 'sendmail':
-                $transport = Swift_SendmailTransport::newInstance(MAIL_SENDMAIL_COMMAND);
-                break;
-            default:
-                $transport = Swift_MailTransport::newInstance();
-        }
+        $container['mailer'] = function () {
+            switch (MAIL_TRANSPORT) {
+                case 'smtp':
+                    $transport = Swift_SmtpTransport::newInstance(MAIL_SMTP_HOSTNAME, MAIL_SMTP_PORT);
+                    $transport->setUsername(MAIL_SMTP_USERNAME);
+                    $transport->setPassword(MAIL_SMTP_PASSWORD);
+                    $transport->setEncryption(MAIL_SMTP_ENCRYPTION);
+                    break;
+                case 'sendmail':
+                    $transport = Swift_SendmailTransport::newInstance(MAIL_SENDMAIL_COMMAND);
+                    break;
+                default:
+                    $transport = Swift_MailTransport::newInstance();
+            }
 
-        return $transport;
+            return $transport;
+        };
     }
 }