summaryrefslogtreecommitdiff
path: root/tests/test_tools/simpletest
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test_tools/simpletest')
-rw-r--r--tests/test_tools/simpletest/errors.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/test_tools/simpletest/errors.php b/tests/test_tools/simpletest/errors.php
index 0608de60..b32cd5fe 100644
--- a/tests/test_tools/simpletest/errors.php
+++ b/tests/test_tools/simpletest/errors.php
@@ -41,7 +41,7 @@
function invoke($method) {
set_error_handler('simpleTestErrorHandler');
parent::invoke($method);
- $queue = &SimpleErrorQueue::instance();
+ $queue = SimpleErrorQueue::instance();
while (list($severity, $message, $file, $line, $globals) = $queue->extract()) {
$severity = SimpleErrorQueue::getSeverityAsString($severity);
$test_case = $this->getTestCase();
@@ -121,7 +121,7 @@
* @access public
* @static
*/
- function &instance() {
+ static function instance() {
static $queue = false;
if (! $queue) {
$queue = new SimpleErrorQueue();
@@ -137,7 +137,7 @@
* @access public
* @static
*/
- function getSeverityAsString($severity) {
+ static function getSeverityAsString($severity) {
static $map = array(
E_STRICT => 'E_STRICT',
E_ERROR => 'E_ERROR',
@@ -174,7 +174,7 @@
$label = SimpleErrorQueue::getSeverityAsString($severity);
error_log("$label: $message in $filename on line $line");
}
- $queue = &SimpleErrorQueue::instance();
+ $queue = SimpleErrorQueue::instance();
$queue->add($severity, $message, $filename, $line, $super_globals);
set_error_handler('simpleTestErrorHandler');
}