From 1d8ff2de823315dc95e72b00ffe5e73595d31e17 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Mon, 29 Nov 2010 06:51:40 +0100 Subject: [PATCH] Adapt to recent Horde_Session changes. --- .../lib/Horde/Kolab/Session/Storage/Session.php | 4 ++-- .../test/Horde/Kolab/Session/Class/Storage/SessionTest.php | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) 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 cbfb97983..1e2be1ddf 100644 --- 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 434d2ce4f..b3226eb7c 100644 --- 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); -- 2.11.0