diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-07-16 21:40:22 +0400 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-08-29 12:22:21 +0400 |
| commit | f551917a3ca2cedf748337646ed4b1d398ac8437 (patch) | |
| tree | eccf53eb77c44019ef59e90c41af43297993ddf9 /tests/startsessionlistener.php | |
| parent | ed2424c3822a3470065788ff113a3807d24d80dc (diff) | |
kill OC::$session
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession
restore order os OC::$session and OC::$CLI
remove unneded initialization of dummy session
write back session when $useCustomSession is true
log warning when deprecated app is used
Diffstat (limited to 'tests/startsessionlistener.php')
| -rw-r--r-- | tests/startsessionlistener.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/startsessionlistener.php b/tests/startsessionlistener.php index ba049559c6e..1f3573555ca 100644 --- a/tests/startsessionlistener.php +++ b/tests/startsessionlistener.php @@ -31,9 +31,9 @@ class StartSessionListener implements PHPUnit_Framework_TestListener { public function endTest(PHPUnit_Framework_Test $test, $time) { // reopen the session - only allowed for memory session - if (\OC::$session instanceof \OC\Session\Memory) { + if (\OC::$server->getSession() instanceof \OC\Session\Memory) { /** @var $session \OC\Session\Memory */ - $session = \OC::$session; + $session = \OC::$server->getSession(); $session->reopen(); } } |