projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #13872 from seamuslee001/composer_2_0_compatability
[civicrm-core.git]
/
tests
/
phpunit
/
CiviTest
/
CiviUnitTestCase.php
diff --git
a/tests/phpunit/CiviTest/CiviUnitTestCase.php
b/tests/phpunit/CiviTest/CiviUnitTestCase.php
index a0f04fe81af54bcdd21cecc5bc687a573d09c2ef..08762b0ca6a9614b916207dc4d8f060af026b143 100644
(file)
--- a/
tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/
tests/phpunit/CiviTest/CiviUnitTestCase.php
@@
-336,6
+336,7
@@
class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase {
//flush component settings
CRM_Core_Component::getEnabledComponents(TRUE);
//flush component settings
CRM_Core_Component::getEnabledComponents(TRUE);
+ $_REQUEST = $_GET = $_POST = [];
error_reporting(E_ALL);
$this->_sethtmlGlobals();
error_reporting(E_ALL);
$this->_sethtmlGlobals();
@@
-412,8
+413,7
@@
class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase {
if ($this->hookClass) {
$this->hookClass->reset();
}
if ($this->hookClass) {
$this->hookClass->reset();
}
- $session = CRM_Core_Session::singleton();
- $session->set('userID', NULL);
+ CRM_Core_Session::singleton()->reset(1);
if ($this->tx) {
$this->tx->rollback()->commit();
if ($this->tx) {
$this->tx->rollback()->commit();