moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-37324 fix phpunit and behat SESSION and USER setup

Browse source
This commit is contained in:
Petr Škoda 2013-09-24 08:59:29 +02:00
parent c925e4fa8e
commit de230fd359
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/classes/session/manager.php
View file

@ -155,8 +155,9 @@ class manager {
$_SESSION['USER']->mnethostid = 1;
}
if (PHPUNIT_TEST) {
// Phpunit tests use reversed reference.
if (PHPUNIT_TEST or defined('BEHAT_TEST')) {
// Phpunit tests and behat init use reversed reference,
// the reason is we can not point global to $_SESSION outside of global scope.
global $USER, $SESSION;
$USER = $_SESSION['USER'];
$SESSION = $_SESSION['SESSION'];
@ -597,8 +598,9 @@ class manager {
}
sesskey(); // Init session key.
if (PHPUNIT_TEST) {
// Phpunit tests use reversed reference.
if (PHPUNIT_TEST or defined('BEHAT_TEST')) {
// Phpunit tests and behat init use reversed reference,
// the reason is we can not point global to $_SESSION outside of global scope.
global $USER;
$USER = $_SESSION['USER'];
$_SESSION['USER'] =& $USER;