From fb72cff69f33db7397a1a7e53a65cb7464147d83 Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Fri, 9 May 2014 18:59:10 +1200
Subject: [PATCH] Organised imports, using phpstorm optimize imports feature
---
core/API/DataTableGenericFilter.php | 2 +-
core/API/DataTableManipulator.php | 2 +-
core/API/DataTableManipulator/Flattener.php | 2 +-
core/API/DataTableManipulator/LabelFilter.php | 2 +-
core/API/ResponseBuilder.php | 2 +-
core/AssetManager.php | 4 ++--
core/AssetManager/UIAssetMerger.php | 2 +-
.../UIAssetMerger/JScriptUIAssetMerger.php | 2 +-
core/Common.php | 2 +-
core/DataAccess/ArchiveSelector.php | 4 ++--
core/DataAccess/ArchiveWriter.php | 2 +-
core/DataTable.php | 2 +-
.../Filter/AddColumnsProcessedMetrics.php | 2 +-
core/DataTable/Filter/ReplaceColumnNames.php | 2 +-
core/DataTable/Filter/ReplaceSummaryRowLabel.php | 2 +-
core/DataTable/Filter/Sort.php | 2 +-
core/DataTable/Filter/Truncate.php | 2 +-
core/DataTable/Map.php | 2 +-
core/DataTable/Renderer/Csv.php | 2 +-
core/DataTable/Renderer/Html.php | 2 +-
core/DataTable/Renderer/Php.php | 2 +-
core/DataTable/Renderer/Rss.php | 2 +-
core/Piwik.php | 2 +-
core/Plugin/Controller.php | 8 ++++----
core/Plugin/ControllerAdmin.php | 4 ++--
core/Plugin/Manager.php | 2 +-
core/Plugin/ViewDataTable.php | 2 +-
core/ReportRenderer.php | 2 +-
core/Tracker/Db/Pdo/Mysql.php | 2 +-
core/Updates/2.1.1-b11.php | 2 +-
plugins/CustomAlerts | 2 +-
plugins/TreemapVisualization | 2 +-
tests/PHPUnit/Core/AssetManagerTest.php | 4 ++--
.../PHPUnit/Core/DataTable/Renderer/CSVTest.php | 2 +-
.../Core/DataTable/Renderer/ConsoleTest.php | 2 +-
.../PHPUnit/Core/DataTable/Renderer/JSONTest.php | 2 +-
.../PHPUnit/Core/DataTable/Renderer/PHPTest.php | 2 +-
.../PHPUnit/Core/DataTable/Renderer/XMLTest.php | 2 +-
tests/PHPUnit/Core/DataTableTest.php | 2 +-
tests/PHPUnit/Core/DependencyTest.php | 2 +-
tests/PHPUnit/Core/DeprecatedMethodsTest.php | 4 ----
tests/PHPUnit/Core/PeriodTest.php | 2 +-
tests/PHPUnit/Core/ScheduledTime/DailyTest.php | 1 -
tests/PHPUnit/Core/TaskSchedulerTest.php | 1 -
tests/PHPUnit/Core/UnzipTest.php | 2 +-
tests/PHPUnit/Core/UrlTest.php | 1 -
tests/PHPUnit/DatabaseTestCase.php | 9 ---------
tests/PHPUnit/Fixture.php | 16 ++++++++--------
tests/PHPUnit/Fixtures/ManySitesImportedLogs.php | 2 +-
.../ManySitesImportedLogsWithXssAttempts.php | 3 ---
tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php | 2 +-
tests/PHPUnit/Fixtures/OmniFixture.php | 3 +--
tests/PHPUnit/Fixtures/SqlDump.php | 1 -
tests/PHPUnit/Fixtures/UITestFixture.php | 14 ++++++--------
tests/PHPUnit/Integration/ArchiveCronTest.php | 1 -
tests/PHPUnit/Integration/ArchiveWebTest.php | 3 ---
.../Integration/BackwardsCompatibility1XTest.php | 8 ++------
.../Integration/Core/ArchiveProcessingTest.php | 5 ++---
tests/PHPUnit/Integration/Core/CliMultiTest.php | 4 ++--
.../Core/CronArchive/SharedSiteIdsTest.php | 2 +-
tests/PHPUnit/Integration/Core/DbTest.php | 2 +-
tests/PHPUnit/Integration/Core/LogTest.php | 4 ++--
tests/PHPUnit/Integration/Core/PiwikTest.php | 1 -
.../Integration/ManyVisitorsOneWebsiteTest.php | 1 +
.../CorePluginsAdmin/UpdateCommunicationTest.php | 4 ++--
.../CoreUpdater/UpdateCommunicationTest.php | 2 +-
tests/PHPUnit/Integration/Plugins/LoginTest.php | 1 -
.../Plugins/PrivacyManagerConfigTest.php | 2 +-
.../Integration/Plugins/PrivacyManagerTest.php | 2 +-
.../Integration/Plugins/ScheduledReportsTest.php | 3 +--
.../Integration/Plugins/SegmentEditorTest.php | 2 +-
tests/PHPUnit/Integration/PurgeDataTest.php | 6 +++---
tests/PHPUnit/IntegrationTestCase.php | 7 -------
tests/PHPUnit/Plugins/LanguagesManagerTest.php | 1 -
tests/PHPUnit/Plugins/UserCountryTest.php | 2 +-
tests/PHPUnit/TestingEnvironment.php | 5 ++---
tests/PHPUnit/UI | 2 +-
tests/PHPUnit/proxy/piwik.php | 3 +--
78 files changed, 92 insertions(+), 136 deletions(-)
diff --git a/core/API/DataTableGenericFilter.php b/core/API/DataTableGenericFilter.php
index d540b750f3..6b24e00c6a 100644
--- a/core/API/DataTableGenericFilter.php
+++ b/core/API/DataTableGenericFilter.php
@@ -10,8 +10,8 @@ namespace Piwik\API;
use Exception;
use Piwik\Common;
-use Piwik\DataTable;
use Piwik\DataTable\Filter\AddColumnsProcessedMetricsGoal;
+use Piwik\DataTable;
class DataTableGenericFilter
{
diff --git a/core/API/DataTableManipulator.php b/core/API/DataTableManipulator.php
index 0c19cc844a..5ebdd2fbcf 100644
--- a/core/API/DataTableManipulator.php
+++ b/core/API/DataTableManipulator.php
@@ -11,8 +11,8 @@ namespace Piwik\API;
use Exception;
use Piwik\Archive\DataTableFactory;
use Piwik\Common;
-use Piwik\DataTable;
use Piwik\DataTable\Row;
+use Piwik\DataTable;
use Piwik\Period\Range;
use Piwik\Plugins\API\API;
diff --git a/core/API/DataTableManipulator/Flattener.php b/core/API/DataTableManipulator/Flattener.php
index 9d1d53d089..20fe2c028f 100644
--- a/core/API/DataTableManipulator/Flattener.php
+++ b/core/API/DataTableManipulator/Flattener.php
@@ -10,8 +10,8 @@ namespace Piwik\API\DataTableManipulator;
use Piwik\API\DataTableManipulator;
use Piwik\Common;
-use Piwik\DataTable\Row;
use Piwik\DataTable;
+use Piwik\DataTable\Row;
/**
* This class is responsible for flattening data tables.
diff --git a/core/API/DataTableManipulator/LabelFilter.php b/core/API/DataTableManipulator/LabelFilter.php
index c2075b1efe..05c594b35a 100644
--- a/core/API/DataTableManipulator/LabelFilter.php
+++ b/core/API/DataTableManipulator/LabelFilter.php
@@ -10,8 +10,8 @@ namespace Piwik\API\DataTableManipulator;
use Piwik\API\DataTableManipulator;
use Piwik\Common;
-use Piwik\DataTable\Row;
use Piwik\DataTable;
+use Piwik\DataTable\Row;
/**
* This class is responsible for handling the label parameter that can be
diff --git a/core/API/ResponseBuilder.php b/core/API/ResponseBuilder.php
index 255944bdbe..692a2ceb71 100644
--- a/core/API/ResponseBuilder.php
+++ b/core/API/ResponseBuilder.php
@@ -13,10 +13,10 @@ use Piwik\API\DataTableManipulator\Flattener;
use Piwik\API\DataTableManipulator\LabelFilter;
use Piwik\API\DataTableManipulator\ReportTotalsCalculator;
use Piwik\Common;
-use Piwik\DataTable;
use Piwik\DataTable\Renderer\Json;
use Piwik\DataTable\Renderer;
use Piwik\DataTable\Simple;
+use Piwik\DataTable;
/**
*/
diff --git a/core/AssetManager.php b/core/AssetManager.php
index 8df4be83dd..c026be4ba2 100644
--- a/core/AssetManager.php
+++ b/core/AssetManager.php
@@ -9,14 +9,14 @@
namespace Piwik;
use Exception;
+use Piwik\AssetManager\UIAsset;
use Piwik\AssetManager\UIAsset\InMemoryUIAsset;
use Piwik\AssetManager\UIAsset\OnDiskUIAsset;
-use Piwik\AssetManager\UIAsset;
use Piwik\AssetManager\UIAssetCacheBuster;
-use Piwik\AssetManager\UIAssetFetcher;
use Piwik\AssetManager\UIAssetFetcher\JScriptUIAssetFetcher;
use Piwik\AssetManager\UIAssetFetcher\StaticUIAssetFetcher;
use Piwik\AssetManager\UIAssetFetcher\StylesheetUIAssetFetcher;
+use Piwik\AssetManager\UIAssetFetcher;
use Piwik\AssetManager\UIAssetMerger\JScriptUIAssetMerger;
use Piwik\AssetManager\UIAssetMerger\StylesheetUIAssetMerger;
use Piwik\Config as PiwikConfig;
diff --git a/core/AssetManager/UIAssetMerger.php b/core/AssetManager/UIAssetMerger.php
index 8ac12365fc..fd98da9072 100644
--- a/core/AssetManager/UIAssetMerger.php
+++ b/core/AssetManager/UIAssetMerger.php
@@ -8,9 +8,9 @@
*/
namespace Piwik\AssetManager;
-use Piwik\AssetManager;
use Piwik\AssetManager\PiwikLessCompiler;
use Piwik\AssetManager\UIAsset\StylesheetUIAsset;
+use Piwik\AssetManager;
abstract class UIAssetMerger
{
diff --git a/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php b/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php
index 3cd57f11d0..93b7d7bf6d 100644
--- a/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php
+++ b/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php
@@ -10,9 +10,9 @@ namespace Piwik\AssetManager\UIAssetMerger;
use Piwik\AssetManager\UIAsset;
use Piwik\AssetManager\UIAssetCacheBuster;
-use Piwik\AssetManager;
use Piwik\AssetManager\UIAssetFetcher\JScriptUIAssetFetcher;
use Piwik\AssetManager\UIAssetMerger;
+use Piwik\AssetManager;
use Piwik\AssetManager\UIAssetMinifier;
use Piwik\Piwik;
diff --git a/core/Common.php b/core/Common.php
index 907877b400..876f6ff8e8 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -10,8 +10,8 @@ namespace Piwik;
use Exception;
use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider;
-use Piwik\Tracker\Cache;
use Piwik\Tracker;
+use Piwik\Tracker\Cache;
/**
* Contains helper methods used by both Piwik Core and the Piwik Tracking engine.
diff --git a/core/DataAccess/ArchiveSelector.php b/core/DataAccess/ArchiveSelector.php
index c24c0fb52a..be580b00f6 100644
--- a/core/DataAccess/ArchiveSelector.php
+++ b/core/DataAccess/ArchiveSelector.php
@@ -9,14 +9,14 @@
namespace Piwik\DataAccess;
use Exception;
-use Piwik\ArchiveProcessor;
use Piwik\ArchiveProcessor\Rules;
+use Piwik\ArchiveProcessor;
use Piwik\Common;
use Piwik\Date;
use Piwik\Db;
use Piwik\Log;
-use Piwik\Period\Range;
use Piwik\Period;
+use Piwik\Period\Range;
use Piwik\Piwik;
use Piwik\Segment;
diff --git a/core/DataAccess/ArchiveWriter.php b/core/DataAccess/ArchiveWriter.php
index 1563a639c9..bab3b26bdd 100644
--- a/core/DataAccess/ArchiveWriter.php
+++ b/core/DataAccess/ArchiveWriter.php
@@ -9,8 +9,8 @@
namespace Piwik\DataAccess;
use Exception;
-use Piwik\ArchiveProcessor;
use Piwik\ArchiveProcessor\Rules;
+use Piwik\ArchiveProcessor;
use Piwik\Common;
use Piwik\Db;
use Piwik\Db\BatchInsert;
diff --git a/core/DataTable.php b/core/DataTable.php
index 0fa7e67ef1..81eeaff4fe 100644
--- a/core/DataTable.php
+++ b/core/DataTable.php
@@ -14,8 +14,8 @@ use Exception;
use Piwik\DataTable\DataTableInterface;
use Piwik\DataTable\Manager;
use Piwik\DataTable\Renderer\Html;
-use Piwik\DataTable\Row\DataTableSummaryRow;
use Piwik\DataTable\Row;
+use Piwik\DataTable\Row\DataTableSummaryRow;
use Piwik\DataTable\Simple;
use Piwik\DataTable\TableNotFoundException;
use ReflectionClass;
diff --git a/core/DataTable/Filter/AddColumnsProcessedMetrics.php b/core/DataTable/Filter/AddColumnsProcessedMetrics.php
index e60d3fa6af..cd6629f8b0 100644
--- a/core/DataTable/Filter/AddColumnsProcessedMetrics.php
+++ b/core/DataTable/Filter/AddColumnsProcessedMetrics.php
@@ -9,8 +9,8 @@
namespace Piwik\DataTable\Filter;
use Piwik\DataTable\BaseFilter;
-use Piwik\DataTable;
use Piwik\DataTable\Row;
+use Piwik\DataTable;
use Piwik\Metrics;
/**
diff --git a/core/DataTable/Filter/ReplaceColumnNames.php b/core/DataTable/Filter/ReplaceColumnNames.php
index 2417aa9dd6..fd842ad0ff 100644
--- a/core/DataTable/Filter/ReplaceColumnNames.php
+++ b/core/DataTable/Filter/ReplaceColumnNames.php
@@ -8,9 +8,9 @@
*/
namespace Piwik\DataTable\Filter;
-use Piwik\DataTable;
use Piwik\DataTable\BaseFilter;
use Piwik\DataTable\Simple;
+use Piwik\DataTable;
use Piwik\Metrics;
use Piwik\Piwik;
use Piwik\Tracker\GoalManager;
diff --git a/core/DataTable/Filter/ReplaceSummaryRowLabel.php b/core/DataTable/Filter/ReplaceSummaryRowLabel.php
index f3c9e97992..b89a306a1a 100644
--- a/core/DataTable/Filter/ReplaceSummaryRowLabel.php
+++ b/core/DataTable/Filter/ReplaceSummaryRowLabel.php
@@ -9,8 +9,8 @@
namespace Piwik\DataTable\Filter;
use Piwik\DataTable\BaseFilter;
-use Piwik\DataTable\Manager;
use Piwik\DataTable;
+use Piwik\DataTable\Manager;
use Piwik\Piwik;
/**
diff --git a/core/DataTable/Filter/Sort.php b/core/DataTable/Filter/Sort.php
index 7050a3eb7b..fbef2d91b9 100644
--- a/core/DataTable/Filter/Sort.php
+++ b/core/DataTable/Filter/Sort.php
@@ -9,9 +9,9 @@
namespace Piwik\DataTable\Filter;
use Piwik\DataTable\BaseFilter;
-use Piwik\DataTable;
use Piwik\DataTable\Row;
use Piwik\DataTable\Simple;
+use Piwik\DataTable;
use Piwik\Metrics;
/**
diff --git a/core/DataTable/Filter/Truncate.php b/core/DataTable/Filter/Truncate.php
index 651a3f7564..fa5389650b 100644
--- a/core/DataTable/Filter/Truncate.php
+++ b/core/DataTable/Filter/Truncate.php
@@ -9,8 +9,8 @@
namespace Piwik\DataTable\Filter;
use Piwik\DataTable\BaseFilter;
-use Piwik\DataTable\Row;
use Piwik\DataTable;
+use Piwik\DataTable\Row;
use Piwik\Piwik;
/**
diff --git a/core/DataTable/Map.php b/core/DataTable/Map.php
index 51355af56c..7985afb1d8 100644
--- a/core/DataTable/Map.php
+++ b/core/DataTable/Map.php
@@ -9,8 +9,8 @@
namespace Piwik\DataTable;
use Piwik\Common;
-use Piwik\DataTable\Renderer\Console;
use Piwik\DataTable;
+use Piwik\DataTable\Renderer\Console;
/**
* Stores an array of {@link DataTable}s indexed by one type of {@link DataTable} metadata (such as site ID
diff --git a/core/DataTable/Renderer/Csv.php b/core/DataTable/Renderer/Csv.php
index 58ef0f156a..75d6d68fc0 100644
--- a/core/DataTable/Renderer/Csv.php
+++ b/core/DataTable/Renderer/Csv.php
@@ -13,8 +13,8 @@ use Piwik\DataTable\Renderer;
use Piwik\DataTable\Simple;
use Piwik\DataTable;
use Piwik\Date;
-use Piwik\Period\Range;
use Piwik\Period;
+use Piwik\Period\Range;
use Piwik\Piwik;
use Piwik\ProxyHttp;
diff --git a/core/DataTable/Renderer/Html.php b/core/DataTable/Renderer/Html.php
index 931831b333..ca4cd653ee 100644
--- a/core/DataTable/Renderer/Html.php
+++ b/core/DataTable/Renderer/Html.php
@@ -9,8 +9,8 @@
namespace Piwik\DataTable\Renderer;
use Exception;
-use Piwik\DataTable\Renderer;
use Piwik\DataTable;
+use Piwik\DataTable\Renderer;
/**
* Simple HTML output
diff --git a/core/DataTable/Renderer/Php.php b/core/DataTable/Renderer/Php.php
index cbc71a038c..80e49bc22d 100644
--- a/core/DataTable/Renderer/Php.php
+++ b/core/DataTable/Renderer/Php.php
@@ -10,9 +10,9 @@ namespace Piwik\DataTable\Renderer;
use Exception;
use Piwik\DataTable\Manager;
-use Piwik\DataTable;
use Piwik\DataTable\Renderer;
use Piwik\DataTable\Simple;
+use Piwik\DataTable;
use Piwik\Piwik;
/**
diff --git a/core/DataTable/Renderer/Rss.php b/core/DataTable/Renderer/Rss.php
index c23594c3eb..f5c98ee700 100644
--- a/core/DataTable/Renderer/Rss.php
+++ b/core/DataTable/Renderer/Rss.php
@@ -11,8 +11,8 @@ namespace Piwik\DataTable\Renderer;
use Exception;
use Piwik\Archive;
use Piwik\Common;
-use Piwik\DataTable;
use Piwik\DataTable\Renderer;
+use Piwik\DataTable;
use Piwik\Date;
use Piwik\SettingsPiwik;
diff --git a/core/Piwik.php b/core/Piwik.php
index be3193b344..5975780686 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -9,9 +9,9 @@
namespace Piwik;
use Exception;
-use Piwik\Db;
use Piwik\Db\Adapter;
use Piwik\Db\Schema;
+use Piwik\Db;
use Piwik\Plugin;
use Piwik\Plugins\SitesManager\API as APISitesManager;
use Piwik\Plugins\UsersManager\API as APIUsersManager;
diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php
index bf140e0b56..3e6d4a8e11 100644
--- a/core/Plugin/Controller.php
+++ b/core/Plugin/Controller.php
@@ -13,17 +13,17 @@ use Piwik\Access;
use Piwik\API\Proxy;
use Piwik\API\Request;
use Piwik\Common;
-use Piwik\Config;
use Piwik\Config as PiwikConfig;
+use Piwik\Config;
use Piwik\DataTable\Filter\CalculateEvolutionFilter;
use Piwik\Date;
use Piwik\FrontController;
use Piwik\Menu\MenuTop;
use Piwik\NoAccessException;
use Piwik\Notification\Manager as NotificationManager;
-use Piwik\Period\Range;
-use Piwik\Period;
use Piwik\Period\Month;
+use Piwik\Period;
+use Piwik\Period\Range;
use Piwik\Piwik;
use Piwik\Plugins\CoreAdminHome\CustomLogo;
use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Evolution;
@@ -34,8 +34,8 @@ use Piwik\Registry;
use Piwik\SettingsPiwik;
use Piwik\Site;
use Piwik\Url;
-use Piwik\View\ViewInterface;
use Piwik\View;
+use Piwik\View\ViewInterface;
use Piwik\ViewDataTable\Factory as ViewDataTableFactory;
/**
diff --git a/core/Plugin/ControllerAdmin.php b/core/Plugin/ControllerAdmin.php
index 4574865238..56051341ab 100644
--- a/core/Plugin/ControllerAdmin.php
+++ b/core/Plugin/ControllerAdmin.php
@@ -8,12 +8,12 @@
*/
namespace Piwik\Plugin;
-use Piwik\Config;
use Piwik\Config as PiwikConfig;
+use Piwik\Config;
use Piwik\Menu\MenuAdmin;
use Piwik\Menu\MenuTop;
-use Piwik\Notification\Manager as NotificationManager;
use Piwik\Notification;
+use Piwik\Notification\Manager as NotificationManager;
use Piwik\Piwik;
use Piwik\Url;
use Piwik\Version;
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index 047464551c..f1aab50895 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -10,8 +10,8 @@
namespace Piwik\Plugin;
use Piwik\Common;
-use Piwik\Config;
use Piwik\Config as PiwikConfig;
+use Piwik\Config;
use Piwik\EventDispatcher;
use Piwik\Filesystem;
use Piwik\Option;
diff --git a/core/Plugin/ViewDataTable.php b/core/Plugin/ViewDataTable.php
index f6d4365ea6..1643fd03ee 100644
--- a/core/Plugin/ViewDataTable.php
+++ b/core/Plugin/ViewDataTable.php
@@ -13,8 +13,8 @@ use Piwik\Common;
use Piwik\DataTable;
use Piwik\Period;
use Piwik\Piwik;
-use Piwik\View\ViewInterface;
use Piwik\View;
+use Piwik\View\ViewInterface;
use Piwik\ViewDataTable\Config as VizConfig;
use Piwik\ViewDataTable\Manager as ViewDataTableManager;
use Piwik\ViewDataTable\Request as ViewDataTableRequest;
diff --git a/core/ReportRenderer.php b/core/ReportRenderer.php
index 8105b98d75..4634f9197c 100644
--- a/core/ReportRenderer.php
+++ b/core/ReportRenderer.php
@@ -11,8 +11,8 @@ namespace Piwik;
use Exception;
use Piwik\API\Request;
use Piwik\DataTable\Row;
-use Piwik\DataTable;
use Piwik\DataTable\Simple;
+use Piwik\DataTable;
use Piwik\Plugins\ImageGraph\API;
/**
diff --git a/core/Tracker/Db/Pdo/Mysql.php b/core/Tracker/Db/Pdo/Mysql.php
index eb1fde8400..3a2e04abfd 100644
--- a/core/Tracker/Db/Pdo/Mysql.php
+++ b/core/Tracker/Db/Pdo/Mysql.php
@@ -12,8 +12,8 @@ use Exception;
use PDO;
use PDOException;
use PDOStatement;
-use Piwik\Tracker\Db\DbException;
use Piwik\Tracker\Db;
+use Piwik\Tracker\Db\DbException;
/**
* PDO MySQL wrapper
diff --git a/core/Updates/2.1.1-b11.php b/core/Updates/2.1.1-b11.php
index 3d54546694..18908cc30e 100644
--- a/core/Updates/2.1.1-b11.php
+++ b/core/Updates/2.1.1-b11.php
@@ -10,8 +10,8 @@ namespace Piwik\Updates;
use Piwik\ArchiveProcessor\Rules;
use Piwik\DataAccess\ArchiveWriter;
use Piwik\Date;
-use Piwik\Db;
use Piwik\Db\BatchInsert;
+use Piwik\Db;
use Piwik\Plugins\VisitFrequency\API as VisitFrequencyApi;
use Piwik\Segment;
use Piwik\Updater;
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
index 5b64d36811..7f81bc97af 160000
--- a/plugins/CustomAlerts
+++ b/plugins/CustomAlerts
@@ -1 +1 @@
-Subproject commit 5b64d36811e5685e194672152430c1cc67c7466e
+Subproject commit 7f81bc97af996f175444e96a5bfcf193925b6063
diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization
index 6f49212ee1..01566cce27 160000
--- a/plugins/TreemapVisualization
+++ b/plugins/TreemapVisualization
@@ -1 +1 @@
-Subproject commit 6f49212ee144abe9c67d01d1b61afe1d7b1fb10e
+Subproject commit 01566cce27632c48512128a213535ddf27d8618a
diff --git a/tests/PHPUnit/Core/AssetManagerTest.php b/tests/PHPUnit/Core/AssetManagerTest.php
index 4e3406edf2..787dc42709 100644
--- a/tests/PHPUnit/Core/AssetManagerTest.php
+++ b/tests/PHPUnit/Core/AssetManagerTest.php
@@ -5,13 +5,13 @@
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-use Piwik\AssetManager;
use Piwik\AssetManager\UIAsset\OnDiskUIAsset;
use Piwik\AssetManager\UIAsset;
+use Piwik\AssetManager;
use Piwik\AssetManager\UIAssetFetcher\StaticUIAssetFetcher;
use Piwik\Config;
-use Piwik\Plugin\Manager;
use Piwik\Plugin;
+use Piwik\Plugin\Manager;
require_once PIWIK_INCLUDE_PATH . "/tests/PHPUnit/Core/AssetManager/UIAssetCacheBusterMock.php";
require_once PIWIK_INCLUDE_PATH . "/tests/PHPUnit/Core/AssetManager/PluginManagerMock.php";
diff --git a/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php b/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php
index 3efe5ca775..fd7217f7b3 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php
+++ b/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php
@@ -6,9 +6,9 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
use Piwik\DataTable\Manager;
+use Piwik\DataTable;
use Piwik\DataTable\Renderer\Csv;
use Piwik\DataTable\Row;
-use Piwik\DataTable;
use Piwik\DataTable\Simple;
class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php b/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php
index 40fe748afe..d78d70d35f 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php
+++ b/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php
@@ -6,8 +6,8 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
use Piwik\DataTable\Manager;
-use Piwik\DataTable\Renderer\Console;
use Piwik\DataTable;
+use Piwik\DataTable\Renderer\Console;
use Piwik\DataTable\Row;
class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php b/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php
index 6c74f07bb4..a30b2dc523 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php
+++ b/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php
@@ -6,9 +6,9 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
use Piwik\DataTable\Manager;
+use Piwik\DataTable;
use Piwik\DataTable\Renderer\Json;
use Piwik\DataTable\Row;
-use Piwik\DataTable;
use Piwik\DataTable\Simple;
class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php b/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php
index c7af2683a6..fda6fcda2e 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php
+++ b/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php
@@ -6,9 +6,9 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
use Piwik\DataTable\Manager;
+use Piwik\DataTable;
use Piwik\DataTable\Renderer\Php;
use Piwik\DataTable\Row;
-use Piwik\DataTable;
use Piwik\DataTable\Simple;
class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php b/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php
index d563c64eca..c3a0e99fff 100644
--- a/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php
+++ b/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php
@@ -6,9 +6,9 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
use Piwik\DataTable\Manager;
+use Piwik\DataTable;
use Piwik\DataTable\Renderer\Xml;
use Piwik\DataTable\Row;
-use Piwik\DataTable;
use Piwik\DataTable\Simple;
class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/DataTableTest.php b/tests/PHPUnit/Core/DataTableTest.php
index d82a876c01..cf4c0048f7 100644
--- a/tests/PHPUnit/Core/DataTableTest.php
+++ b/tests/PHPUnit/Core/DataTableTest.php
@@ -8,8 +8,8 @@
use Piwik\Common;
use Piwik\DataTable\Manager;
-use Piwik\DataTable;
use Piwik\DataTable\Row;
+use Piwik\DataTable;
use Piwik\Timer;
class DataTableTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/DependencyTest.php b/tests/PHPUnit/Core/DependencyTest.php
index 3bd1bd5793..f6e1ad15b3 100644
--- a/tests/PHPUnit/Core/DependencyTest.php
+++ b/tests/PHPUnit/Core/DependencyTest.php
@@ -1,7 +1,7 @@
<?php
use Piwik\Plugin\Dependency;
-use Piwik\Version;
use Piwik\Plugin\Manager as PluginManager;
+use Piwik\Version;
/**
* Piwik - Open source web analytics
diff --git a/tests/PHPUnit/Core/DeprecatedMethodsTest.php b/tests/PHPUnit/Core/DeprecatedMethodsTest.php
index 313f552e43..148b3489a8 100644
--- a/tests/PHPUnit/Core/DeprecatedMethodsTest.php
+++ b/tests/PHPUnit/Core/DeprecatedMethodsTest.php
@@ -6,11 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
use Piwik\AssetManager;
-use Piwik\AssetManager\UIAsset\OnDiskUIAsset;
use Piwik\AssetManager\UIAsset;
-use Piwik\AssetManager\UIAssetFetcher\StaticUIAssetFetcher;
-use Piwik\Config;
-use Piwik\Plugin\Manager;
use Piwik\Plugin;
/**
diff --git a/tests/PHPUnit/Core/PeriodTest.php b/tests/PHPUnit/Core/PeriodTest.php
index f8321377d0..74953436f4 100644
--- a/tests/PHPUnit/Core/PeriodTest.php
+++ b/tests/PHPUnit/Core/PeriodTest.php
@@ -7,9 +7,9 @@
*/
use Piwik\Date;
use Piwik\Period\Day;
+use Piwik\Period;
use Piwik\Period\Month;
use Piwik\Period\Week;
-use Piwik\Period;
use Piwik\Period\Year;
class PeriodTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/ScheduledTime/DailyTest.php b/tests/PHPUnit/Core/ScheduledTime/DailyTest.php
index a63302cffc..dde7ae8e30 100644
--- a/tests/PHPUnit/Core/ScheduledTime/DailyTest.php
+++ b/tests/PHPUnit/Core/ScheduledTime/DailyTest.php
@@ -5,7 +5,6 @@
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-use Piwik\ScheduledTime\Daily;
/**
* @group Core
diff --git a/tests/PHPUnit/Core/TaskSchedulerTest.php b/tests/PHPUnit/Core/TaskSchedulerTest.php
index c6f937a6c3..9c112a4da4 100644
--- a/tests/PHPUnit/Core/TaskSchedulerTest.php
+++ b/tests/PHPUnit/Core/TaskSchedulerTest.php
@@ -8,7 +8,6 @@
use Piwik\EventDispatcher;
use Piwik\ScheduledTask;
use Piwik\ScheduledTaskTimetable;
-use Piwik\ScheduledTime\Daily;
use Piwik\TaskScheduler;
class TaskSchedulerTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/UnzipTest.php b/tests/PHPUnit/Core/UnzipTest.php
index df4fb87860..099ee10680 100644
--- a/tests/PHPUnit/Core/UnzipTest.php
+++ b/tests/PHPUnit/Core/UnzipTest.php
@@ -6,9 +6,9 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
use Piwik\Unzip\Gzip;
+use Piwik\Unzip;
use Piwik\Unzip\PclZip;
use Piwik\Unzip\Tar;
-use Piwik\Unzip;
use Piwik\Unzip\ZipArchive;
class UnzipTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPUnit/Core/UrlTest.php b/tests/PHPUnit/Core/UrlTest.php
index bf809994ed..55651c4dcf 100644
--- a/tests/PHPUnit/Core/UrlTest.php
+++ b/tests/PHPUnit/Core/UrlTest.php
@@ -1,7 +1,6 @@
<?php
use Piwik\Config;
use Piwik\Url;
-use Piwik\UrlHelper;
/**
* Piwik - Open source web analytics
diff --git a/tests/PHPUnit/DatabaseTestCase.php b/tests/PHPUnit/DatabaseTestCase.php
index eea23e45e3..4a84a05cd5 100644
--- a/tests/PHPUnit/DatabaseTestCase.php
+++ b/tests/PHPUnit/DatabaseTestCase.php
@@ -5,16 +5,7 @@
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-use Piwik\Config;
-use Piwik\DataAccess\ArchiveTableCreator;
-use Piwik\DataTable\Manager;
use Piwik\Db;
-use Piwik\DbHelper;
-use Piwik\Option;
-use Piwik\Plugins\ScheduledReports\API;
-use Piwik\Site;
-use Piwik\Tracker\Cache;
-use Piwik\Piwik;
/**
* Tests extending DatabaseTestCase are much slower to run: the setUp will
diff --git a/tests/PHPUnit/Fixture.php b/tests/PHPUnit/Fixture.php
index e15cc1f1b3..1a0b907aeb 100644
--- a/tests/PHPUnit/Fixture.php
+++ b/tests/PHPUnit/Fixture.php
@@ -8,27 +8,27 @@
use Piwik\Access;
use Piwik\Common;
use Piwik\Config;
+use Piwik\DataAccess\ArchiveTableCreator;
+use Piwik\DataTable\Manager as DataTableManager;
use Piwik\Date;
use Piwik\Db;
+use Piwik\DbHelper;
+use Piwik\Log;
+use Piwik\Option;
+use Piwik\Piwik;
+use Piwik\Plugins\LanguagesManager\API as APILanguageManager;
use Piwik\Plugins\MobileMessaging\MobileMessaging;
use Piwik\Plugins\ScheduledReports\API as APIScheduledReports;
use Piwik\Plugins\ScheduledReports\ScheduledReports;
use Piwik\Plugins\SitesManager\API as APISitesManager;
use Piwik\Plugins\UserCountry\LocationProvider;
use Piwik\Plugins\UsersManager\API as APIUsersManager;
-use Piwik\Plugins\LanguagesManager\API as APILanguageManager;
use Piwik\Plugins\UsersManager\UsersManager;
use Piwik\ReportRenderer;
use Piwik\Site;
-use Piwik\Url;
-use Piwik\Log;
-use Piwik\DbHelper;
-use Piwik\Piwik;
use Piwik\Tracker\Cache;
use Piwik\Translate;
-use Piwik\Option;
-use Piwik\DataTable\Manager as DataTableManager;
-use Piwik\DataAccess\ArchiveTableCreator;
+use Piwik\Url;
/**
* Base type for all integration test fixtures. Integration test fixtures
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
index ee04dedf66..7650cef641 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
@@ -8,8 +8,8 @@
use Piwik\Access;
use Piwik\Plugins\Goals\API as APIGoals;
use Piwik\Plugins\SegmentEditor\API as APISegmentEditor;
-use Piwik\Plugins\UserCountry\LocationProvider;
use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
+use Piwik\Plugins\UserCountry\LocationProvider;
/**
* Imports visits from several log files using the python log importer.
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
index eb4ff26908..070082f792 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
@@ -5,13 +5,10 @@
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-use Piwik\Common;
use Piwik\Date;
use Piwik\Db;
-use Piwik\FrontController;
use Piwik\Plugins\Annotations\API as APIAnnotations;
use Piwik\Plugins\Goals\API as APIGoals;
-use Piwik\WidgetsList;
require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php';
diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
index 4b0ca0c249..f84bb47f5f 100644
--- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
+++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
@@ -8,8 +8,8 @@
use Piwik\Date;
use Piwik\Plugins\Goals\API;
-use Piwik\Plugins\UserCountry\LocationProvider;
use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
+use Piwik\Plugins\UserCountry\LocationProvider;
require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php';
diff --git a/tests/PHPUnit/Fixtures/OmniFixture.php b/tests/PHPUnit/Fixtures/OmniFixture.php
index fb841fe964..7512beaad0 100644
--- a/tests/PHPUnit/Fixtures/OmniFixture.php
+++ b/tests/PHPUnit/Fixtures/OmniFixture.php
@@ -8,8 +8,7 @@
namespace Piwik\Tests\Fixtures;
use Piwik\Date;
-use Piwik\Tracker\Visit;
-use \ReflectionClass;
+use ReflectionClass;
/**
* This fixture is the combination of every other fixture defined by Piwik. Should be used
diff --git a/tests/PHPUnit/Fixtures/SqlDump.php b/tests/PHPUnit/Fixtures/SqlDump.php
index 716d36fd99..e918c10f31 100644
--- a/tests/PHPUnit/Fixtures/SqlDump.php
+++ b/tests/PHPUnit/Fixtures/SqlDump.php
@@ -8,7 +8,6 @@
use Piwik\ArchiveProcessor\Rules;
use Piwik\Config;
use Piwik\Db;
-use Piwik\DbHelper;
use Piwik\Piwik;
/**
diff --git a/tests/PHPUnit/Fixtures/UITestFixture.php b/tests/PHPUnit/Fixtures/UITestFixture.php
index 23d1fa6663..5e27a08117 100644
--- a/tests/PHPUnit/Fixtures/UITestFixture.php
+++ b/tests/PHPUnit/Fixtures/UITestFixture.php
@@ -7,21 +7,19 @@
*/
namespace Piwik\Tests\Fixtures;
+use Exception;
use Piwik\Access;
-use Piwik\DbHelper;
-use Piwik\Plugins\UsersManager\API as UsersManagerAPI;
-use Piwik\Plugins\VisitsSummary\API as VisitsSummaryAPI;
-use Piwik\Plugins\SitesManager\API as SitesManagerAPI;
-use Piwik\Plugins\SegmentEditor\API as APISegmentEditor;
use Piwik\AssetManager;
-use Piwik\Date;
use Piwik\Common;
+use Piwik\Date;
use Piwik\Db;
+use Piwik\DbHelper;
use Piwik\FrontController;
use Piwik\Option;
-use Piwik\Url;
+use Piwik\Plugins\SegmentEditor\API as APISegmentEditor;
+use Piwik\Plugins\UsersManager\API as UsersManagerAPI;
+use Piwik\Plugins\VisitsSummary\API as VisitsSummaryAPI;
use Piwik\WidgetsList;
-use \Exception;
/**
* Fixture for UI tests.
diff --git a/tests/PHPUnit/Integration/ArchiveCronTest.php b/tests/PHPUnit/Integration/ArchiveCronTest.php
index 4c324b90ca..9d11eb373c 100644
--- a/tests/PHPUnit/Integration/ArchiveCronTest.php
+++ b/tests/PHPUnit/Integration/ArchiveCronTest.php
@@ -6,7 +6,6 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-use Piwik\Access;
use Piwik\Date;
use Piwik\Plugins\SitesManager\API;
diff --git a/tests/PHPUnit/Integration/ArchiveWebTest.php b/tests/PHPUnit/Integration/ArchiveWebTest.php
index bc28100e74..c9fd69d857 100644
--- a/tests/PHPUnit/Integration/ArchiveWebTest.php
+++ b/tests/PHPUnit/Integration/ArchiveWebTest.php
@@ -6,10 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-use Piwik\Access;
-use Piwik\Date;
use Piwik\Option;
-use Piwik\Plugins\SitesManager\API;
/**
* Tests to call the archive.php script via web and check there is no error,
diff --git a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
index 09795bf0bb..9793f38d78 100644
--- a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
+++ b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
@@ -6,15 +6,11 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-use Piwik\Date;
-use Piwik\Option;
-use Piwik\Piwik;
-use Piwik\Db;
use Piwik\Common;
+use Piwik\Db;
+use Piwik\Plugins\CoreUpdater\CoreUpdater;
use Piwik\Plugins\VisitFrequency\API as VisitFrequencyApi;
use Piwik\Updater;
-use Piwik\Plugins\CoreUpdater\CoreUpdater;
-use \Fixture;
/**
* Tests that Piwik 2.0 works w/ data from Piwik 1.12.
diff --git a/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php b/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
index efaa567d24..7b6b1d7a91 100644
--- a/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
+++ b/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
@@ -7,14 +7,13 @@
*/
use Piwik\Access;
-use Piwik\ArchiveProcessor\Rules;
use Piwik\ArchiveProcessor;
+use Piwik\ArchiveProcessor\Rules;
use Piwik\Common;
-use Piwik\Config;
use Piwik\DataAccess\ArchiveTableCreator;
use Piwik\Date;
-use Piwik\Db\BatchInsert;
use Piwik\Db;
+use Piwik\Db\BatchInsert;
use Piwik\Period;
use Piwik\Piwik;
use Piwik\Plugins\SitesManager\API;
diff --git a/tests/PHPUnit/Integration/Core/CliMultiTest.php b/tests/PHPUnit/Integration/Core/CliMultiTest.php
index 2ed13b4a8e..a0dc3e817a 100644
--- a/tests/PHPUnit/Integration/Core/CliMultiTest.php
+++ b/tests/PHPUnit/Integration/Core/CliMultiTest.php
@@ -6,8 +6,8 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-use \Piwik\Version;
-use \Piwik\CliMulti;
+use Piwik\CliMulti;
+use Piwik\Version;
/**
* Class Core_CliMultiTest
diff --git a/tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php b/tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php
index 63f35cc1af..f2aeb52028 100644
--- a/tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php
+++ b/tests/PHPUnit/Integration/Core/CronArchive/SharedSiteIdsTest.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-use \Piwik\CronArchive\SharedSiteIds;
+use Piwik\CronArchive\SharedSiteIds;
/**
* @group Core
diff --git a/tests/PHPUnit/Integration/Core/DbTest.php b/tests/PHPUnit/Integration/Core/DbTest.php
index 3a8c31e7e8..45b559a6c2 100644
--- a/tests/PHPUnit/Integration/Core/DbTest.php
+++ b/tests/PHPUnit/Integration/Core/DbTest.php
@@ -5,8 +5,8 @@
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-use Piwik\Db;
use Piwik\Common;
+use Piwik\Db;
/**
* Class Core_DbTest
diff --git a/tests/PHPUnit/Integration/Core/LogTest.php b/tests/PHPUnit/Integration/Core/LogTest.php
index 4e2fd72ecc..a7c76aa078 100644
--- a/tests/PHPUnit/Integration/Core/LogTest.php
+++ b/tests/PHPUnit/Integration/Core/LogTest.php
@@ -10,11 +10,11 @@ use Piwik\Config;
use Piwik\Db;
use Piwik\Error;
use Piwik\ExceptionHandler;
-
-require_once PIWIK_INCLUDE_PATH . '/tests/resources/TestPluginLogClass.php';
use Piwik\Log;
use Piwik\Plugins\TestPlugin\TestLoggingUtility;
+require_once PIWIK_INCLUDE_PATH . '/tests/resources/TestPluginLogClass.php';
+
/**
* Class Core_LogTest
*
diff --git a/tests/PHPUnit/Integration/Core/PiwikTest.php b/tests/PHPUnit/Integration/Core/PiwikTest.php
index 28e303f0f3..2c15cd6f58 100644
--- a/tests/PHPUnit/Integration/Core/PiwikTest.php
+++ b/tests/PHPUnit/Integration/Core/PiwikTest.php
@@ -11,7 +11,6 @@ use Piwik\MetricsFormatter;
use Piwik\Piwik;
use Piwik\Plugins\SitesManager\API;
use Piwik\Translate;
-use Piwik\Config;
/**
* Class Core_PiwikTest
diff --git a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php b/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
index dbf6c34ce1..d9d3a67499 100755
--- a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
+++ b/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
@@ -9,6 +9,7 @@
require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php';
use Piwik\Date;
+
/**
* Tests w/ 14 visitors w/ 2 visits each.
* Uses geoip location provider to test city/region reports.
diff --git a/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php b/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php
index 4b2dcec99a..857714ec7b 100644
--- a/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php
+++ b/tests/PHPUnit/Integration/Plugins/CorePluginsAdmin/UpdateCommunicationTest.php
@@ -6,9 +6,9 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-use Piwik\Plugins\CorePluginsAdmin\UpdateCommunication;
-use Piwik\Option;
use Piwik\Config;
+use Piwik\Option;
+use Piwik\Plugins\CorePluginsAdmin\UpdateCommunication;
/**
* Class Plugins_CorePluginsAdmin_UpdateCommunicationTest
diff --git a/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php b/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php
index 109f80c022..9b8008de98 100644
--- a/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php
+++ b/tests/PHPUnit/Integration/Plugins/CoreUpdater/UpdateCommunicationTest.php
@@ -6,9 +6,9 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-use Piwik\Plugins\CoreUpdater\UpdateCommunication;
use Piwik\Config;
use Piwik\Option;
+use Piwik\Plugins\CoreUpdater\UpdateCommunication;
use Piwik\UpdateCheck;
use Piwik\Version;
diff --git a/tests/PHPUnit/Integration/Plugins/LoginTest.php b/tests/PHPUnit/Integration/Plugins/LoginTest.php
index 4feeb33b6d..24dc8e2c58 100644
--- a/tests/PHPUnit/Integration/Plugins/LoginTest.php
+++ b/tests/PHPUnit/Integration/Plugins/LoginTest.php
@@ -7,7 +7,6 @@
*/
use Piwik\Access;
use Piwik\AuthResult;
-use Piwik\Config;
use Piwik\DbHelper;
use Piwik\Plugins\Login\Auth;
use Piwik\Plugins\UsersManager\API;
diff --git a/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php b/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php
index 1efef82c2d..a0d8af1635 100644
--- a/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php
+++ b/tests/PHPUnit/Integration/Plugins/PrivacyManagerConfigTest.php
@@ -6,8 +6,8 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
use Piwik\Option;
+use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
/**
* Class Plugins_SitesManagerTest
diff --git a/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php b/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php
index 9a182bd8f7..b2a0130ddb 100644
--- a/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php
+++ b/tests/PHPUnit/Integration/Plugins/PrivacyManagerTest.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-use \Piwik\Plugins\PrivacyManager\PrivacyManager;
+use Piwik\Plugins\PrivacyManager\PrivacyManager;
/**
* Class Plugins_SitesManagerTest
diff --git a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
index 44da874c37..225a2ae4c4 100644
--- a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
+++ b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
@@ -12,9 +12,8 @@ use Piwik\Plugins\ScheduledReports\API as APIScheduledReports;
use Piwik\Plugins\ScheduledReports\ScheduledReports;
use Piwik\Plugins\SitesManager\API as APISitesManager;
use Piwik\ScheduledTask;
-use Piwik\ScheduledTime\Daily;
-use Piwik\ScheduledTime;
use Piwik\ScheduledTime\Monthly;
+use Piwik\ScheduledTime;
use Piwik\Site;
require_once 'ScheduledReports/ScheduledReports.php';
diff --git a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php b/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
index 51d081de66..b540d2b845 100644
--- a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
+++ b/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
@@ -9,8 +9,8 @@ use Piwik\Access;
use Piwik\Date;
use Piwik\Piwik;
use Piwik\Plugins\SegmentEditor\API;
-use Piwik\Plugins\SitesManager\API as APISitesManager;
use Piwik\Plugins\SegmentEditor\Model;
+use Piwik\Plugins\SitesManager\API as APISitesManager;
/**
* Class Plugins_SegmentEditorTest
diff --git a/tests/PHPUnit/Integration/PurgeDataTest.php b/tests/PHPUnit/Integration/PurgeDataTest.php
index e2f5734792..a2621f0b1e 100755
--- a/tests/PHPUnit/Integration/PurgeDataTest.php
+++ b/tests/PHPUnit/Integration/PurgeDataTest.php
@@ -8,9 +8,9 @@
require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php';
-use \Piwik\Plugins\PrivacyManager\ReportsPurger;
-use \Piwik\Plugins\PrivacyManager\PrivacyManager;
-use \Piwik\API\Request;
+use Piwik\API\Request;
+use Piwik\Plugins\PrivacyManager\PrivacyManager;
+use Piwik\Plugins\PrivacyManager\ReportsPurger;
/**
* @group Integration
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
index f9df2d3a43..7fe51d79ae 100755
--- a/tests/PHPUnit/IntegrationTestCase.php
+++ b/tests/PHPUnit/IntegrationTestCase.php
@@ -5,7 +5,6 @@
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-use Piwik\Access;
use Piwik\API\DocumentationGenerator;
use Piwik\API\Proxy;
use Piwik\API\Request;
@@ -13,15 +12,9 @@ use Piwik\ArchiveProcessor\Rules;
use Piwik\Common;
use Piwik\Config;
use Piwik\DataAccess\ArchiveTableCreator;
-use Piwik\DataTable\Manager;
use Piwik\Db;
use Piwik\DbHelper;
-use Piwik\Option;
-use Piwik\Piwik;
-use Piwik\Plugins\LanguagesManager\API;
use Piwik\ReportRenderer;
-use Piwik\Site;
-use Piwik\Tracker\Cache;
use Piwik\Translate;
use Piwik\UrlHelper;
diff --git a/tests/PHPUnit/Plugins/LanguagesManagerTest.php b/tests/PHPUnit/Plugins/LanguagesManagerTest.php
index 4c4923cd3b..c8b73468b6 100755
--- a/tests/PHPUnit/Plugins/LanguagesManagerTest.php
+++ b/tests/PHPUnit/Plugins/LanguagesManagerTest.php
@@ -7,7 +7,6 @@
*/
use Piwik\Common;
use Piwik\Plugins\LanguagesManager\API;
-use Piwik\Translate\Filter\ByBaseTranslations;
use Piwik\Translate\Filter\ByParameterCount;
use Piwik\Translate\Filter\EmptyTranslations;
use Piwik\Translate\Filter\EncodedEntities;
diff --git a/tests/PHPUnit/Plugins/UserCountryTest.php b/tests/PHPUnit/Plugins/UserCountryTest.php
index 983b15d9ce..ca5b0e640e 100644
--- a/tests/PHPUnit/Plugins/UserCountryTest.php
+++ b/tests/PHPUnit/Plugins/UserCountryTest.php
@@ -7,9 +7,9 @@
*/
use Piwik\Plugins\UserCountry\GeoIPAutoUpdater;
+use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
use Piwik\Plugins\UserCountry;
use Piwik\Plugins\UserCountry\LocationProvider;
-use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/UserCountry.php';
require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php';
diff --git a/tests/PHPUnit/TestingEnvironment.php b/tests/PHPUnit/TestingEnvironment.php
index 6845692072..df7538c63a 100644
--- a/tests/PHPUnit/TestingEnvironment.php
+++ b/tests/PHPUnit/TestingEnvironment.php
@@ -1,9 +1,8 @@
<?php
-use Piwik\Piwik;
-use Piwik\Config;
use Piwik\Common;
-use Piwik\Session\SessionNamespace;
+use Piwik\Config;
+use Piwik\Piwik;
require_once PIWIK_INCLUDE_PATH . "/core/Config.php";
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index 6620cbb51d..579b7c4c92 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit 6620cbb51d5867d3fd2d8a409c0b51f7fe233597
+Subproject commit 579b7c4c928800115d35e6474e0c43c29a8e1c97
diff --git a/tests/PHPUnit/proxy/piwik.php b/tests/PHPUnit/proxy/piwik.php
index 6a3eec9a93..4f01b198da 100755
--- a/tests/PHPUnit/proxy/piwik.php
+++ b/tests/PHPUnit/proxy/piwik.php
@@ -7,13 +7,12 @@
*
*/
-use Piwik\Config;
use Piwik\DataTable\Manager;
use Piwik\Option;
use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
use Piwik\Site;
-use Piwik\Tracker;
use Piwik\Tracker\Cache;
+use Piwik\Tracker;
require realpath(dirname(__FILE__)) . "/includes.php";
--
GitLab