From 764a8c147f8992ae99a679573fc434d82dd7b0a6 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Fri, 5 Dec 2014 19:18:17 +1300
Subject: [PATCH] Moved SegmentExpression into namespace Piwik\Segment
---
core/Segment.php | 1 +
core/{ => Segment}/SegmentExpression.php | 2 +-
core/Tracker/TableLogAction.php | 2 +-
plugins/API/API.php | 2 +-
plugins/Transitions/API.php | 2 +-
plugins/VisitFrequency/API.php | 2 +-
tests/PHPUnit/Unit/{ => Segment}/SegmentExpressionTest.php | 2 +-
7 files changed, 7 insertions(+), 6 deletions(-)
rename core/{ => Segment}/SegmentExpression.php (99%)
rename tests/PHPUnit/Unit/{ => Segment}/SegmentExpressionTest.php (99%)
diff --git a/core/Segment.php b/core/Segment.php
index 420946794d..d990ed16ff 100644
--- a/core/Segment.php
+++ b/core/Segment.php
@@ -10,6 +10,7 @@ namespace Piwik;
use Exception;
use Piwik\Plugins\API\API;
+use Piwik\Segment\SegmentExpression;
/**
* Limits the set of visits Piwik uses when aggregating analytics data.
diff --git a/core/SegmentExpression.php b/core/Segment/SegmentExpression.php
similarity index 99%
rename from core/SegmentExpression.php
rename to core/Segment/SegmentExpression.php
index cbd2a3eb9e..e32bbe8723 100644
--- a/core/SegmentExpression.php
+++ b/core/Segment/SegmentExpression.php
@@ -7,7 +7,7 @@
*
*/
-namespace Piwik;
+namespace Piwik\Segment;
use Exception;
diff --git a/core/Tracker/TableLogAction.php b/core/Tracker/TableLogAction.php
index 709936f2a5..fe620035d7 100644
--- a/core/Tracker/TableLogAction.php
+++ b/core/Tracker/TableLogAction.php
@@ -10,7 +10,7 @@
namespace Piwik\Tracker;
use Piwik\Common;
-use Piwik\SegmentExpression;
+use Piwik\Segment\SegmentExpression;
use Piwik\Tracker;
/**
diff --git a/plugins/API/API.php b/plugins/API/API.php
index f9f60dd261..f7aa20d08b 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -23,7 +23,7 @@ use Piwik\Period\Range;
use Piwik\Piwik;
use Piwik\Plugin\Dimension\VisitDimension;
use Piwik\Plugins\CoreAdminHome\CustomLogo;
-use Piwik\SegmentExpression;
+use Piwik\Segment\SegmentExpression;
use Piwik\Translate;
use Piwik\Version;
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php
index 32abffdc06..44a39fdcf5 100644
--- a/plugins/Transitions/API.php
+++ b/plugins/Transitions/API.php
@@ -24,7 +24,7 @@ use Piwik\Plugins\Actions\Actions;
use Piwik\Plugins\Actions\ArchivingHelper;
use Piwik\RankingQuery;
use Piwik\Segment;
-use Piwik\SegmentExpression;
+use Piwik\Segment\SegmentExpression;
use Piwik\Site;
use Piwik\Tracker\Action;
use Piwik\Tracker\PageUrl;
diff --git a/plugins/VisitFrequency/API.php b/plugins/VisitFrequency/API.php
index 97a98f27f8..a6f9971480 100644
--- a/plugins/VisitFrequency/API.php
+++ b/plugins/VisitFrequency/API.php
@@ -13,7 +13,7 @@ use Piwik\Archive;
use Piwik\DataTable;
use Piwik\Piwik;
use Piwik\Plugins\VisitsSummary\API as APIVisitsSummary;
-use Piwik\SegmentExpression;
+use Piwik\Segment\SegmentExpression;
/**
* VisitFrequency API lets you access a list of metrics related to Returning Visitors.
diff --git a/tests/PHPUnit/Unit/SegmentExpressionTest.php b/tests/PHPUnit/Unit/Segment/SegmentExpressionTest.php
similarity index 99%
rename from tests/PHPUnit/Unit/SegmentExpressionTest.php
rename to tests/PHPUnit/Unit/Segment/SegmentExpressionTest.php
index aadecc8f0e..ede256707b 100644
--- a/tests/PHPUnit/Unit/SegmentExpressionTest.php
+++ b/tests/PHPUnit/Unit/Segment/SegmentExpressionTest.php
@@ -8,7 +8,7 @@
namespace Piwik\Tests\Unit;
-use Piwik\SegmentExpression;
+use Piwik\Segment\SegmentExpression;
class SegmentExpressionTest extends \PHPUnit_Framework_TestCase
{
--
GitLab