From a675271ad71b7713d1b33bdba3c51b2b04813229 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 15 Nov 2015 12:50:33 -0500
Subject: Rewrite of session management

---
 app/ServiceProvider/ClassProvider.php           |  3 ++-
 app/ServiceProvider/DatabaseProvider.php        |  2 ++
 app/ServiceProvider/EventDispatcherProvider.php |  2 ++
 app/ServiceProvider/LoggingProvider.php         |  2 ++
 app/ServiceProvider/SessionProvider.php         | 29 +++++++++++++++++++++++++
 5 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 app/ServiceProvider/SessionProvider.php

(limited to 'app/ServiceProvider')

diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php
index 2699de17..9c9bc233 100644
--- a/app/ServiceProvider/ClassProvider.php
+++ b/app/ServiceProvider/ClassProvider.php
@@ -85,7 +85,6 @@ class ClassProvider implements ServiceProviderInterface
             'DateParser',
             'Helper',
             'Lexer',
-            'Session',
             'Template',
         ),
         'Core\Http' => array(
@@ -158,5 +157,7 @@ class ClassProvider implements ServiceProviderInterface
         $container['pluginLoader'] = new Loader($container);
 
         $container['cspRules'] = array('style-src' => "'self' 'unsafe-inline'", 'img-src' => '* data:');
+
+        return $container;
     }
 }
diff --git a/app/ServiceProvider/DatabaseProvider.php b/app/ServiceProvider/DatabaseProvider.php
index b2115644..8cede8af 100644
--- a/app/ServiceProvider/DatabaseProvider.php
+++ b/app/ServiceProvider/DatabaseProvider.php
@@ -15,6 +15,8 @@ class DatabaseProvider implements ServiceProviderInterface
         $container['db'] = $this->getInstance();
         $container['db']->stopwatch = DEBUG;
         $container['db']->logQueries = DEBUG;
+
+        return $container;
     }
 
     /**
diff --git a/app/ServiceProvider/EventDispatcherProvider.php b/app/ServiceProvider/EventDispatcherProvider.php
index 1711919e..17141fd4 100644
--- a/app/ServiceProvider/EventDispatcherProvider.php
+++ b/app/ServiceProvider/EventDispatcherProvider.php
@@ -32,5 +32,7 @@ class EventDispatcherProvider implements ServiceProviderInterface
 
         // Automatic actions
         $container['action']->attachEvents();
+
+        return $container;
     }
 }
diff --git a/app/ServiceProvider/LoggingProvider.php b/app/ServiceProvider/LoggingProvider.php
index 4344bccc..68c074f0 100644
--- a/app/ServiceProvider/LoggingProvider.php
+++ b/app/ServiceProvider/LoggingProvider.php
@@ -26,5 +26,7 @@ class LoggingProvider implements ServiceProviderInterface
         }
 
         $container['logger'] = $logger;
+
+        return $container;
     }
 }
diff --git a/app/ServiceProvider/SessionProvider.php b/app/ServiceProvider/SessionProvider.php
new file mode 100644
index 00000000..414d9578
--- /dev/null
+++ b/app/ServiceProvider/SessionProvider.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Kanboard\ServiceProvider;
+
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+use Kanboard\Core\Session\SessionManager;
+use Kanboard\Core\Session\SessionStorage;
+use Kanboard\Core\Session\FlashMessage;
+
+class SessionProvider implements ServiceProviderInterface
+{
+    public function register(Container $container)
+    {
+        $container['sessionStorage'] = function() {
+            return new SessionStorage;
+        };
+
+        $container['sessionManager'] = function($c) {
+            return new SessionManager($c);
+        };
+
+        $container['flash'] = function($c) {
+            return new FlashMessage($c);
+        };
+
+        return $container;
+    }
+}
-- 
cgit v1.2.3