moved some more dimensions to plugins, fixed some issues, removed some more duplicated code etc. Tests will not be green as there fixes to country detection

7 files changed, 17 insertions, 47 deletions

diff --git a/plugins/VisitTime/Columns/Dayoftheweek.php b/plugins/VisitTime/Columns/Dayoftheweek.php
index 950f3f80a1..99b8f819d5 100644
--- a/plugins/VisitTime/Columns/Dayoftheweek.php
+++ b/plugins/VisitTime/Columns/Dayoftheweek.php
@@ -11,7 +11,7 @@ namespace Piwik\Plugins\VisitTime\Columns;
 use Piwik\Piwik;
 use Piwik\Plugin\VisitDimension;
 
-class Dayoftheweek extends VisitDimension
+class DayOfTheWeek extends VisitDimension
 {    
     public function getName()
     {
diff --git a/plugins/VisitTime/Columns/Localtime.php b/plugins/VisitTime/Columns/Localtime.php
index 6f0cc5f727..ea57eb3e68 100644
--- a/plugins/VisitTime/Columns/Localtime.php
+++ b/plugins/VisitTime/Columns/Localtime.php
@@ -13,8 +13,9 @@ use Piwik\Plugin\VisitDimension;
 use Piwik\Plugins\VisitTime\Segment;
 use Piwik\Tracker\Action;
 use Piwik\Tracker\Request;
+use Piwik\Tracker\Visitor;
 
-class Localtime extends VisitDimension
+class LocalTime extends VisitDimension
 {    
     protected $fieldName = 'visitor_localtime';
     protected $fieldType = 'TIME NOT NULL';
@@ -25,7 +26,7 @@ class Localtime extends VisitDimension
         $segment->setSegment('visitLocalHour');
         $segment->setName('VisitTime_ColumnLocalTime');
         $segment->setSqlSegment('HOUR(log_visit.visitor_localtime)');
-        $segment->setAcceptValues('0, 1, 2, 3, ..., 20, 21, 22, 23');
+        $segment->setAcceptedValues('0, 1, 2, 3, ..., 20, 21, 22, 23');
         $this->addSegment($segment);
     }
 
@@ -36,11 +37,11 @@ class Localtime extends VisitDimension
 
     /**
      * @param Request $request
-     * @param array   $visit
+     * @param Visitor $visitor
      * @param Action|null $action
-     * @return int
+     * @return mixed
      */
-    public function onNewVisit(Request $request, $visit, $action)
+    public function onNewVisit(Request $request, Visitor $visitor, $action)
     {
         return $request->getLocalTime();
     }
diff --git a/plugins/VisitTime/Columns/Servertime.php b/plugins/VisitTime/Columns/Servertime.php
index 69cf2f54dc..6e69670d93 100644
--- a/plugins/VisitTime/Columns/Servertime.php
+++ b/plugins/VisitTime/Columns/Servertime.php
@@ -12,7 +12,7 @@ use Piwik\Piwik;
 use Piwik\Plugin\VisitDimension;
 use Piwik\Plugins\VisitTime\Segment;
 
-class Servertime extends VisitDimension
+class ServerTime extends VisitDimension
 {    
     protected $fieldName = 'visit_last_action_time';
 
@@ -22,7 +22,7 @@ class Servertime extends VisitDimension
         $segment->setSegment('visitServerHour');
         $segment->setName('VisitTime_ColumnServerTime');
         $segment->setSqlSegment('HOUR(log_visit.visit_last_action_time)');
-        $segment->setAcceptValues('0, 1, 2, 3, ..., 20, 21, 22, 23');
+        $segment->setAcceptedValues('0, 1, 2, 3, ..., 20, 21, 22, 23');
         $this->addSegment($segment);
     }
 
diff --git a/plugins/VisitTime/Reports/GetByDayOfWeek.php b/plugins/VisitTime/Reports/GetByDayOfWeek.php
index 3905beaac2..a01d0ed8ce 100644
--- a/plugins/VisitTime/Reports/GetByDayOfWeek.php
+++ b/plugins/VisitTime/Reports/GetByDayOfWeek.php
@@ -12,7 +12,7 @@ use Piwik\Common;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
-use Piwik\Plugins\VisitTime\Columns\Dayoftheweek;
+use Piwik\Plugins\VisitTime\Columns\DayOfTheWeek;
 use Piwik\Period;
 use Piwik\Site;
 
@@ -21,7 +21,7 @@ class GetByDayOfWeek extends Base
     protected function init()
     {
         parent::init();
-        $this->dimension     = new Dayoftheweek();
+        $this->dimension     = new DayOfTheWeek();
         $this->name          = Piwik::translate('VisitTime_VisitsByDayOfWeek');
         $this->documentation = Piwik::translate('VisitTime_WidgetByDayOfWeekDocumentation');
         $this->constantRowsCount = true;
diff --git a/plugins/VisitTime/Reports/GetVisitInformationPerLocalTime.php b/plugins/VisitTime/Reports/GetVisitInformationPerLocalTime.php
index 330aaaf3aa..7700cc67d5 100644
--- a/plugins/VisitTime/Reports/GetVisitInformationPerLocalTime.php
+++ b/plugins/VisitTime/Reports/GetVisitInformationPerLocalTime.php
@@ -12,14 +12,14 @@ use Piwik\Common;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
-use Piwik\Plugins\VisitTime\Columns\Localtime;
+use Piwik\Plugins\VisitTime\Columns\LocalTime;
 
 class GetVisitInformationPerLocalTime extends Base
 {
     protected function init()
     {
         parent::init();
-        $this->dimension     = new Localtime();
+        $this->dimension     = new LocalTime();
         $this->name          = Piwik::translate('VisitTime_WidgetLocalTime');
         $this->documentation = Piwik::translate('VisitTime_WidgetLocalTimeDocumentation', array('<strong>', '</strong>'));
         $this->constantRowsCount = true;
diff --git a/plugins/VisitTime/Reports/GetVisitInformationPerServerTime.php b/plugins/VisitTime/Reports/GetVisitInformationPerServerTime.php
index 68fd602aee..87901a97ac 100644
--- a/plugins/VisitTime/Reports/GetVisitInformationPerServerTime.php
+++ b/plugins/VisitTime/Reports/GetVisitInformationPerServerTime.php
@@ -11,17 +11,18 @@ namespace Piwik\Plugins\VisitTime\Reports;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
-use Piwik\Plugins\VisitTime\Columns\Servertime;
+use Piwik\Plugins\VisitTime\Columns\ServerTime;
 
 class GetVisitInformationPerServerTime extends Base
 {
     protected function init()
     {
         parent::init();
-        $this->dimension     = new Servertime();
+        $this->dimension     = new ServerTime();
         $this->name          = Piwik::translate('VisitTime_WidgetServerTime');
         $this->documentation = Piwik::translate('VisitTime_WidgetServerTimeDocumentation', array('<strong>', '</strong>'));
         $this->constantRowsCount = true;
+        $this->hasGoalMetrics = true;
         $this->order = 15;
         $this->widgetTitle  = 'VisitTime_WidgetServerTime';
     }
diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php
index 3a4d3b7685..bbec179268 100644
--- a/plugins/VisitTime/VisitTime.php
+++ b/plugins/VisitTime/VisitTime.php
@@ -8,39 +8,7 @@
  */
 namespace Piwik\Plugins\VisitTime;
 
-use Exception;
-use Piwik\ArchiveProcessor;
-use Piwik\Common;
-use Piwik\Period;
-use Piwik\Piwik;
-use Piwik\Plugin\ViewDataTable;
-use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
-use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Bar;
-use Piwik\Site;
-
-/**
- *
- */
+// empty plugin definition, otherwise plugin won't be installed during test run
 class VisitTime extends \Piwik\Plugin
 {
-    /**
-     * @see Piwik\Plugin::getListHooksRegistered
-     */
-    public function getListHooksRegistered()
-    {
-        return array(
-            'Goals.getReportsWithGoalMetrics' => 'getReportsWithGoalMetrics'
-        );
-    }
-
-    public function getReportsWithGoalMetrics(&$dimensions)
-    {
-        $dimensions[] = array('category' => Piwik::translate('VisitTime_ColumnServerTime'),
-                              'name'     => Piwik::translate('VisitTime_ColumnServerTime'),
-                              'module'   => 'VisitTime',
-                              'action'   => 'getVisitInformationPerServerTime',
-        );
-    }
-
-
 }