From 6acb75a9b5aad3086a09f4149bc187b451157c0b Mon Sep 17 00:00:00 2001
From: robocoder <anthon.pang@gmail.com>
Date: Sat, 3 Dec 2011 04:16:25 +0000
Subject: [PATCH] refs #2806
git-svn-id: http://dev.piwik.org/svn/trunk@5518 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
plugins/PDFReports/tests/PDFReports.test.php | 20 +++++++++++++-------
tests/simpletest/autorun.php | 5 +++--
tests/simpletest/simpletest.php | 2 +-
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/plugins/PDFReports/tests/PDFReports.test.php b/plugins/PDFReports/tests/PDFReports.test.php
index 39e9a0fe99..373528570a 100644
--- a/plugins/PDFReports/tests/PDFReports.test.php
+++ b/plugins/PDFReports/tests/PDFReports.test.php
@@ -58,25 +58,30 @@ class Test_Piwik_PDFReports extends Test_Database
$idReportTwo = $this->_createReport($dataWebsiteTwo);
// Testing getReports without parameters
- $report = reset(Piwik_PDFReports_API::getInstance()->getReports());
+ $tmp = Piwik_PDFReports_API::getInstance()->getReports();
+ $report = reset($tmp);
$this->_checkReportsEqual($report, $dataWebsiteTwo);
$idReport = $this->_createReport($data);
// Passing 3 parameters
- $report = reset(Piwik_PDFReports_API::getInstance()->getReports($this->idSiteAccess, $data['period'], $idReport));
+ $tmp = Piwik_PDFReports_API::getInstance()->getReports($this->idSiteAccess, $data['period'], $idReport);
+ $report = reset($tmp);
$this->_checkReportsEqual($report, $data);
// Passing only idsite
- $report = reset(Piwik_PDFReports_API::getInstance()->getReports($this->idSiteAccess));
+ $tmp = Piwik_PDFReports_API::getInstance()->getReports($this->idSiteAccess);
+ $report = reset($tmp);
$this->_checkReportsEqual($report, $data);
// Passing only period
- $report = reset(Piwik_PDFReports_API::getInstance()->getReports($idSite=false, $data['period']));
+ $tmp = Piwik_PDFReports_API::getInstance()->getReports($idSite=false, $data['period']);
+ $report = reset($tmp);
$this->_checkReportsEqual($report, $data);
// Passing only idreport
- $report = reset(Piwik_PDFReports_API::getInstance()->getReports($idSite=false,$period=false, $idReport));
+ $tmp = Piwik_PDFReports_API::getInstance()->getReports($idSite=false,$period=false, $idReport);
+ $report = reset($tmp);
$this->_checkReportsEqual($report, $data);
}
@@ -135,7 +140,8 @@ class Test_Piwik_PDFReports extends Test_Database
$idReport = $this->_createReport($dataBefore);
$dataAfter = $this->_getYetAnotherAddReportData();
$this->_updateReport($idReport, $dataAfter);
- $newReport = reset(Piwik_PDFReports_API::getInstance()->getReports($idSite=false,$period=false, $idReport));
+ $tmp = Piwik_PDFReports_API::getInstance()->getReports($idSite=false,$period=false, $idReport);
+ $newReport = reset($tmp);
$this->_checkReportsEqual($newReport, $dataAfter);
}
@@ -218,7 +224,7 @@ class Test_Piwik_PDFReports extends Test_Database
{
if($key == 'additional_emails') $value = str_replace(' ','', $value);
if($key == 'description') $value = substr($value,0,250);
- $this->assertEqual($value, $report[$key], "Error for $key for report $report and data ".var_export($data,true)." ---> %s ");
+ $this->assertEqual($value, $report[$key], "Error for $key for report ".var_export($report ,true)." and data ".var_export($data,true)." ---> %s ");
}
}
diff --git a/tests/simpletest/autorun.php b/tests/simpletest/autorun.php
index 7d97d2d7f2..01188c9f0a 100644
--- a/tests/simpletest/autorun.php
+++ b/tests/simpletest/autorun.php
@@ -54,7 +54,8 @@ function tests_have_run() {
function initial_file() {
static $file = false;
if (! $file) {
- $file = reset(get_included_files());
+ $tmp = get_included_files();
+ $file = reset($tmp);
}
return $file;
}
@@ -84,4 +85,4 @@ function capture_new_classes() {
$SIMPLETEST_AUTORUNNER_INITIAL_CLASSES ?
$SIMPLETEST_AUTORUNNER_INITIAL_CLASSES : array()));
}
-?>
\ No newline at end of file
+?>
diff --git a/tests/simpletest/simpletest.php b/tests/simpletest/simpletest.php
index a5225382dc..4ddda11aa2 100644
--- a/tests/simpletest/simpletest.php
+++ b/tests/simpletest/simpletest.php
@@ -102,7 +102,7 @@ class SimpleTest {
* @return array|object|null
* @see prefer()
*/
- function &preferred($classes) {
+ public static function &preferred($classes) {
if (! is_array($classes)) {
$classes = array($classes);
}
--
GitLab