diff --git a/core/Config.php b/core/Config.php
index b467881ead4528afddf056035a156e7be478e9c8..40f032d8518ad4df80eca166c805f8ddcf120614 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -12,8 +12,6 @@
namespace Piwik;
use Exception;
-require_once PIWIK_INCLUDE_PATH . '/core/EventDispatcher.php';
-
/**
* For general performance (and specifically, the Tracker), we use deferred (lazy) initialization
* and cache sections. We also avoid any dependency on Zend Framework's Zend_Config.
diff --git a/core/Db/Adapter.php b/core/Db/Adapter.php
index 989fe308d74f16e0fe3924eb84f4ff3c81fd3d31..ca66d53c91448f6230d9a770f2b425907c640353 100644
--- a/core/Db/Adapter.php
+++ b/core/Db/Adapter.php
@@ -99,7 +99,7 @@ class Adapter
{
static $adapterNames = array(
// currently supported by Piwik
- 'Pdo_Mysql',
+ 'Pdo\Mysql',
'Mysqli',
// other adapters supported by Zend_Db
@@ -115,7 +115,7 @@ class Adapter
$adapters = array();
foreach ($adapterNames as $adapterName) {
- $className = 'Piwik_Db_Adapter_' . $adapterName;
+ $className = '\Piwik\Db\Adapter\\' . $adapterName;
if (call_user_func(array($className, 'isEnabled'))) {
$adapters[strtoupper($adapterName)] = call_user_func(array($className, 'getDefaultPort'));
}
diff --git a/core/Db/Adapter/Mysqli.php b/core/Db/Adapter/Mysqli.php
index db923dbf992330360ce07988af320fd8bb56963a..544c25443d2381db5f3e453bb92bef2fdf7d6f0d 100644
--- a/core/Db/Adapter/Mysqli.php
+++ b/core/Db/Adapter/Mysqli.php
@@ -8,14 +8,19 @@
* @category Piwik
* @package Piwik
*/
+namespace Piwik\Db\Adapter;
+
+use Exception;
use Piwik\Config;
use Piwik\Db\AdapterInterface;
+use Zend_Config;
+use Zend_Db_Adapter_Mysqli;
/**
* @package Piwik
* @subpackage Piwik_Db
*/
-class Piwik_Db_Adapter_Mysqli extends Zend_Db_Adapter_Mysqli implements AdapterInterface
+class Mysqli extends Zend_Db_Adapter_Mysqli implements AdapterInterface
{
/**
* Constructor
diff --git a/core/ViewDataTable/Cloud.php b/core/ViewDataTable/Cloud.php
index 42b2d287759dfc29e16cc08813720225f0c8ddf7..56cef79b81d26bb6c27be58acaad5b44dee76da5 100644
--- a/core/ViewDataTable/Cloud.php
+++ b/core/ViewDataTable/Cloud.php
@@ -14,7 +14,7 @@ use Exception;
use Piwik\ViewDataTable;
use Piwik\View;
use Piwik;
-use Piwik\Visualization\Cloud;
+use Piwik\Visualization;
/**
* Reads the requested DataTable from the API, and prepares the data to give
@@ -67,7 +67,7 @@ class Cloud extends ViewDataTable
$this->checkStandardDataTable();
$this->postDataTableLoadedFromAPI();
- $visualization = new Cloud();
+ $visualization = new Visualization\Cloud();
$this->view = $this->buildView($visualization);
}
}
diff --git a/core/ViewDataTable/GenerateGraphHTML.php b/core/ViewDataTable/GenerateGraphHTML.php
index 2d872c508ab63e2a02c3dad9ea3267396ee8b9d3..680584f92f5f31bd08e9e4e8e130c46c95913f88 100644
--- a/core/ViewDataTable/GenerateGraphHTML.php
+++ b/core/ViewDataTable/GenerateGraphHTML.php
@@ -13,11 +13,11 @@ namespace Piwik\ViewDataTable;
use Exception;
use Piwik\API\Request;
use Piwik\Piwik;
+use Piwik\Access;
use Piwik\Common;
use Piwik\JqplotDataGenerator;
use Piwik\ViewDataTable;
use Piwik\View;
-use Piwik_Access_NoAccessException;
use Piwik\Visualization\JqplotGraph;
/**
@@ -234,7 +234,7 @@ abstract class GenerateGraphHTML extends ViewDataTable
try {
$this->loadDataTableFromAPI();
- } catch (Piwik_Access_NoAccessException $e) {
+ } catch (\Piwik\NoAccessException $e) {
throw $e;
} catch (Exception $e) {
Piwik::log("Failed to get data from API: " . $e->getMessage());
diff --git a/core/functions.php b/core/functions.php
index f049f4db5b7619dc123f1ef21f53749b8be1961d..f57a717ed85e74474cf77487b1f986ec039ac05f 100644
--- a/core/functions.php
+++ b/core/functions.php
@@ -256,14 +256,14 @@ namespace {
Top::getInstance()->rename($topMenuOriginal, null, $topMenuRenamed, null);
}
+ if(class_exists('DataTableSummaryRow')) {
- if(empty($GLOBALS['PIWIK_TRACKER_MODE'])) { // do not define these classes in tracker
-
- class Piwik_DataTable_Row_DataTableSummary extends DataTable\Row\DataTableSummaryRow {
+ // Bridge between pre Piwik2 serialized format and namespaced classes
+ class Piwik_DataTable_Row_DataTableSummary extends \Piwik\DataTable\Row\DataTableSummaryRow {
}
- class Piwik_DataTable_Row extends DataTable\Row {
+ class Piwik_DataTable_Row extends \Piwik\DataTable\Row {
}
-
}
+
}
diff --git a/plugins/Annotations/API.php b/plugins/Annotations/API.php
index a26c0dabc8fe763322df408d8b7a48e6143db130..b165f1ba01ad3376942ddf310007fca4c2ae74a6 100755
--- a/plugins/Annotations/API.php
+++ b/plugins/Annotations/API.php
@@ -12,8 +12,7 @@ use Piwik\Period;
use Piwik\Period\Range;
use Piwik\Piwik;
use Piwik\Date;
-use Piwik\ViewDataTable\GenerateGraphHtml\ChartEvolution;
-
+use Piwik\ViewDataTable;
/**
* @see plugins/Annotations/AnnotationList.php
*/
@@ -329,8 +328,7 @@ class Piwik_Annotations_API
$endDate = $oPeriod->getDateEnd();
} else // if the range includes the last N periods
{
- list($date, $lastN) =
- ChartEvolution::getDateRangeAndLastN($period, $date, $lastN);
+ list($date, $lastN) = \Piwik\ViewDataTable\GenerateGraphHTML\ChartEvolution::getDateRangeAndLastN($period, $date, $lastN);
list($startDate, $endDate) = explode(',', $date);
$startDate = Date::factory($startDate);
diff --git a/plugins/DBStats/DBStats.php b/plugins/DBStats/DBStats.php
index d6b6b0e45fb877fa148adb81423b2e83f93d3e09..7a5c6076f7c3075f330067c66f6974571f9b439c 100644
--- a/plugins/DBStats/DBStats.php
+++ b/plugins/DBStats/DBStats.php
@@ -329,7 +329,7 @@ class Piwik_DBStats extends Plugin
}
}
- $getPrettySize = array('Piwik', 'getPrettySizeFromBytes');
+ $getPrettySize = array('\Piwik\Piwik', 'getPrettySizeFromBytes');
$params = !isset($fixedMemoryUnit) ? array() : array($fixedMemoryUnit);
$properties['filters'][] = array(
'ColumnCallbackReplace', array($sizeColumns, $getPrettySize, $params), $runPrettySizeFilterBeforeGeneric);
@@ -343,7 +343,7 @@ class Piwik_DBStats extends Plugin
$properties['filters'][] = array('ColumnCallbackReplace', array($sizeColumns, $replaceSpaces));
}
- $getPrettyNumber = array('Piwik', 'getPrettyNumber');
+ $getPrettyNumber = array('\Piwik\Piwik', 'getPrettyNumber');
$properties['filters'][] = array('ColumnCallbackReplace', array('row_count', $getPrettyNumber));
return $viewDataTable;
diff --git a/plugins/Referers/Controller.php b/plugins/Referers/Controller.php
index 017f47dad9deb58f69e4dad60e7714d0ee435348..15f4de09611258e237cfc84e774ce39f097efd51 100644
--- a/plugins/Referers/Controller.php
+++ b/plugins/Referers/Controller.php
@@ -105,7 +105,7 @@ class Piwik_Referers_Controller extends Controller
// only display the reports by dimension view if there are visits
if ($visits > 0) {
- $referrersReportsByDimension = new View_ReportsByDimension();
+ $referrersReportsByDimension = new View\ReportsByDimension();
$referrersReportsByDimension->addReport(
'Referers_ViewAllReferrers', 'Referers_WidgetGetAll', 'Referers.getAll');
diff --git a/plugins/UserCountry/functions.php b/plugins/UserCountry/functions.php
index 35919cdf2dad9f757160521123dd0bb0813a7d60..04b8e443e7481f787ab67cd7f38238ec95fb3685 100644
--- a/plugins/UserCountry/functions.php
+++ b/plugins/UserCountry/functions.php
@@ -147,7 +147,7 @@ function Piwik_UserCountry_getPrettyCityName($label)
$parts = explode(Piwik_UserCountry_Archiver::LOCATION_SEPARATOR, $label);
$cityName = $parts[0];
$regionCode = $parts[1];
- $countryCode = $parts[2];
+ $countryCode = @$parts[2];
if ($cityName == Piwik_Tracker_Visit::UNKNOWN_CODE || $cityName == '') {
$cityName = Piwik_Translate('General_Unknown');
diff --git a/tests/PHPUnit/Core/AccessTest.php b/tests/PHPUnit/Core/AccessTest.php
index 6ebd280fa53ac73e2eaf4031c52d2b9fca616d4b..30e252732f308fe6937da31c3d1171eac5db760b 100644
--- a/tests/PHPUnit/Core/AccessTest.php
+++ b/tests/PHPUnit/Core/AccessTest.php
@@ -13,7 +13,7 @@ class AccessTest extends DatabaseTestCase
public function setUp()
{
parent::setUp();
- Piwik_Access::setSingletonInstance(null);
+ Access::setSingletonInstance(null);
}
/**
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
index f025301428ffe3595af736e03b3563a612d4c9b2..2f0f22356d5979ed77a5da577bb8486ef9314711 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
+ <row>
+ <label>New visits</label>
+ <nb_visits>25</nb_visits>
+ </row>
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -56,8 +60,4 @@
<label>365+ days</label>
<nb_visits>1</nb_visits>
</row>
- <row>
- <label>New visits</label>
- <nb_visits>25</nb_visits>
- </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
index feecee9ccfe4b0b228767ac112ee6e082f613ea5..ce8a1e0b00927722b38bd98ff8cdc68d563efe89 100755
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
+ <row>
+ <label>New visits</label>
+ <nb_visits>1</nb_visits>
+ </row>
<row>
<label>0 days</label>
<nb_visits>1</nb_visits>
@@ -56,8 +60,4 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
- <row>
- <label>New visits</label>
- <nb_visits>1</nb_visits>
- </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
index feecee9ccfe4b0b228767ac112ee6e082f613ea5..ce8a1e0b00927722b38bd98ff8cdc68d563efe89 100755
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
+ <row>
+ <label>New visits</label>
+ <nb_visits>1</nb_visits>
+ </row>
<row>
<label>0 days</label>
<nb_visits>1</nb_visits>
@@ -56,8 +60,4 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
- <row>
- <label>New visits</label>
- <nb_visits>1</nb_visits>
- </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml
index ed81166bf8166a1c5d8e19e50af08b76316b10c0..d0e405dae87dff98b654ef93a34d235f74c865ac 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml
@@ -34,6 +34,10 @@
</columns>
<reportData>
<result prettyDate="Sunday 3 January 2010">
+ <row>
+ <label>New visits</label>
+ <nb_visits>1</nb_visits>
+ </row>
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -90,12 +94,12 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
+ </result>
+ <result prettyDate="Monday 4 January 2010">
<row>
<label>New visits</label>
<nb_visits>1</nb_visits>
</row>
- </result>
- <result prettyDate="Monday 4 January 2010">
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -152,12 +156,12 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
+ </result>
+ <result prettyDate="Tuesday 5 January 2010">
<row>
<label>New visits</label>
- <nb_visits>1</nb_visits>
+ <nb_visits>0</nb_visits>
</row>
- </result>
- <result prettyDate="Tuesday 5 January 2010">
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -214,10 +218,6 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
- <row>
- <label>New visits</label>
- <nb_visits>0</nb_visits>
- </row>
</result>
<result prettyDate="Wednesday 6 January 2010" />
<result prettyDate="Thursday 7 January 2010" />
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
index 676d41cf7a4804f06cc4e1d73077bf52db083fc4..a95a21169ec4ac1a767356b1ebe288634acb4722 100755
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
@@ -2,6 +2,10 @@
<results>
<result idSite="1">
<result date="2010-01-03">
+ <row>
+ <label>New visits</label>
+ <nb_visits>1</nb_visits>
+ </row>
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -58,12 +62,12 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
+ </result>
+ <result date="2010-01-04">
<row>
<label>New visits</label>
<nb_visits>1</nb_visits>
</row>
- </result>
- <result date="2010-01-04">
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -120,12 +124,12 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
+ </result>
+ <result date="2010-01-05">
<row>
<label>New visits</label>
- <nb_visits>1</nb_visits>
+ <nb_visits>0</nb_visits>
</row>
- </result>
- <result date="2010-01-05">
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -182,10 +186,6 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
- <row>
- <label>New visits</label>
- <nb_visits>0</nb_visits>
- </row>
</result>
<result date="2010-01-06" />
<result date="2010-01-07" />
@@ -195,6 +195,10 @@
<result idSite="2">
<result date="2010-01-03" />
<result date="2010-01-04">
+ <row>
+ <label>New visits</label>
+ <nb_visits>1</nb_visits>
+ </row>
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -251,10 +255,6 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
- <row>
- <label>New visits</label>
- <nb_visits>1</nb_visits>
- </row>
</result>
<result date="2010-01-05" />
<result date="2010-01-06" />
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
index b16a1006e932fe1c67d447daf4b8b865bf9c9d6e..98daa0bfc6ec44a9f2b699dfebb7eb1516ceac3b 100755
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
@@ -2,6 +2,10 @@
<results>
<result idSite="1">
<result date="2010-01">
+ <row>
+ <label>New visits</label>
+ <nb_visits>2</nb_visits>
+ </row>
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -58,10 +62,6 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
- <row>
- <label>New visits</label>
- <nb_visits>2</nb_visits>
- </row>
</result>
<result date="2010-02" />
<result date="2010-03" />
@@ -72,6 +72,10 @@
</result>
<result idSite="2">
<result date="2010-01">
+ <row>
+ <label>New visits</label>
+ <nb_visits>1</nb_visits>
+ </row>
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -128,10 +132,6 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
- <row>
- <label>New visits</label>
- <nb_visits>1</nb_visits>
- </row>
</result>
<result date="2010-02" />
<result date="2010-03" />
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
index 6b96b7902229689ff32ff4bbc349f31981668cef..0c54e79e5e6521f95f71c72e9ace95931f583fe1 100755
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
@@ -2,6 +2,10 @@
<results>
<result idSite="1">
<result date="From 2009-12-28 to 2010-01-03">
+ <row>
+ <label>New visits</label>
+ <nb_visits>1</nb_visits>
+ </row>
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -58,12 +62,12 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
+ </result>
+ <result date="From 2010-01-04 to 2010-01-10">
<row>
<label>New visits</label>
<nb_visits>1</nb_visits>
</row>
- </result>
- <result date="From 2010-01-04 to 2010-01-10">
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -120,10 +124,6 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
- <row>
- <label>New visits</label>
- <nb_visits>1</nb_visits>
- </row>
</result>
<result date="From 2010-01-11 to 2010-01-17" />
<result date="From 2010-01-18 to 2010-01-24" />
@@ -134,6 +134,10 @@
<result idSite="2">
<result date="From 2009-12-28 to 2010-01-03" />
<result date="From 2010-01-04 to 2010-01-10">
+ <row>
+ <label>New visits</label>
+ <nb_visits>1</nb_visits>
+ </row>
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -190,10 +194,6 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
- <row>
- <label>New visits</label>
- <nb_visits>1</nb_visits>
- </row>
</result>
<result date="From 2010-01-11 to 2010-01-17" />
<result date="From 2010-01-18 to 2010-01-24" />
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
index 14a2fd61ae16f300ff719539a3adb3a5ad856980..93be34503237df22d53fa709cb6503422b132d35 100755
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
@@ -2,6 +2,10 @@
<results>
<result idSite="1">
<result date="2010">
+ <row>
+ <label>New visits</label>
+ <nb_visits>2</nb_visits>
+ </row>
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -58,10 +62,6 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
- <row>
- <label>New visits</label>
- <nb_visits>2</nb_visits>
- </row>
</result>
<result date="2011" />
<result date="2012" />
@@ -72,6 +72,10 @@
</result>
<result idSite="2">
<result date="2010">
+ <row>
+ <label>New visits</label>
+ <nb_visits>1</nb_visits>
+ </row>
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -128,10 +132,6 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
- <row>
- <label>New visits</label>
- <nb_visits>1</nb_visits>
- </row>
</result>
<result date="2011" />
<result date="2012" />
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
index e12aafc9ba4f5d09f8c4bb5eea31b96429693320..5b43591b5b1cdedeef73c5f4e2260935a3dbc41d 100755
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_day.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result date="2010-01-03">
+ <row>
+ <label>New visits</label>
+ <nb_visits>1</nb_visits>
+ </row>
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -57,12 +61,12 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
+ </result>
+ <result date="2010-01-04">
<row>
<label>New visits</label>
<nb_visits>1</nb_visits>
</row>
- </result>
- <result date="2010-01-04">
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -119,12 +123,12 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
+ </result>
+ <result date="2010-01-05">
<row>
<label>New visits</label>
- <nb_visits>1</nb_visits>
+ <nb_visits>0</nb_visits>
</row>
- </result>
- <result date="2010-01-05">
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -181,10 +185,6 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
- <row>
- <label>New visits</label>
- <nb_visits>0</nb_visits>
- </row>
</result>
<result date="2010-01-06" />
<result date="2010-01-07" />
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
index 73f6f4d1dd4ac37cef53d396baae77ee302a31d6..84dba17299ff8e9daadb877455ebd7cb446bd9af 100755
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result date="2010-01">
+ <row>
+ <label>New visits</label>
+ <nb_visits>2</nb_visits>
+ </row>
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -57,10 +61,6 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
- <row>
- <label>New visits</label>
- <nb_visits>2</nb_visits>
- </row>
</result>
<result date="2010-02" />
<result date="2010-03" />
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
index 10e26fda2dd69a0ca2d9a3cbdce4f4ffea34374e..eeea14981c054913cf8f17b13c400a28a208cfb3 100755
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_week.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result date="From 2009-12-28 to 2010-01-03">
+ <row>
+ <label>New visits</label>
+ <nb_visits>1</nb_visits>
+ </row>
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -57,12 +61,12 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
+ </result>
+ <result date="From 2010-01-04 to 2010-01-10">
<row>
<label>New visits</label>
<nb_visits>1</nb_visits>
</row>
- </result>
- <result date="From 2010-01-04 to 2010-01-10">
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -119,10 +123,6 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
- <row>
- <label>New visits</label>
- <nb_visits>1</nb_visits>
- </row>
</result>
<result date="From 2010-01-11 to 2010-01-17" />
<result date="From 2010-01-18 to 2010-01-24" />
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
index 7ae34d2648efa63cd25431b62bd48212bf27be14..e39684b9c836557a37cb9a54528c6616d29ec4fd 100755
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitorInterest.getNumberOfVisitsByDaysSinceLast_year.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result date="2010">
+ <row>
+ <label>New visits</label>
+ <nb_visits>2</nb_visits>
+ </row>
<row>
<label>0 days</label>
<nb_visits>0</nb_visits>
@@ -57,10 +61,6 @@
<label>365+ days</label>
<nb_visits>0</nb_visits>
</row>
- <row>
- <label>New visits</label>
- <nb_visits>2</nb_visits>
- </row>
</result>
<result date="2011" />
<result date="2012" />
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html
index 5ee613822a9a56565d2cfe3821ece725e7c9eb08..1a3f2d8d62a2b8a211a8d9dca676f5b4926f19e8 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html
@@ -3497,7 +3497,7 @@
</h2>
<img alt=""
- src="data:image/png;base64,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"
+ src="data:image/png;base64,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"
height="200"
width="700"/>
@@ -3517,15 +3517,15 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0 days </td>
+ New visits </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0
+ 2
</td>
</tr>
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 1 day </td>
+ 0 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3533,23 +3533,23 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 2 days </td>
+ 1 day </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 1
+ 0
</td>
</tr>
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 3 days </td>
+ 2 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0
+ 1
</td>
</tr>
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 4 days </td>
+ 3 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3557,7 +3557,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 5 days </td>
+ 4 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3565,7 +3565,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 6 days </td>
+ 5 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3573,7 +3573,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 7 days </td>
+ 6 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3581,7 +3581,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 8-14 days </td>
+ 7 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3589,7 +3589,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 15-30 days </td>
+ 8-14 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3597,7 +3597,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 31-60 days </td>
+ 15-30 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3605,7 +3605,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 61-120 days </td>
+ 31-60 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3613,7 +3613,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 121-364 days </td>
+ 61-120 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3621,7 +3621,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 365+ days </td>
+ 121-364 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3629,9 +3629,9 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- New visits </td>
+ 365+ days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 2
+ 0
</td>
</tr>
</tbody>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html
index 7485e4d8750a0ec489cfe3102f92eb7c8426a10b..f93a03e8e899551a6dfe14d417c9f2b086d4c013 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html
@@ -3373,15 +3373,15 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0 days </td>
+ New visits </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0
+ 2
</td>
</tr>
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 1 day </td>
+ 0 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3389,23 +3389,23 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 2 days </td>
+ 1 day </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 1
+ 0
</td>
</tr>
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 3 days </td>
+ 2 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0
+ 1
</td>
</tr>
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 4 days </td>
+ 3 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3413,7 +3413,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 5 days </td>
+ 4 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3421,7 +3421,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 6 days </td>
+ 5 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3429,7 +3429,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 7 days </td>
+ 6 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3437,7 +3437,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 8-14 days </td>
+ 7 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3445,7 +3445,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 15-30 days </td>
+ 8-14 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3453,7 +3453,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 31-60 days </td>
+ 15-30 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3461,7 +3461,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 61-120 days </td>
+ 31-60 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3469,7 +3469,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 121-364 days </td>
+ 61-120 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3477,7 +3477,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 365+ days </td>
+ 121-364 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -3485,9 +3485,9 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- New visits </td>
+ 365+ days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 2
+ 0
</td>
</tr>
</tbody>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf
index 498cefe43333d71093705251d4d83bc425c5e912..3cc8a3fbd057b1d37249e64afc7be04387f0c925 100644
Binary files a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf and b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_month.original.pdf differ
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html
index ea043312a31cb71512b812fa26ac7e7c8568f9e7..d15889e8f8b13034473e37732769dcb54b247fe4 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html
@@ -5510,7 +5510,7 @@
</h2>
<img alt=""
- src="data:image/png;base64,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"
+ src="data:image/png;base64,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"
height="200"
width="700"/>
@@ -5530,7 +5530,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0 days </td>
+ New visits </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
1
</td>
@@ -5538,15 +5538,15 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 1 day </td>
+ 0 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0
+ 1
</td>
</tr>
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 2 days </td>
+ 1 day </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5554,7 +5554,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 3 days </td>
+ 2 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5562,7 +5562,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 4 days </td>
+ 3 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5570,7 +5570,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 5 days </td>
+ 4 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5578,7 +5578,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 6 days </td>
+ 5 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5586,7 +5586,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 7 days </td>
+ 6 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5594,7 +5594,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 8-14 days </td>
+ 7 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5602,7 +5602,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 15-30 days </td>
+ 8-14 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5610,7 +5610,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 31-60 days </td>
+ 15-30 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5618,7 +5618,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 61-120 days </td>
+ 31-60 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5626,7 +5626,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 121-364 days </td>
+ 61-120 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5634,7 +5634,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 365+ days </td>
+ 121-364 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5642,9 +5642,9 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- New visits </td>
+ 365+ days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 1
+ 0
</td>
</tr>
</tbody>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html
index 52498edb0212eeed2bcf587682c4aad3d7d29886..697879539215c810ee6df1ca26fc68ec46bd7590 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html
@@ -5308,7 +5308,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0 days </td>
+ New visits </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
1
</td>
@@ -5316,15 +5316,15 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 1 day </td>
+ 0 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0
+ 1
</td>
</tr>
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 2 days </td>
+ 1 day </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5332,7 +5332,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 3 days </td>
+ 2 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5340,7 +5340,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 4 days </td>
+ 3 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5348,7 +5348,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 5 days </td>
+ 4 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5356,7 +5356,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 6 days </td>
+ 5 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5364,7 +5364,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 7 days </td>
+ 6 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5372,7 +5372,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 8-14 days </td>
+ 7 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5380,7 +5380,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 15-30 days </td>
+ 8-14 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5388,7 +5388,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 31-60 days </td>
+ 15-30 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5396,7 +5396,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 61-120 days </td>
+ 31-60 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5404,7 +5404,7 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 121-364 days </td>
+ 61-120 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5412,7 +5412,7 @@
<tr style="background-color: rgb(249,250,250)">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 365+ days </td>
+ 121-364 days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
</td>
@@ -5420,9 +5420,9 @@
<tr style="">
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- New visits </td>
+ 365+ days </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 1
+ 0
</td>
</tr>
</tbody>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_week.original.pdf b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_week.original.pdf
index 44ac575503527f2326116c2a23cedf12b42704f0..ba1c591b34319ddf4acf76d02c886b90f77c9ccf 100644
Binary files a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_week.original.pdf and b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__PDFReports.generateReport_week.original.pdf differ
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
index 18c9b3ef978bf3c28ecfa6262fd87d1f12b9fcf1..12cbf5574d7d6d692a62a0bd9d6b9b2be2445b4d 100755
--- a/tests/PHPUnit/IntegrationTestCase.php
+++ b/tests/PHPUnit/IntegrationTestCase.php
@@ -12,6 +12,7 @@ use Piwik\ArchiveProcessor\Rules;
use Piwik\Config;
use Piwik\DataAccess\ArchiveTableCreator;
use Piwik\DataTable\Manager;
+use Piwik\Db\Adapter\Mysqli;
use Piwik\Piwik;
use Piwik\Common;
use Piwik\Access;
@@ -796,7 +797,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
}
// is there a better way to test for the current DB type in use?
- if (Zend_Registry::get('db') instanceof Piwik_Db_Adapter_Mysqli) {
+ if (Zend_Registry::get('db') instanceof Mysqli) {
// Do not test for TRUNCATE(SUM()) returning .00 on mysqli since this is not working
// http://bugs.php.net/bug.php?id=54508
$expected = str_replace('.000000</l', '</l', $expected); //lat/long
diff --git a/tests/PHPUnit/TestingEnvironment.php b/tests/PHPUnit/TestingEnvironment.php
index c4c2dd6831d1888ad64bb69bb48e166fd1c0e704..b4d3107f865930d5698fcdb9ec0e00cdf96353bd 100644
--- a/tests/PHPUnit/TestingEnvironment.php
+++ b/tests/PHPUnit/TestingEnvironment.php
@@ -1,7 +1,5 @@
<?php
-require_once realpath(dirname(__FILE__)) . "/../../core/EventDispatcher.php";
-
/**
* Sets the test environment.
*/
@@ -12,7 +10,6 @@ class Piwik_TestingEnvironment
if (!defined('PIWIK_TEST_MODE')) {
define('PIWIK_TEST_MODE', true);
}
-
Piwik_AddAction('Access.createAccessSingleton', function($access) {
$access->setSuperUser(true);
});
diff --git a/tests/PHPUnit/proxy/archive.php b/tests/PHPUnit/proxy/archive.php
index 56d08343ba277eb713af5eda493ba693b0a8a474..7960079c65cf3f72d23c2a5dabf99a55cafff581 100644
--- a/tests/PHPUnit/proxy/archive.php
+++ b/tests/PHPUnit/proxy/archive.php
@@ -1,8 +1,10 @@
<?php
// make sure the test environment is loaded
-require realpath(dirname(__FILE__)) . "/../../../tests/PHPUnit/TestingEnvironment.php";
+require_once realpath(dirname(__FILE__)) . '/../../../core/EventDispatcher.php';
+require_once realpath(dirname(__FILE__)) . "/../../../core/functions.php";
+require_once realpath(dirname(__FILE__)) . "/../../../tests/PHPUnit/TestingEnvironment.php";
Piwik_TestingEnvironment::addHooks();
// include archive.php, and let 'er rip
-require realpath(dirname(__FILE__)) . "/../../../misc/cron/archive.php";
\ No newline at end of file
+require_once realpath(dirname(__FILE__)) . "/../../../misc/cron/archive.php";
\ No newline at end of file
diff --git a/tests/PHPUnit/proxy/index.php b/tests/PHPUnit/proxy/index.php
index 9a812cdb9ee9b89b00ab30f29e3ce32a218833d6..ce0822112829058eda219793d07145422ef1c76f 100644
--- a/tests/PHPUnit/proxy/index.php
+++ b/tests/PHPUnit/proxy/index.php
@@ -7,9 +7,6 @@
// make sure the test environment is loaded
use Piwik\Visualization\Cloud;
-require realpath(dirname(__FILE__)) . "/../../../tests/PHPUnit/TestingEnvironment.php";
-Piwik_TestingEnvironment::addHooks();
-
// Wrapping the request inside ob_start() calls to ensure that the Test
// calling us waits for the full request to process before unblocking
ob_start();
@@ -19,19 +16,22 @@ define('PIWIK_USER_PATH', PIWIK_INCLUDE_PATH);
require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
-require_once PIWIK_INCLUDE_PATH . '/core/functions.php';
require_once PIWIK_INCLUDE_PATH . '/core/EventDispatcher.php';
+require_once realpath(dirname(__FILE__)) . '/../../../core/functions.php';
+require_once realpath(dirname(__FILE__)) . "/../../../tests/PHPUnit/TestingEnvironment.php";
+Piwik_TestingEnvironment::addHooks();
+
Cloud::$debugDisableShuffle = true;
-Tracker::setTestEnvironment();
+\Piwik\Tracker::setTestEnvironment();
Piwik_Tracker_Cache::deleteTrackerCache();
// Disable index.php dispatch since we do it manually below
define('PIWIK_ENABLE_DISPATCH', false);
include PIWIK_INCLUDE_PATH . '/index.php';
-$controller = new FrontController;
+$controller = new \Piwik\FrontController;
$controller->init();
$controller->dispatch();
diff --git a/tests/PHPUnit/proxy/piwik.php b/tests/PHPUnit/proxy/piwik.php
index d06c37f9580a22b429b09c2aa8fa099e1030fdb4..8610ef8b4d3dae4b30d6c5df78321d9b78882769 100755
--- a/tests/PHPUnit/proxy/piwik.php
+++ b/tests/PHPUnit/proxy/piwik.php
@@ -24,6 +24,7 @@ define('PIWIK_USER_PATH', PIWIK_INCLUDE_PATH);
require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
+require_once PIWIK_INCLUDE_PATH . '/core/functions.php';
// Config files forced to use the test database
// Note that this also provides security for Piwik installs containing tests files: