diff --git a/core/Archive.php b/core/Archive.php
index 0d343d5bcf1648e2190b207d5a7059e80a1ecf36..a179a629d0b4cdd365312a0d945f84ab8c3d1d95 100644
--- a/core/Archive.php
+++ b/core/Archive.php
@@ -32,7 +32,7 @@
* return $nbVisits;
* </pre>
*
- * If the requested statistics are not yet processed, Archive uses ArchiveProcessing to archive the statistics.
+ * If the requested statistics are not yet processed, Archive uses ArchiveProcessor to archive the statistics.
*
* TODO: create ticket for this: when building archives, should use each site's timezone (ONLY FOR 'now').
*
@@ -697,7 +697,7 @@ class Piwik_Archive
/**
* Returns the done string flag for a plugin using this instance's segment & periods.
*
- * @see Piwik_ArchiveProcessing::getDoneStringFlagFor
+ * @see Piwik_ArchiveProcessor::getDoneStringFlagFor
*
* @param string $plugin
* @return string
diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php
index 78eceead46d0c3e29710af2c7449ece011df0798..d8245f9a32ea42b1c38ae7b4a4a3531c555d1be9 100644
--- a/core/ArchiveProcessor.php
+++ b/core/ArchiveProcessor.php
@@ -10,10 +10,10 @@
*/
/**
- * The ArchiveProcessing module is a module that reads the Piwik logs from the DB and
+ * The ArchiveProcessor module is a module that reads the Piwik logs from the DB and
* compute all the reports, which are then stored in the database.
*
- * The ArchiveProcessing class is used by the Archive object to make sure the given Archive is processed and available in the DB.
+ * The ArchiveProcessor class is used by the Archive object to make sure the given Archive is processed and available in the DB.
*
* A record in the Database for a given report is defined by
* - idarchive = unique ID that is associated to all the data of this archive (idsite+period+date)
@@ -178,7 +178,7 @@ abstract class Piwik_ArchiveProcessor
return $idArchive;
}
- if (!Piwik_DataAccess_Archiver::getArchiveProcessingLock($this->getSite()->getId(), $this->getPeriod(), $this->getSegment())) {
+ if (!Piwik_DataAccess_Archiver::getArchiveProcessorLock($this->getSite()->getId(), $this->getPeriod(), $this->getSegment())) {
Piwik::log('Unable to get lock for idSite = ' . $this->getSite()->getId()
. ', period = ' . $this->getPeriod()->getLabel()
. ', UTC datetime [' . $this->getDateStart()->getDateStartUTC() . ' -> ' . $this->getDateEnd()->getDateEndUTC() . ' ]...');
@@ -224,7 +224,7 @@ abstract class Piwik_ArchiveProcessor
}
$this->insertNumericRecord($done, $flag);
- Piwik_DataAccess_Archiver::releaseArchiveProcessingLock($this->getSite()->getId(), $this->getPeriod(), $this->getSegment());
+ Piwik_DataAccess_Archiver::releaseArchiveProcessorLock($this->getSite()->getId(), $this->getPeriod(), $this->getSegment());
return $idArchive;
diff --git a/core/DataAccess/Archiver.php b/core/DataAccess/Archiver.php
index fdcfc8313505749e628e61d39605db3d5253282a..be720122ddc38c10119aafd3a171f48d8aedec02 100644
--- a/core/DataAccess/Archiver.php
+++ b/core/DataAccess/Archiver.php
@@ -32,7 +32,7 @@ class Piwik_DataAccess_Archiver
* @param Piwik_Segment $segment
* @return string
*/
- static protected function getArchiveProcessingLockName($idsite, $period, Piwik_Segment $segment)
+ static protected function getArchiveProcessorLockName($idsite, $period, Piwik_Segment $segment)
{
$config = Piwik_Config::getInstance();
@@ -55,9 +55,9 @@ class Piwik_DataAccess_Archiver
* @param Piwik_Segment $segment
* @return bool True if lock acquired; false otherwise
*/
- static public function getArchiveProcessingLock($idsite, $period, $segment)
+ static public function getArchiveProcessorLock($idsite, $period, $segment)
{
- $lockName = self::getArchiveProcessingLockName($idsite, $period, $segment);
+ $lockName = self::getArchiveProcessorLockName($idsite, $period, $segment);
return Piwik_GetDbLock($lockName, $maxRetries = 30);
}
@@ -69,9 +69,9 @@ class Piwik_DataAccess_Archiver
* @param Piwik_Segment $segment
* @return bool True if lock released; false otherwise
*/
- static public function releaseArchiveProcessingLock($idsite, $period, $segment)
+ static public function releaseArchiveProcessorLock($idsite, $period, $segment)
{
- $lockName = self::getArchiveProcessingLockName($idsite, $period, $segment);
+ $lockName = self::getArchiveProcessorLockName($idsite, $period, $segment);
return Piwik_ReleaseDbLock($lockName);
}
diff --git a/core/DataArray.php b/core/DataArray.php
index f3ea2f74f7843157e5d426f2f5881d3684e473db..90b805d33faf850f2a3aa07623e978ca9c28f082 100644
--- a/core/DataArray.php
+++ b/core/DataArray.php
@@ -1,4 +1,14 @@
<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ * @category Piwik
+ * @package Piwik
+ */
+
/**
* The DataArray is a data structure used to aggregate datasets,
* ie. sum arrays made of rows made of columns,
diff --git a/core/DataTable/Manager.php b/core/DataTable/Manager.php
index b6baa899d69ea231df5b14ce850a833731aace2a..b091ec646655e4d4ca7a9807732aca47b9fbb485 100644
--- a/core/DataTable/Manager.php
+++ b/core/DataTable/Manager.php
@@ -12,7 +12,7 @@
/**
* The DataTable_Manager registers all the instanciated DataTable and provides an
* easy way to access them. This is used to store all the DataTable during the archiving process.
- * At the end of archiving, the ArchiveProcessing will read the stored datatable and record them in the DB.
+ * At the end of archiving, the ArchiveProcessor will read the stored datatable and record them in the DB.
*
* @package Piwik
* @subpackage Piwik_DataTable
diff --git a/plugins/API/API.php b/plugins/API/API.php
index e2721119f4fa6996776bdba7dcb508e57eec2cff..3e0431c124f182fc1ca0528a5956238d003c8b45 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -527,7 +527,7 @@ class Piwik_API_API
$reportsMetadata = $this->getReportMetadata($idSite, $period, $date, $hideMetricsDoc, $showSubtableReports);
foreach ($reportsMetadata as $report) {
- // See ArchiveProcessing/Period.php - unique visitors are not processed for period != day
+ // See ArchiveProcessor/Period.php - unique visitors are not processed for period != day
if (($period && $period != 'day') && !($apiModule == 'VisitsSummary' && $apiAction == 'get')) {
unset($report['metrics']['nb_uniq_visitors']);
}
diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php
index 7d401b3c59cd9ab01b2f569724cbde90c01e960a..d00ed2590535c4b6d5ccb5c8ba860b7042010c4f 100644
--- a/plugins/Actions/Actions.php
+++ b/plugins/Actions/Actions.php
@@ -573,10 +573,10 @@ class Piwik_Actions extends Piwik_Plugin
*/
public function archiveDay($notification)
{
- /* @var $archiveProcessing Piwik_ArchiveProcessor_Day */
- $archiveProcessing = $notification->getNotificationObject();
+ /* @var $archiveProcessor Piwik_ArchiveProcessor_Day */
+ $archiveProcessor = $notification->getNotificationObject();
- $archiving = new Piwik_Actions_Archiver($archiveProcessing);
+ $archiving = new Piwik_Actions_Archiver($archiveProcessor);
if($archiving->shouldArchive()) {
$archiving->archiveDay();
}
@@ -584,9 +584,9 @@ class Piwik_Actions extends Piwik_Plugin
function archivePeriod($notification)
{
- $archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessor = $notification->getNotificationObject();
- $archiving = new Piwik_Actions_Archiver($archiveProcessing);
+ $archiving = new Piwik_Actions_Archiver($archiveProcessor);
if($archiving->shouldArchive()) {
$archiving->archivePeriod();
}
diff --git a/plugins/CustomVariables/CustomVariables.php b/plugins/CustomVariables/CustomVariables.php
index d0c0b9d75994fa7cee26040babc959f1c614c0be..3f3421fe4161dbf51617ed4b84ec31dd4894409f 100644
--- a/plugins/CustomVariables/CustomVariables.php
+++ b/plugins/CustomVariables/CustomVariables.php
@@ -148,9 +148,9 @@ class Piwik_CustomVariables extends Piwik_Plugin
*/
public function archiveDay($notification)
{
- $archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessor = $notification->getNotificationObject();
- $archiving = new Piwik_CustomVariables_Archiver($archiveProcessing);
+ $archiving = new Piwik_CustomVariables_Archiver($archiveProcessor);
if($archiving->shouldArchive()) {
$archiving->archiveDay();
}
@@ -161,8 +161,8 @@ class Piwik_CustomVariables extends Piwik_Plugin
*/
function archivePeriod($notification)
{
- $archiveProcessing = $notification->getNotificationObject();
- $archiving = new Piwik_CustomVariables_Archiver($archiveProcessing);
+ $archiveProcessor = $notification->getNotificationObject();
+ $archiving = new Piwik_CustomVariables_Archiver($archiveProcessor);
if($archiving->shouldArchive()) {
$archiving->archivePeriod();
}
diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php
index 37ef364ebe8de56679b35357be7395df1ca1b1ba..30c55ffe375fa786dc33f1ca5ca92fd5cf5f5406 100644
--- a/plugins/DevicesDetection/DevicesDetection.php
+++ b/plugins/DevicesDetection/DevicesDetection.php
@@ -239,9 +239,9 @@ class Piwik_DevicesDetection extends Piwik_Plugin
public function archiveDay($notification)
{
- $archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessor = $notification->getNotificationObject();
- $archiving = new Piwik_DevicesDetection_Archiver($archiveProcessing);
+ $archiving = new Piwik_DevicesDetection_Archiver($archiveProcessor);
if($archiving->shouldArchive()) {
$archiving->archiveDay();
}
@@ -249,8 +249,8 @@ class Piwik_DevicesDetection extends Piwik_Plugin
public function archivePeriod($notification)
{
- $archiveProcessing = $notification->getNotificationObject();
- $archiving = new Piwik_DevicesDetection_Archiver($archiveProcessing);
+ $archiveProcessor = $notification->getNotificationObject();
+ $archiving = new Piwik_DevicesDetection_Archiver($archiveProcessor);
if($archiving->shouldArchive()) {
$archiving->archivePeriod();
}
diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php
index ecda10480415211df4b27c26534bade32a240a43..a813b8f010c24489ddc270b9e43c1bfee90a582a 100644
--- a/plugins/Goals/Goals.php
+++ b/plugins/Goals/Goals.php
@@ -511,9 +511,9 @@ class Piwik_Goals extends Piwik_Plugin
/**
* @var Piwik_ArchiveProcessor_Day
*/
- $archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessor = $notification->getNotificationObject();
- $archiving = new Piwik_Goals_Archiver($archiveProcessing);
+ $archiving = new Piwik_Goals_Archiver($archiveProcessor);
if($archiving->shouldArchive()) {
$archiving->archiveDay();
}
@@ -528,9 +528,9 @@ class Piwik_Goals extends Piwik_Plugin
*/
function archivePeriod($notification)
{
- $archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessor = $notification->getNotificationObject();
- $archiving = new Piwik_Goals_Archiver($archiveProcessing);
+ $archiving = new Piwik_Goals_Archiver($archiveProcessor);
if($archiving->shouldArchive()) {
$archiving->archivePeriod();
}
diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php
index a93f48be77f63d7450af1b8b5c5571e5acd41933..f6d1ff1b68b11389049cba208d5859c26f3555ba 100644
--- a/plugins/Provider/Provider.php
+++ b/plugins/Provider/Provider.php
@@ -221,9 +221,9 @@ class Piwik_Provider extends Piwik_Plugin
*/
function archiveDay($notification)
{
- $archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessor = $notification->getNotificationObject();
- $archiving = new Piwik_Provider_Archiver($archiveProcessing);
+ $archiving = new Piwik_Provider_Archiver($archiveProcessor);
if($archiving->shouldArchive()) {
$archiving->archiveDay();
}
@@ -235,9 +235,9 @@ class Piwik_Provider extends Piwik_Plugin
*/
function archivePeriod($notification)
{
- $archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessor = $notification->getNotificationObject();
- $archiving = new Piwik_Provider_Archiver($archiveProcessing);
+ $archiving = new Piwik_Provider_Archiver($archiveProcessor);
if($archiving->shouldArchive()) {
$archiving->archivePeriod();
}
diff --git a/plugins/Referers/Referers.php b/plugins/Referers/Referers.php
index c00f580a03a743d9c1d1b439a2e784fdf4a75b95..d0b05335e6920020b6c3042f0065625a07ccc129 100644
--- a/plugins/Referers/Referers.php
+++ b/plugins/Referers/Referers.php
@@ -289,9 +289,9 @@ class Piwik_Referers extends Piwik_Plugin
*/
public function archiveDay($notification)
{
- $archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessor = $notification->getNotificationObject();
- $archiving = new Piwik_Referers_Archiver($archiveProcessing);
+ $archiving = new Piwik_Referers_Archiver($archiveProcessor);
if ($archiving->shouldArchive()) {
$archiving->archiveDay();
}
@@ -305,8 +305,8 @@ class Piwik_Referers extends Piwik_Plugin
*/
function archivePeriod($notification)
{
- $archiveProcessing = $notification->getNotificationObject();
- $archiving = new Piwik_Referers_Archiver($archiveProcessing);
+ $archiveProcessor = $notification->getNotificationObject();
+ $archiving = new Piwik_Referers_Archiver($archiveProcessor);
if($archiving->shouldArchive()) {
$archiving->archivePeriod();
}
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php
index 7294a78560d406d9d65276c40b753be66fcd9117..bdc79b6e4fa44b664f8429ded2510b02bb3a6c7f 100644
--- a/plugins/Transitions/API.php
+++ b/plugins/Transitions/API.php
@@ -65,7 +65,7 @@ class Piwik_Transitions_API
$segment = new Piwik_Segment($segment, $idSite);
$site = new Piwik_Site($idSite);
$period = Piwik_Period::advancedFactory($period, $date);
- $archiveProcessing = new Piwik_ArchiveProcessor_Day($period, $site, $segment);
+ $archiveProcessor = new Piwik_ArchiveProcessor_Day($period, $site, $segment);
// prepare the report
$report = array(
@@ -81,16 +81,16 @@ class Piwik_Transitions_API
$partsArray = explode(',', $parts);
if ($parts == 'all' || in_array('internalReferrers', $partsArray)) {
- $this->addInternalReferrers($transitionsArchiving, $archiveProcessing, $report, $idaction,
+ $this->addInternalReferrers($transitionsArchiving, $archiveProcessor, $report, $idaction,
$actionType, $limitBeforeGrouping);
}
if ($parts == 'all' || in_array('followingActions', $partsArray)) {
$includeLoops = $parts != 'all' && !in_array('internalReferrers', $partsArray);
- $this->addFollowingActions($transitionsArchiving, $archiveProcessing, $report, $idaction,
+ $this->addFollowingActions($transitionsArchiving, $archiveProcessor, $report, $idaction,
$actionType, $limitBeforeGrouping, $includeLoops);
}
if ($parts == 'all' || in_array('externalReferrers', $partsArray)) {
- $this->addExternalReferrers($transitionsArchiving, $archiveProcessing, $report, $idaction,
+ $this->addExternalReferrers($transitionsArchiving, $archiveProcessor, $report, $idaction,
$actionType, $limitBeforeGrouping);
}
@@ -167,19 +167,19 @@ class Piwik_Transitions_API
* previous pages and previous site searches
*
* @param Piwik_Transitions $transitionsArchiving
- * @param $archiveProcessing
+ * @param $archiveProcessor
* @param $report
* @param $idaction
* @param string $actionType
* @param $limitBeforeGrouping
* @throws Exception
*/
- private function addInternalReferrers($transitionsArchiving, $archiveProcessing, &$report,
+ private function addInternalReferrers($transitionsArchiving, $archiveProcessor, &$report,
$idaction, $actionType, $limitBeforeGrouping)
{
$data = $this->queryInternalReferrers(
- $idaction, $actionType, $archiveProcessing, $limitBeforeGrouping);
+ $idaction, $actionType, $archiveProcessor, $limitBeforeGrouping);
if ($data['pageviews'] == 0) {
throw new Exception('NoDataForAction');
@@ -196,19 +196,19 @@ class Piwik_Transitions_API
* following pages, downloads, outlinks
*
* @param Piwik_Transitions $transitionsArchiving
- * @param $archiveProcessing
+ * @param $archiveProcessor
* @param $report
* @param $idaction
* @param string $actionType
* @param $limitBeforeGrouping
* @param boolean $includeLoops
*/
- private function addFollowingActions($transitionsArchiving, $archiveProcessing, &$report,
+ private function addFollowingActions($transitionsArchiving, $archiveProcessor, &$report,
$idaction, $actionType, $limitBeforeGrouping, $includeLoops = false)
{
$data = $this->queryFollowingActions(
- $idaction, $actionType, $archiveProcessing, $limitBeforeGrouping, $includeLoops);
+ $idaction, $actionType, $archiveProcessor, $limitBeforeGrouping, $includeLoops);
foreach ($data as $tableName => $table) {
$report[$tableName] = $table;
@@ -222,12 +222,12 @@ class Piwik_Transitions_API
*
* @param $idaction
* @param $actionType
- * @param Piwik_ArchiveProcessor_Day $archiveProcessing
+ * @param Piwik_ArchiveProcessor_Day $archiveProcessor
* @param $limitBeforeGrouping
* @param $includeLoops
* @return array(followingPages:Piwik_DataTable, outlinks:Piwik_DataTable, downloads:Piwik_DataTable)
*/
- public function queryFollowingActions($idaction, $actionType, Piwik_ArchiveProcessor_Day $archiveProcessing,
+ public function queryFollowingActions($idaction, $actionType, Piwik_ArchiveProcessor_Day $archiveProcessor,
$limitBeforeGrouping = false, $includeLoops = false)
{
$types = array();
@@ -295,7 +295,7 @@ class Piwik_Transitions_API
}
$metrics = array(Piwik_Archive::INDEX_NB_ACTIONS);
- $data = $archiveProcessing->queryActionsByDimension(array($dimension), $where, $selects, $metrics, $rankingQuery, $joinLogActionColumn);
+ $data = $archiveProcessor->queryActionsByDimension(array($dimension), $where, $selects, $metrics, $rankingQuery, $joinLogActionColumn);
$this->totalTransitionsToFollowingActions = 0;
$dataTables = array();
@@ -334,11 +334,11 @@ class Piwik_Transitions_API
*
* @param $idaction
* @param $actionType
- * @param Piwik_ArchiveProcessor_Day $archiveProcessing
+ * @param Piwik_ArchiveProcessor_Day $archiveProcessor
* @param $limitBeforeGrouping
* @return Piwik_DataTable
*/
- public function queryExternalReferrers($idaction, $actionType, $archiveProcessing,
+ public function queryExternalReferrers($idaction, $actionType, $archiveProcessor,
$limitBeforeGrouping = false)
{
$rankingQuery = new Piwik_RankingQuery($limitBeforeGrouping ? $limitBeforeGrouping : $this->limitBeforeGrouping);
@@ -371,7 +371,7 @@ class Piwik_Transitions_API
$where = 'visit_entry_idaction_' . $type . ' = ' . intval($idaction);
$metrics = array(Piwik_Archive::INDEX_NB_VISITS);
- $data = $archiveProcessing->queryVisitsByDimension($dimensions, $where, $selects, $metrics, $rankingQuery);
+ $data = $archiveProcessor->queryVisitsByDimension($dimensions, $where, $selects, $metrics, $rankingQuery);
$referrerData = array();
$referrerSubData = array();
@@ -408,11 +408,11 @@ class Piwik_Transitions_API
*
* @param $idaction
* @param $actionType
- * @param Piwik_ArchiveProcessor_Day $archiveProcessing
+ * @param Piwik_ArchiveProcessor_Day $archiveProcessor
* @param $limitBeforeGrouping
* @return array(previousPages:Piwik_DataTable, loops:integer)
*/
- protected function queryInternalReferrers($idaction, $actionType, $archiveProcessing,
+ protected function queryInternalReferrers($idaction, $actionType, $archiveProcessor,
$limitBeforeGrouping = false)
{
$rankingQuery = new Piwik_RankingQuery($limitBeforeGrouping ? $limitBeforeGrouping : $this->limitBeforeGrouping);
@@ -453,7 +453,7 @@ class Piwik_Transitions_API
$joinLogActionOn = $dimension;
}
$metrics = array(Piwik_Archive::INDEX_NB_ACTIONS);
- $data = $archiveProcessing->queryActionsByDimension(array($dimension), $where, $selects, $metrics, $rankingQuery, $joinLogActionOn);
+ $data = $archiveProcessor->queryActionsByDimension(array($dimension), $where, $selects, $metrics, $rankingQuery, $joinLogActionOn);
$loops = 0;
$nbPageviews = 0;
@@ -549,18 +549,18 @@ class Piwik_Transitions_API
* direct entries, websites, campaigns, search engines
*
* @param Piwik_Transitions $transitionsArchiving
- * @param $archiveProcessing
+ * @param $archiveProcessor
* @param $report
* @param $idaction
* @param string $actionType
* @param $limitBeforeGrouping
*/
- private function addExternalReferrers($transitionsArchiving, $archiveProcessing, &$report,
+ private function addExternalReferrers($transitionsArchiving, $archiveProcessor, &$report,
$idaction, $actionType, $limitBeforeGrouping)
{
$data = $transitionsArchiving->queryExternalReferrers(
- $idaction, $actionType, $archiveProcessing, $limitBeforeGrouping);
+ $idaction, $actionType, $archiveProcessor, $limitBeforeGrouping);
$report['pageMetrics']['entries'] = 0;
$report['referrers'] = array();
diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php
index b6df074492eb822658ba7945dbec333c25c38089..92c465ee763b5f51e7f9c05b5e481f220be767be 100644
--- a/plugins/UserCountry/UserCountry.php
+++ b/plugins/UserCountry/UserCountry.php
@@ -291,9 +291,9 @@ class Piwik_UserCountry extends Piwik_Plugin
*/
function archivePeriod($notification)
{
- $archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessor = $notification->getNotificationObject();
- $archiving = new Piwik_UserCountry_Archiver($archiveProcessing);
+ $archiving = new Piwik_UserCountry_Archiver($archiveProcessor);
if($archiving->shouldArchive()) {
$archiving->archivePeriod();
}
@@ -305,9 +305,9 @@ class Piwik_UserCountry extends Piwik_Plugin
*/
function archiveDay($notification)
{
- $archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessor = $notification->getNotificationObject();
- $archiving = new Piwik_UserCountry_Archiver($archiveProcessing);
+ $archiving = new Piwik_UserCountry_Archiver($archiveProcessor);
if($archiving->shouldArchive()) {
$archiving->archiveDay();
}
diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php
index e97518c8404aaac62bea510267963cfe1d554811..19b5252360c356495dfdf59882dfa8d185b50e07 100644
--- a/plugins/UserSettings/UserSettings.php
+++ b/plugins/UserSettings/UserSettings.php
@@ -272,9 +272,9 @@ class Piwik_UserSettings extends Piwik_Plugin
*/
function archiveDay($notification)
{
- $archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessor = $notification->getNotificationObject();
- $archiving = new Piwik_UserSettings_Archiver($archiveProcessing);
+ $archiving = new Piwik_UserSettings_Archiver($archiveProcessor);
if($archiving->shouldArchive()) {
$archiving->archiveDay();
}
@@ -289,9 +289,9 @@ class Piwik_UserSettings extends Piwik_Plugin
*/
function archivePeriod($notification)
{
- $archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessor = $notification->getNotificationObject();
- $archiving = new Piwik_UserSettings_Archiver($archiveProcessing);
+ $archiving = new Piwik_UserSettings_Archiver($archiveProcessor);
if($archiving->shouldArchive()) {
$archiving->archivePeriod();
}
diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php
index 6208da6c6428528b05f94e41b0e0cdbb6b675658..b74a48f59ee7b75d13397f09334f79e21b5a3bc7 100644
--- a/plugins/VisitTime/VisitTime.php
+++ b/plugins/VisitTime/VisitTime.php
@@ -132,9 +132,9 @@ class Piwik_VisitTime extends Piwik_Plugin
function archivePeriod($notification)
{
- $archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessor = $notification->getNotificationObject();
- $archiving = new Piwik_VisitTime_Archiver($archiveProcessing);
+ $archiving = new Piwik_VisitTime_Archiver($archiveProcessor);
if($archiving->shouldArchive()) {
$archiving->archivePeriod();
}
@@ -143,8 +143,8 @@ class Piwik_VisitTime extends Piwik_Plugin
public function archiveDay($notification)
{
- $archiveProcessing = $notification->getNotificationObject();
- $archiving = new Piwik_VisitTime_Archiver($archiveProcessing);
+ $archiveProcessor = $notification->getNotificationObject();
+ $archiving = new Piwik_VisitTime_Archiver($archiveProcessor);
if($archiving->shouldArchive()) {
$archiving->archiveDay();
}
diff --git a/plugins/VisitorInterest/VisitorInterest.php b/plugins/VisitorInterest/VisitorInterest.php
index 583e8c31da5fe9ad00b743ad1a027633ca4a1e7f..c2a46f1f9e2b840754b887b84ddacaff2d48ed80 100644
--- a/plugins/VisitorInterest/VisitorInterest.php
+++ b/plugins/VisitorInterest/VisitorInterest.php
@@ -125,9 +125,9 @@ class Piwik_VisitorInterest extends Piwik_Plugin
function archivePeriod($notification)
{
- $archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessor = $notification->getNotificationObject();
- $archiving = new Piwik_VisitorInterest_Archiver($archiveProcessing);
+ $archiving = new Piwik_VisitorInterest_Archiver($archiveProcessor);
if($archiving->shouldArchive()) {
$archiving->archivePeriod();
}
@@ -135,9 +135,9 @@ class Piwik_VisitorInterest extends Piwik_Plugin
public function archiveDay($notification)
{
- $archiveProcessing = $notification->getNotificationObject();
+ $archiveProcessor = $notification->getNotificationObject();
- $archiving = new Piwik_VisitorInterest_Archiver($archiveProcessing);
+ $archiving = new Piwik_VisitorInterest_Archiver($archiveProcessor);
if($archiving->shouldArchive()) {
$archiving->archiveDay();
}
diff --git a/tests/PHPUnit/Core/ArchiveProcessingTest.php b/tests/PHPUnit/Core/ArchiveProcessingTest.php
index c8defbb209e09e17670408bb21f4ea22fddd126d..cca5b50acd490d3a1915deb8395c5447e841a7e3 100644
--- a/tests/PHPUnit/Core/ArchiveProcessingTest.php
+++ b/tests/PHPUnit/Core/ArchiveProcessingTest.php
@@ -39,14 +39,14 @@ class ArchiveProcessingTest extends DatabaseTestCase
}
/**
- * Creates a new ArchiveProcessing object
+ * Creates a new ArchiveProcessor object
*
* @param string $periodLabel
* @param string $dateLabel
* @param string $siteTimezone
* @return Piwik_ArchiveProcessor
*/
- private function _createArchiveProcessing($periodLabel, $dateLabel, $siteTimezone)
+ private function _createArchiveProcessor($periodLabel, $dateLabel, $siteTimezone)
{
$site = $this->_createWebsite($siteTimezone);
$date = Piwik_Date::factory($dateLabel);
@@ -64,7 +64,7 @@ class ArchiveProcessingTest extends DatabaseTestCase
/**
* test of validity of an archive, for a month not finished
* @group Core
- * @group ArchiveProcessing
+ * @group ArchiveProcessor
*/
public function testInitCurrentMonth()
{
@@ -76,10 +76,10 @@ class ArchiveProcessingTest extends DatabaseTestCase
}
$dateLabel = date('Y-m-d', $now);
- $archiveProcessing = $this->_createArchiveProcessing('month', $dateLabel, $siteTimezone);
- $archiveProcessing->time = $now;
+ $archiveProcessor = $this->_createArchiveProcessor('month', $dateLabel, $siteTimezone);
+ $archiveProcessor->time = $now;
- $minTimestamp = $archiveProcessing->getMinTimeArchivedProcessed();
+ $minTimestamp = $archiveProcessor->getMinTimeArchivedProcessed();
@@ -89,67 +89,67 @@ class ArchiveProcessingTest extends DatabaseTestCase
$dateMinArchived = $now - $timeout;
$this->assertEquals($minTimestamp, $dateMinArchived, Piwik_Date::factory($minTimestamp)->getDatetime() . " != " . Piwik_Date::factory($dateMinArchived)->getDatetime());
- $this->assertTrue($archiveProcessing->isArchiveTemporary());
+ $this->assertTrue($archiveProcessor->isArchiveTemporary());
}
/**
* test of validity of an archive, for a month in the past
* @group Core
- * @group ArchiveProcessing
+ * @group ArchiveProcessor
*/
public function testInitDayInPast()
{
- $archiveProcessing = $this->_createArchiveProcessing('day', '2010-01-01', 'UTC');
+ $archiveProcessor = $this->_createArchiveProcessor('day', '2010-01-01', 'UTC');
// min finished timestamp considered when looking at archive timestamp
$dateMinArchived = Piwik_Date::factory('2010-01-02')->getTimestamp();
- $this->assertEquals($archiveProcessing->getMinTimeArchivedProcessed() + 1, $dateMinArchived);
+ $this->assertEquals($archiveProcessor->getMinTimeArchivedProcessed() + 1, $dateMinArchived);
- $this->assertEquals('2010-01-01 00:00:00', $archiveProcessing->getDateStart()->getDateStartUTC());
- $this->assertEquals('2010-01-01 23:59:59', $archiveProcessing->getDateEnd()->getDateEndUTC());
- $this->assertFalse($archiveProcessing->isArchiveTemporary());
+ $this->assertEquals('2010-01-01 00:00:00', $archiveProcessor->getDateStart()->getDateStartUTC());
+ $this->assertEquals('2010-01-01 23:59:59', $archiveProcessor->getDateEnd()->getDateEndUTC());
+ $this->assertFalse($archiveProcessor->isArchiveTemporary());
}
/**
* test of validity of an archive, for a non UTC date in the past
* @group Core
- * @group ArchiveProcessing
+ * @group ArchiveProcessor
*/
public function testInitDayInPastNonUTCWebsite()
{
$timezone = 'UTC+5.5';
- $archiveProcessing = $this->_createArchiveProcessing('day', '2010-01-01', $timezone);
+ $archiveProcessor = $this->_createArchiveProcessor('day', '2010-01-01', $timezone);
// min finished timestamp considered when looking at archive timestamp
$dateMinArchived = Piwik_Date::factory('2010-01-01 18:30:00');
- $this->assertEquals($archiveProcessing->getMinTimeArchivedProcessed() + 1, $dateMinArchived->getTimestamp());
+ $this->assertEquals($archiveProcessor->getMinTimeArchivedProcessed() + 1, $dateMinArchived->getTimestamp());
- $this->assertEquals('2009-12-31 18:30:00', $archiveProcessing->getDateStart()->getDateStartUTC());
- $this->assertEquals('2010-01-01 18:29:59', $archiveProcessing->getDateEnd()->getDateEndUTC());
- $this->assertFalse($archiveProcessing->isArchiveTemporary());
+ $this->assertEquals('2009-12-31 18:30:00', $archiveProcessor->getDateStart()->getDateStartUTC());
+ $this->assertEquals('2010-01-01 18:29:59', $archiveProcessor->getDateEnd()->getDateEndUTC());
+ $this->assertFalse($archiveProcessor->isArchiveTemporary());
}
/**
* test of validity of an archive, for a non UTC month in the past
* @group Core
- * @group ArchiveProcessing
+ * @group ArchiveProcessor
*/
public function testInitMonthInPastNonUTCWebsite()
{
$timezone = 'UTC-5.5';
- $archiveProcessing = $this->_createArchiveProcessing('month', '2010-01-02', $timezone);
+ $archiveProcessor = $this->_createArchiveProcessor('month', '2010-01-02', $timezone);
// min finished timestamp considered when looking at archive timestamp
$dateMinArchived = Piwik_Date::factory('2010-02-01 05:30:00');
- $this->assertEquals($archiveProcessing->getMinTimeArchivedProcessed() + 1, $dateMinArchived->getTimestamp());
+ $this->assertEquals($archiveProcessor->getMinTimeArchivedProcessed() + 1, $dateMinArchived->getTimestamp());
- $this->assertEquals('2010-01-01 05:30:00', $archiveProcessing->getDateStart()->getDateStartUTC());
- $this->assertEquals('2010-02-01 05:29:59', $archiveProcessing->getDateEnd()->getDateEndUTC());
- $this->assertFalse($archiveProcessing->isArchiveTemporary());
+ $this->assertEquals('2010-01-01 05:30:00', $archiveProcessor->getDateStart()->getDateStartUTC());
+ $this->assertEquals('2010-02-01 05:29:59', $archiveProcessor->getDateEnd()->getDateEndUTC());
+ $this->assertFalse($archiveProcessor->isArchiveTemporary());
}
/**
* test of validity of an archive, for today's archive
* @group Core
- * @group ArchiveProcessing
+ * @group ArchiveProcessor
*/
public function testInitToday()
{
@@ -160,15 +160,15 @@ class ArchiveProcessingTest extends DatabaseTestCase
Piwik_ArchiveProcessor_Rules::setBrowserTriggerArchiving(true);
- $archiveProcessing = $this->_createArchiveProcessing('day', $dateLabel, $siteTimezone);
- $archiveProcessing->time = $now;
+ $archiveProcessor = $this->_createArchiveProcessor('day', $dateLabel, $siteTimezone);
+ $archiveProcessor->time = $now;
// we look at anything processed within the time to live range
$dateMinArchived = $now - Piwik_ArchiveProcessor_Rules::getTodayArchiveTimeToLive();
- $this->assertEquals($dateMinArchived, $archiveProcessing->getMinTimeArchivedProcessed());
- $this->assertTrue($archiveProcessing->isArchiveTemporary());
+ $this->assertEquals($dateMinArchived, $archiveProcessor->getMinTimeArchivedProcessed());
+ $this->assertTrue($archiveProcessor->isArchiveTemporary());
- // when browsers don't trigger archives, we force ArchiveProcessing
+ // when browsers don't trigger archives, we force ArchiveProcessor
// to fetch any of the most recent archive
Piwik_ArchiveProcessor_Rules::setBrowserTriggerArchiving(false);
// see isArchivingDisabled()
@@ -177,17 +177,17 @@ class ArchiveProcessingTest extends DatabaseTestCase
if (!Piwik_Common::isPhpCliMode()) {
$dateMinArchived = 0;
}
- $this->assertEquals($archiveProcessing->getMinTimeArchivedProcessed(), $dateMinArchived);
+ $this->assertEquals($archiveProcessor->getMinTimeArchivedProcessed(), $dateMinArchived);
- $this->assertEquals(date('Y-m-d', $timestamp) . ' 01:00:00', $archiveProcessing->getDateStart()->getDateStartUTC());
- $this->assertEquals(date('Y-m-d', $timestamp + 86400) . ' 00:59:59', $archiveProcessing->getDateEnd()->getDateEndUTC());
- $this->assertTrue($archiveProcessing->isArchiveTemporary());
+ $this->assertEquals(date('Y-m-d', $timestamp) . ' 01:00:00', $archiveProcessor->getDateStart()->getDateStartUTC());
+ $this->assertEquals(date('Y-m-d', $timestamp + 86400) . ' 00:59:59', $archiveProcessor->getDateEnd()->getDateEndUTC());
+ $this->assertTrue($archiveProcessor->isArchiveTemporary());
}
/**
* test of validity of an archive, for today's archive with european timezone
* @group Core
- * @group ArchiveProcessing
+ * @group ArchiveProcessor
*/
public function testInitTodayEurope()
{
@@ -202,15 +202,15 @@ class ArchiveProcessingTest extends DatabaseTestCase
Piwik_ArchiveProcessor_Rules::setBrowserTriggerArchiving(true);
- $archiveProcessing = $this->_createArchiveProcessing('day', $dateLabel, $siteTimezone);
- $archiveProcessing->time = $now;
+ $archiveProcessor = $this->_createArchiveProcessor('day', $dateLabel, $siteTimezone);
+ $archiveProcessor->time = $now;
// we look at anything processed within the time to live range
$dateMinArchived = $now - Piwik_ArchiveProcessor_Rules::getTodayArchiveTimeToLive();
- $this->assertEquals($archiveProcessing->getMinTimeArchivedProcessed(), $dateMinArchived);
- $this->assertTrue($archiveProcessing->isArchiveTemporary());
+ $this->assertEquals($archiveProcessor->getMinTimeArchivedProcessed(), $dateMinArchived);
+ $this->assertTrue($archiveProcessor->isArchiveTemporary());
- // when browsers don't trigger archives, we force ArchiveProcessing
+ // when browsers don't trigger archives, we force ArchiveProcessor
// to fetch any of the most recent archive
Piwik_ArchiveProcessor_Rules::setBrowserTriggerArchiving(false);
// see isArchivingDisabled()
@@ -219,21 +219,21 @@ class ArchiveProcessingTest extends DatabaseTestCase
if (!Piwik_Common::isPhpCliMode()) {
$dateMinArchived = 0;
}
- $this->assertEquals($archiveProcessing->getMinTimeArchivedProcessed(), $dateMinArchived);
+ $this->assertEquals($archiveProcessor->getMinTimeArchivedProcessed(), $dateMinArchived);
// this test varies with DST
- $this->assertTrue($archiveProcessing->getDateStart()->getDateStartUTC() == date('Y-m-d', $timestamp - 86400) . ' 22:00:00' ||
- $archiveProcessing->getDateStart()->getDateStartUTC() == date('Y-m-d', $timestamp - 86400) . ' 23:00:00');
- $this->assertTrue($archiveProcessing->getDateEnd()->getDateEndUTC() == date('Y-m-d', $timestamp) . ' 21:59:59' ||
- $archiveProcessing->getDateEnd()->getDateEndUTC() == date('Y-m-d', $timestamp) . ' 22:59:59');
+ $this->assertTrue($archiveProcessor->getDateStart()->getDateStartUTC() == date('Y-m-d', $timestamp - 86400) . ' 22:00:00' ||
+ $archiveProcessor->getDateStart()->getDateStartUTC() == date('Y-m-d', $timestamp - 86400) . ' 23:00:00');
+ $this->assertTrue($archiveProcessor->getDateEnd()->getDateEndUTC() == date('Y-m-d', $timestamp) . ' 21:59:59' ||
+ $archiveProcessor->getDateEnd()->getDateEndUTC() == date('Y-m-d', $timestamp) . ' 22:59:59');
- $this->assertTrue($archiveProcessing->isArchiveTemporary());
+ $this->assertTrue($archiveProcessor->isArchiveTemporary());
}
/**
* test of validity of an archive, for today's archive with toronto's timezone
* @group Core
- * @group ArchiveProcessing
+ * @group ArchiveProcessor
*/
public function testInitTodayToronto()
{
@@ -248,15 +248,15 @@ class ArchiveProcessingTest extends DatabaseTestCase
Piwik_ArchiveProcessor_Rules::setBrowserTriggerArchiving(true);
- $archiveProcessing = $this->_createArchiveProcessing('day', $dateLabel, $siteTimezone);
- $archiveProcessing->time = $now;
+ $archiveProcessor = $this->_createArchiveProcessor('day', $dateLabel, $siteTimezone);
+ $archiveProcessor->time = $now;
// we look at anything processed within the time to live range
$dateMinArchived = $now - Piwik_ArchiveProcessor_Rules::getTodayArchiveTimeToLive();
- $this->assertEquals($archiveProcessing->getMinTimeArchivedProcessed(), $dateMinArchived);
- $this->assertTrue($archiveProcessing->isArchiveTemporary());
+ $this->assertEquals($archiveProcessor->getMinTimeArchivedProcessed(), $dateMinArchived);
+ $this->assertTrue($archiveProcessor->isArchiveTemporary());
- // when browsers don't trigger archives, we force ArchiveProcessing
+ // when browsers don't trigger archives, we force ArchiveProcessor
// to fetch any of the most recent archive
Piwik_ArchiveProcessor_Rules::setBrowserTriggerArchiving(false);
// see isArchivingDisabled()
@@ -265,21 +265,21 @@ class ArchiveProcessingTest extends DatabaseTestCase
if (!Piwik_Common::isPhpCliMode()) {
$dateMinArchived = 0;
}
- $this->assertEquals($archiveProcessing->getMinTimeArchivedProcessed(), $dateMinArchived);
+ $this->assertEquals($archiveProcessor->getMinTimeArchivedProcessed(), $dateMinArchived);
// this test varies with DST
- $this->assertTrue($archiveProcessing->getDateStart()->getDateStartUTC() == date('Y-m-d', $timestamp) . ' 04:00:00' ||
- $archiveProcessing->getDateStart()->getDateStartUTC() == date('Y-m-d', $timestamp) . ' 05:00:00');
- $this->assertTrue($archiveProcessing->getDateEnd()->getDateEndUTC() == date('Y-m-d', $timestamp + 86400) . ' 03:59:59' ||
- $archiveProcessing->getDateEnd()->getDateEndUTC() == date('Y-m-d', $timestamp + 86400) . ' 04:59:59');
+ $this->assertTrue($archiveProcessor->getDateStart()->getDateStartUTC() == date('Y-m-d', $timestamp) . ' 04:00:00' ||
+ $archiveProcessor->getDateStart()->getDateStartUTC() == date('Y-m-d', $timestamp) . ' 05:00:00');
+ $this->assertTrue($archiveProcessor->getDateEnd()->getDateEndUTC() == date('Y-m-d', $timestamp + 86400) . ' 03:59:59' ||
+ $archiveProcessor->getDateEnd()->getDateEndUTC() == date('Y-m-d', $timestamp + 86400) . ' 04:59:59');
- $this->assertTrue($archiveProcessing->isArchiveTemporary());
+ $this->assertTrue($archiveProcessor->isArchiveTemporary());
}
/**
* Testing batch insert
* @group Core
- * @group ArchiveProcessing
+ * @group ArchiveProcessor
*/
public function testTableInsertBatch()
{
@@ -331,7 +331,7 @@ class ArchiveProcessingTest extends DatabaseTestCase
/**
* Testing plain inserts
* @group Core
- * @group ArchiveProcessing
+ * @group ArchiveProcessor
*/
public function testTableInsertBatchIterate()
{
@@ -355,15 +355,15 @@ class ArchiveProcessingTest extends DatabaseTestCase
/**
* Testing batch insert (BLOB)
* @group Core
- * @group ArchiveProcessing
+ * @group ArchiveProcessor
*/
public function testTableInsertBatchBlob()
{
$siteTimezone = 'America/Toronto';
$dateLabel = '2011-03-31';
- $archiveProcessing = $this->_createArchiveProcessing('day', $dateLabel, $siteTimezone);
+ $archiveProcessor = $this->_createArchiveProcessor('day', $dateLabel, $siteTimezone);
- $table = $archiveProcessing->getTableArchiveBlobName();
+ $table = $archiveProcessor->getTableArchiveBlobName();
$data = $this->_getBlobDataInsert();
try {
@@ -390,15 +390,15 @@ class ArchiveProcessingTest extends DatabaseTestCase
/**
* Testing plain inserts (BLOB)
* @group Core
- * @group ArchiveProcessing
+ * @group ArchiveProcessor
*/
public function testTableInsertBatchIterateBlob()
{
$siteTimezone = 'America/Toronto';
$dateLabel = '2011-03-31';
- $archiveProcessing = $this->_createArchiveProcessing('day', $dateLabel, $siteTimezone);
+ $archiveProcessor = $this->_createArchiveProcessor('day', $dateLabel, $siteTimezone);
- $table = $archiveProcessing->getTableArchiveBlobName();
+ $table = $archiveProcessor->getTableArchiveBlobName();
$data = $this->_getBlobDataInsert();
Piwik::tableInsertBatchIterate($table, array('idarchive', 'name', 'idsite', 'date1', 'date2', 'period', 'ts_archived', 'value'), $data);