Adapt to recent Horde_Session changes.

diff --git a/framework/Kolab_Session/lib/Horde/Kolab/Session/Storage/Session.php b/framework/Kolab_Session/lib/Horde/Kolab/Session/Storage/Session.php
index cbfb979..1e2be1d 100644 (file)
--- a/framework/Kolab_Session/lib/Horde/Kolab/Session/Storage/Session.php
+++ b/framework/Kolab_Session/lib/Horde/Kolab/Session/Storage/Session.php
@@ -53,7 +53,7 @@ implements Horde_Kolab_Session_Storage_Interface
      */
     public function load()
     {
-        return $this->_session['kolab_session'];
+        return $this->_session->get('horde', 'kolab_session');
     }
 
     /**
@@ -65,6 +65,6 @@ implements Horde_Kolab_Session_Storage_Interface
      */
     public function save(Horde_Kolab_Session $session)
     {
-        $this->_session['kolab_session'] = $session;
+        $this->_session->set('horde', 'kolab_session', $session);
     }
 }

diff --git a/framework/Kolab_Session/test/Horde/Kolab/Session/Class/Storage/SessionTest.php b/framework/Kolab_Session/test/Horde/Kolab/Session/Class/Storage/SessionTest.php
index 434d2ce..b3226eb 100644 (file)
--- a/framework/Kolab_Session/test/Horde/Kolab/Session/Class/Storage/SessionTest.php
+++ b/framework/Kolab_Session/test/Horde/Kolab/Session/Class/Storage/SessionTest.php
@@ -34,20 +34,20 @@ class Horde_Kolab_Session_Class_Storage_SessionTest extends Horde_Kolab_Session_
 {
     public function testMethodLoadHasResultQueriedObject()
     {
-        $session = $this->getMock('ArrayAccess', array(), array(), '', false, false);
+        $session = $this->getMock('Horde_Session', array(), array(), '', false, false);
         $session->expects($this->once())
-            ->method('offsetGet')
-            ->with('kolab_session');
+            ->method('get')
+            ->with('horde', 'kolab_session');
         $storage = new Horde_Kolab_Session_Storage_Session($session);
         $storage->load();
     }
 
     public function testMethodSaveHasPostconditionThatTheSessionDataWasSaved()
     {
-        $session = $this->getMock('ArrayAccess', array(), array(), '', false, false);
+        $session = $this->getMock('Horde_Session', array(), array(), '', false, false);
         $session->expects($this->once())
-            ->method('offsetSet')
-            ->with('kolab_session', $this->isInstanceOf('Horde_Kolab_Session'));
+            ->method('set')
+            ->with('horde', 'kolab_session', $this->isInstanceOf('Horde_Kolab_Session'));
         $kolab_session = $this->getMock('Horde_Kolab_Session');
         $storage = new Horde_Kolab_Session_Storage_Session($session);
         $storage->save($kolab_session);