Phpstorm organize imports

28 files changed, 14 insertions, 47 deletions

diff --git a/core/API/DocumentationGenerator.php b/core/API/DocumentationGenerator.php
index efcc4f000c..f7bc640d85 100644
--- a/core/API/DocumentationGenerator.php
+++ b/core/API/DocumentationGenerator.php
@@ -11,10 +11,8 @@
 namespace Piwik\API;
 
 use Exception;
-
 use Piwik\Common;
 use Piwik\Piwik;
-use Piwik\Plugin\Manager;
 use Piwik\Url;
 
 /**
diff --git a/core/API/Request.php b/core/API/Request.php
index 5330c444d6..69a60cf16e 100644
--- a/core/API/Request.php
+++ b/core/API/Request.php
@@ -16,7 +16,6 @@ use Piwik\Common;
 use Piwik\DataTable;
 use Piwik\Piwik;
 use Piwik\PluginDeactivatedException;
-use Piwik\Plugin\Manager;
 use Piwik\SettingsServer;
 use Piwik\Url;
 use Piwik\UrlHelper;
diff --git a/core/API/ResponseBuilder.php b/core/API/ResponseBuilder.php
index e5a85626e8..f9acec47d7 100644
--- a/core/API/ResponseBuilder.php
+++ b/core/API/ResponseBuilder.php
@@ -11,7 +11,6 @@
 namespace Piwik\API;
 
 use Exception;
-
 use Piwik\API\DataTableManipulator\Flattener;
 use Piwik\API\DataTableManipulator\LabelFilter;
 use Piwik\Common;
@@ -19,7 +18,6 @@ use Piwik\DataTable\Renderer\Json;
 use Piwik\DataTable\Renderer;
 use Piwik\DataTable\Simple;
 use Piwik\DataTable;
-use Piwik\Piwik;
 
 /**
  * @package Piwik
diff --git a/core/Archive.php b/core/Archive.php
index a371019fc0..b278baac8a 100644
--- a/core/Archive.php
+++ b/core/Archive.php
@@ -11,8 +11,8 @@
 namespace Piwik;
 
 use Piwik\Archive\Parameters;
-use Piwik\ArchiveProcessor\Rules;
 
+use Piwik\ArchiveProcessor\Rules;
 use Piwik\DataAccess\ArchiveSelector;
 use Piwik\Period\Range;
 
diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php
index 50f8898512..31c240e616 100644
--- a/core/ArchiveProcessor.php
+++ b/core/ArchiveProcessor.php
@@ -12,15 +12,12 @@ namespace Piwik;
 
 use Exception;
 use Piwik\ArchiveProcessor\Parameters;
-use Piwik\ArchiveProcessor\Rules;
-use Piwik\DataAccess\ArchiveSelector;
-use Piwik\DataAccess\ArchiveWriter;
 
+use Piwik\DataAccess\ArchiveWriter;
 use Piwik\DataAccess\LogAggregator;
 use Piwik\DataTable\Manager;
 use Piwik\Db;
 use Piwik\Period;
-use Piwik\Plugin\Archiver;
 
 /**
  * Used to insert numeric and blob archive data.
diff --git a/core/DataAccess/ArchiveSelector.php b/core/DataAccess/ArchiveSelector.php
index 956fa60666..24e71fbd1e 100644
--- a/core/DataAccess/ArchiveSelector.php
+++ b/core/DataAccess/ArchiveSelector.php
@@ -17,9 +17,9 @@ use Piwik\Common;
 use Piwik\Date;
 use Piwik\Db;
 use Piwik\Log;
+
 use Piwik\Period;
 use Piwik\Period\Range;
-
 use Piwik\Piwik;
 use Piwik\Segment;
 use Piwik\Site;
diff --git a/core/DataAccess/ArchiveWriter.php b/core/DataAccess/ArchiveWriter.php
index b54324aa17..8650501df3 100644
--- a/core/DataAccess/ArchiveWriter.php
+++ b/core/DataAccess/ArchiveWriter.php
@@ -14,8 +14,8 @@ use Exception;
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\ArchiveProcessor;
 use Piwik\Common;
-use Piwik\Config;
 
+use Piwik\Config;
 use Piwik\Db;
 use Piwik\Db\BatchInsert;
 use Piwik\Log;
diff --git a/core/DataAccess/LogAggregator.php b/core/DataAccess/LogAggregator.php
index 7387226785..0ebdf2edc2 100644
--- a/core/DataAccess/LogAggregator.php
+++ b/core/DataAccess/LogAggregator.php
@@ -14,12 +14,9 @@ use PDOStatement;
 use Piwik\ArchiveProcessor\Parameters;
 use Piwik\Common;
 use Piwik\DataArray;
-use Piwik\Date;
 use Piwik\Db;
-use Piwik\Metrics;
 
-use Piwik\Segment;
-use Piwik\Site;
+use Piwik\Metrics;
 use Piwik\Tracker\GoalManager;
 
 /**
diff --git a/core/DataTable/Filter.php b/core/DataTable/Filter.php
index 133ded5e30..6db3ca1681 100644
--- a/core/DataTable/Filter.php
+++ b/core/DataTable/Filter.php
@@ -10,7 +10,6 @@
  */
 namespace Piwik\DataTable;
 
-use Exception;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
diff --git a/core/DataTable/Filter/Truncate.php b/core/DataTable/Filter/Truncate.php
index 065d7d3da6..d04c61e32b 100644
--- a/core/DataTable/Filter/Truncate.php
+++ b/core/DataTable/Filter/Truncate.php
@@ -12,7 +12,6 @@ namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable\Filter;
 use Piwik\DataTable;
-use Piwik\DataTable\Manager;
 use Piwik\DataTable\Row;
 use Piwik\Piwik;
 
diff --git a/core/Db/BatchInsert.php b/core/Db/BatchInsert.php
index 94560d1044..1a9563be95 100644
--- a/core/Db/BatchInsert.php
+++ b/core/Db/BatchInsert.php
@@ -14,8 +14,8 @@ use Exception;
 use Piwik\AssetManager;
 use Piwik\Common;
 use Piwik\Config;
-use Piwik\Db;
 
+use Piwik\Db;
 use Piwik\DbHelper;
 use Piwik\Log;
 use Piwik\SettingsPiwik;
diff --git a/core/Period.php b/core/Period.php
index 1f167736ef..a6ba376183 100644
--- a/core/Period.php
+++ b/core/Period.php
@@ -11,7 +11,6 @@
 namespace Piwik;
 
 use Exception;
-use Piwik\Date;
 use Piwik\Period\Day;
 use Piwik\Period\Month;
 use Piwik\Period\Range;
diff --git a/core/Piwik.php b/core/Piwik.php
index 8540eea2cf..6a7cec9004 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -12,12 +12,12 @@ namespace Piwik;
 
 use Exception;
 use Piwik\Db\Adapter;
+
 use Piwik\Db\Schema;
 use Piwik\Db;
-
 use Piwik\Plugin;
-use Piwik\Plugins\UsersManager\API;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
+use Piwik\Plugins\UsersManager\API;
 use Piwik\Session;
 use Piwik\Tracker;
 use Piwik\View;
diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php
index 64afe44e43..9f71d873d5 100644
--- a/core/Plugin/Controller.php
+++ b/core/Plugin/Controller.php
@@ -20,6 +20,7 @@ use Piwik\Date;
 use Piwik\FrontController;
 use Piwik\Menu\MenuTop;
 use Piwik\NoAccessException;
+use Piwik\Notification\Manager as NotificationManager;
 use Piwik\Period\Month;
 use Piwik\Period;
 use Piwik\Period\Range;
@@ -34,7 +35,6 @@ use Piwik\Url;
 use Piwik\View;
 use Piwik\View\ViewInterface;
 use Piwik\ViewDataTable\Factory as ViewDataTableFactory;
-use Piwik\Notification\Manager as NotificationManager;
 
 /**
  * Base class of all plugin Controllers.
diff --git a/core/Plugin/ControllerAdmin.php b/core/Plugin/ControllerAdmin.php
index 93db771d20..31f42c3eba 100644
--- a/core/Plugin/ControllerAdmin.php
+++ b/core/Plugin/ControllerAdmin.php
@@ -14,8 +14,8 @@ use Piwik\Config as PiwikConfig;
 use Piwik\Menu\MenuAdmin;
 use Piwik\Menu\MenuTop;
 use Piwik\Notification;
-use Piwik\Piwik;
 use Piwik\Notification\Manager as NotificationManager;
+use Piwik\Piwik;
 use Piwik\Url;
 use Piwik\Version;
 use Piwik\View;
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index 4c7979bd73..65fa4899b5 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -16,7 +16,6 @@ use Piwik\Config as PiwikConfig;
 use Piwik\EventDispatcher;
 use Piwik\Filesystem;
 use Piwik\Option;
-use Piwik\Piwik;
 use Piwik\Plugin;
 use Piwik\Singleton;
 use Piwik\Translate;
diff --git a/core/Plugin/MetadataLoader.php b/core/Plugin/MetadataLoader.php
index 3cb55a89c6..a0d17115b8 100644
--- a/core/Plugin/MetadataLoader.php
+++ b/core/Plugin/MetadataLoader.php
@@ -13,7 +13,6 @@ namespace Piwik\Plugin;
 use Exception;
 use Piwik\Common;
 use Piwik\Piwik;
-use Piwik\Plugin\Manager;
 use Piwik\Version;
 
 /**
diff --git a/core/Plugin/ViewDataTable.php b/core/Plugin/ViewDataTable.php
index 49ef36c6e8..c61681157f 100644
--- a/core/Plugin/ViewDataTable.php
+++ b/core/Plugin/ViewDataTable.php
@@ -13,13 +13,8 @@ namespace Piwik\Plugin;
 use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\DataTable;
-use Piwik\Date;
-use Piwik\MetricsFormatter;
 use Piwik\Period;
-use Piwik\Period\Range;
 use Piwik\Piwik;
-use Piwik\Plugins\PrivacyManager\PrivacyManager;
-use Piwik\Site;
 use Piwik\View;
 use Piwik\View\ViewInterface;
 use Piwik\ViewDataTable\Config as VizConfig;
diff --git a/core/Plugin/Visualization.php b/core/Plugin/Visualization.php
index b876ab96e9..564e9932e5 100644
--- a/core/Plugin/Visualization.php
+++ b/core/Plugin/Visualization.php
@@ -20,9 +20,9 @@ use Piwik\NoAccessException;
 use Piwik\Option;
 use Piwik\Period;
 use Piwik\Piwik;
-use Piwik\ViewDataTable\Manager as ViewDataTableManager;
 use Piwik\Plugins\PrivacyManager\PrivacyManager;
 use Piwik\View;
+use Piwik\ViewDataTable\Manager as ViewDataTableManager;
 
 /**
  * Base class for all DataTable visualizations. A Visualization is a special kind of ViewDataTable that comes with some
diff --git a/core/ScheduledTime.php b/core/ScheduledTime.php
index 54616d276a..3c345706f0 100644
--- a/core/ScheduledTime.php
+++ b/core/ScheduledTime.php
@@ -12,8 +12,8 @@
 namespace Piwik;
 
 use Exception;
-use Piwik\ScheduledTime\Hourly;
 use Piwik\ScheduledTime\Daily;
+use Piwik\ScheduledTime\Hourly;
 use Piwik\ScheduledTime\Monthly;
 use Piwik\ScheduledTime\Weekly;
 
diff --git a/core/Tracker/ActionEvent.php b/core/Tracker/ActionEvent.php
index 6c27590d6e..b8917d451f 100644
--- a/core/Tracker/ActionEvent.php
+++ b/core/Tracker/ActionEvent.php
@@ -13,7 +13,6 @@ namespace Piwik\Tracker;
 
 use Piwik\Common;
 use Piwik\Tracker;
-use Piwik\Config;
 
 /**
  * An Event is composed of a URL, a Category name, an Action name, and optionally a Name and Value.
diff --git a/core/Tracker/ActionPageview.php b/core/Tracker/ActionPageview.php
index 17e7b54f24..542de72d58 100644
--- a/core/Tracker/ActionPageview.php
+++ b/core/Tracker/ActionPageview.php
@@ -11,10 +11,10 @@
 
 namespace Piwik\Tracker;
 
-use Piwik\Tracker;
-
 use Piwik\Config;
 
+use Piwik\Tracker;
+
 /**
  * This class represents a page view, tracking URL, page title and generation time.
  *
diff --git a/core/Tracker/ActionSiteSearch.php b/core/Tracker/ActionSiteSearch.php
index 1f878f2a03..479a462175 100644
--- a/core/Tracker/ActionSiteSearch.php
+++ b/core/Tracker/ActionSiteSearch.php
@@ -12,7 +12,6 @@
 namespace Piwik\Tracker;
 
 use Piwik\Common;
-use Piwik\Config;
 use Piwik\Tracker;
 use Piwik\UrlHelper;
 
diff --git a/core/Translate/Writer.php b/core/Translate/Writer.php
index ef8ce28f9c..4bf4c25de3 100644
--- a/core/Translate/Writer.php
+++ b/core/Translate/Writer.php
@@ -14,7 +14,6 @@ namespace Piwik\Translate;
 use Exception;
 use Piwik\Filesystem;
 use Piwik\Piwik;
-use Piwik\Plugin\Manager;
 use Piwik\Translate\Filter\FilterAbstract;
 use Piwik\Translate\Validate\ValidateAbstract;
 
diff --git a/core/Updates/2.0-a13.php b/core/Updates/2.0-a13.php
index f092472beb..28632ee22f 100644
--- a/core/Updates/2.0-a13.php
+++ b/core/Updates/2.0-a13.php
@@ -12,7 +12,6 @@ namespace Piwik\Updates;
 
 use Piwik\Common;
 use Piwik\Db;
-use Piwik\Filesystem;
 use Piwik\Option;
 use Piwik\Updater;
 use Piwik\Updates;
diff --git a/core/ViewDataTable/Config.php b/core/ViewDataTable/Config.php
index 7e4119ed9e..02d786e471 100644
--- a/core/ViewDataTable/Config.php
+++ b/core/ViewDataTable/Config.php
@@ -11,9 +11,7 @@
 
 namespace Piwik\ViewDataTable;
 use Piwik\API\Request as ApiRequest;
-use Piwik\Common;
 use Piwik\Metrics;
-use Piwik\Piwik;
 use Piwik\Plugins\API\API;
 
 /**
diff --git a/core/ViewDataTable/Factory.php b/core/ViewDataTable/Factory.php
index 40321be1cb..9354c90e6c 100644
--- a/core/ViewDataTable/Factory.php
+++ b/core/ViewDataTable/Factory.php
@@ -13,8 +13,6 @@ namespace Piwik\ViewDataTable;
 use Piwik\API\Proxy;
 use Piwik\Common;
 use Piwik\Piwik;
-use Piwik\Plugins\API\API;
-use Piwik\Plugin\Visualization;
 use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable;
 
 /**
diff --git a/core/ViewDataTable/Request.php b/core/ViewDataTable/Request.php
index e304758f29..1b3491623e 100644
--- a/core/ViewDataTable/Request.php
+++ b/core/ViewDataTable/Request.php
@@ -14,11 +14,7 @@ namespace Piwik\ViewDataTable;
 use Piwik\API\Request as ApiRequest;
 use Piwik\Common;
 use Piwik\DataTable;
-use Piwik\Date;
-use Piwik\Metrics;
-use Piwik\MetricsFormatter;
 use Piwik\Period;
-use Piwik\Piwik;
 
 class Request
 {