From 05c4b313cf29bec72bb6cd8ed10142b84b39a4c6 Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Thu, 13 Nov 2014 20:46:17 -0800
Subject: Move all Metrics to Columns folder.

---
 .../Columns/Metrics/ReturningMetric.php            | 64 ++++++++++++++++++++++
 plugins/VisitFrequency/Metrics/ReturningMetric.php | 64 ----------------------
 plugins/VisitFrequency/Reports/Get.php             |  8 +--
 3 files changed, 68 insertions(+), 68 deletions(-)
 create mode 100644 plugins/VisitFrequency/Columns/Metrics/ReturningMetric.php
 delete mode 100644 plugins/VisitFrequency/Metrics/ReturningMetric.php

(limited to 'plugins/VisitFrequency')

diff --git a/plugins/VisitFrequency/Columns/Metrics/ReturningMetric.php b/plugins/VisitFrequency/Columns/Metrics/ReturningMetric.php
new file mode 100644
index 0000000000..3477667275
--- /dev/null
+++ b/plugins/VisitFrequency/Columns/Metrics/ReturningMetric.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Plugins\VisitFrequency\Columns\Metrics;
+
+use Piwik\DataTable\Row;
+use Piwik\Metrics\Formatter;
+use Piwik\Piwik;
+use Piwik\Plugin\ProcessedMetric;
+
+/**
+ * Processed metric for VisitFrequency.get API method which just copies VisitsSummary.get
+ * metrics as differently named metrics.
+ *
+ * This metric must be supplied in order to ensure correct formatting for processed
+ * metrics that are copied from VisitsSummary.get.
+ */
+class ReturningMetric extends ProcessedMetric
+{
+    private static $translations = array(
+        'avg_time_on_site_returning' => 'VisitFrequency_ColumnAverageVisitDurationForReturningVisitors',
+        'nb_actions_per_visit_returning' => 'VisitFrequency_ColumnAvgActionsPerReturningVisit',
+        'bounce_rate_returning' => 'VisitFrequency_ColumnBounceRateForReturningVisits',
+    );
+
+    /**
+     * @var ProcessedMetric
+     */
+    private $wrapped;
+
+    public function __construct(ProcessedMetric $wrapped)
+    {
+        $this->wrapped = $wrapped;
+    }
+
+    public function getName()
+    {
+        return $this->wrapped->getName() . '_returning';
+    }
+
+    public function getTranslatedName()
+    {
+        return Piwik::translate(self::$translations[$this->getName()]);
+    }
+
+    public function format($value, Formatter $formatter)
+    {
+        return $this->wrapped->format($value, $formatter);
+    }
+
+    public function compute(Row $row)
+    {
+        return 0; // (metric is not computed, it is copied from segmented report)
+    }
+
+    public function getDependentMetrics()
+    {
+        return array();
+    }
+}
\ No newline at end of file
diff --git a/plugins/VisitFrequency/Metrics/ReturningMetric.php b/plugins/VisitFrequency/Metrics/ReturningMetric.php
deleted file mode 100644
index 6768523dad..0000000000
--- a/plugins/VisitFrequency/Metrics/ReturningMetric.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-namespace Piwik\Plugins\VisitFrequency\Metrics;
-
-use Piwik\DataTable\Row;
-use Piwik\Metrics\Formatter;
-use Piwik\Piwik;
-use Piwik\Plugin\ProcessedMetric;
-
-/**
- * Processed metric for VisitFrequency.get API method which just copies VisitsSummary.get
- * metrics as differently named metrics.
- *
- * This metric must be supplied in order to ensure correct formatting for processed
- * metrics that are copied from VisitsSummary.get.
- */
-class ReturningMetric extends ProcessedMetric
-{
-    private static $translations = array(
-        'avg_time_on_site_returning' => 'VisitFrequency_ColumnAverageVisitDurationForReturningVisitors',
-        'nb_actions_per_visit_returning' => 'VisitFrequency_ColumnAvgActionsPerReturningVisit',
-        'bounce_rate_returning' => 'VisitFrequency_ColumnBounceRateForReturningVisits',
-    );
-
-    /**
-     * @var ProcessedMetric
-     */
-    private $wrapped;
-
-    public function __construct(ProcessedMetric $wrapped)
-    {
-        $this->wrapped = $wrapped;
-    }
-
-    public function getName()
-    {
-        return $this->wrapped->getName() . '_returning';
-    }
-
-    public function getTranslatedName()
-    {
-        return Piwik::translate(self::$translations[$this->getName()]);
-    }
-
-    public function format($value, Formatter $formatter)
-    {
-        return $this->wrapped->format($value, $formatter);
-    }
-
-    public function compute(Row $row)
-    {
-        return 0; // (metric is not computed, it is copied from segmented report)
-    }
-
-    public function getDependentMetrics()
-    {
-        return array();
-    }
-}
\ No newline at end of file
diff --git a/plugins/VisitFrequency/Reports/Get.php b/plugins/VisitFrequency/Reports/Get.php
index 332b9b6e09..d6f06e9fcf 100644
--- a/plugins/VisitFrequency/Reports/Get.php
+++ b/plugins/VisitFrequency/Reports/Get.php
@@ -9,10 +9,10 @@
 namespace Piwik\Plugins\VisitFrequency\Reports;
 
 use Piwik\Piwik;
-use Piwik\Plugins\CoreHome\Metrics\ActionsPerVisit;
-use Piwik\Plugins\CoreHome\Metrics\AverageTimeOnSite;
-use Piwik\Plugins\CoreHome\Metrics\BounceRate;
-use Piwik\Plugins\VisitFrequency\Metrics\ReturningMetric;
+use Piwik\Plugins\CoreHome\Columns\Metrics\ActionsPerVisit;
+use Piwik\Plugins\CoreHome\Columns\Metrics\AverageTimeOnSite;
+use Piwik\Plugins\CoreHome\Columns\Metrics\BounceRate;
+use Piwik\Plugins\VisitFrequency\Columns\Metrics\ReturningMetric;
 
 class Get extends \Piwik\Plugin\Report
 {
-- 
cgit v1.2.3