Refs #4123 Applying phpstorm "Organize imports" on core/* and plugins/* directories

70 files changed, 85 insertions, 100 deletions

diff --git a/core/API/DataTableManipulator.php b/core/API/DataTableManipulator.php
index 45bebbf4ac..1c5d81768d 100644
--- a/core/API/DataTableManipulator.php
+++ b/core/API/DataTableManipulator.php
@@ -12,8 +12,8 @@ namespace Piwik\API;
 
 use Exception;
 use Piwik\DataTable\Row;
-use Piwik\Period\Range;
 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 7eb1c51d89..7ca244a91a 100644
--- a/core/API/DataTableManipulator/Flattener.php
+++ b/core/API/DataTableManipulator/Flattener.php
@@ -10,9 +10,9 @@
  */
 namespace Piwik\API\DataTableManipulator;
 
+use Piwik\API\DataTableManipulator;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
-use Piwik\API\DataTableManipulator;
 
 /**
  * This class is responsible for flattening data tables.
diff --git a/core/API/DataTableManipulator/LabelFilter.php b/core/API/DataTableManipulator/LabelFilter.php
index 90065e3175..9faa82e7a9 100644
--- a/core/API/DataTableManipulator/LabelFilter.php
+++ b/core/API/DataTableManipulator/LabelFilter.php
@@ -10,10 +10,10 @@
  */
 namespace Piwik\API\DataTableManipulator;
 
+use Piwik\API\DataTableManipulator;
 use Piwik\Common;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
-use Piwik\API\DataTableManipulator;
 
 /**
  * This class is responsible for handling the label parameter that can be
diff --git a/core/API/DocumentationGenerator.php b/core/API/DocumentationGenerator.php
index a7e2559aca..84f976451d 100644
--- a/core/API/DocumentationGenerator.php
+++ b/core/API/DocumentationGenerator.php
@@ -11,11 +11,11 @@
 namespace Piwik\API;
 
 use Exception;
-use Piwik\Piwik;
 use Piwik\Common;
 
-use Piwik\Url;
+use Piwik\Piwik;
 use Piwik\PluginsManager;
+use Piwik\Url;
 
 /**
  * @package Piwik
diff --git a/core/API/ResponseBuilder.php b/core/API/ResponseBuilder.php
index 7aeb474e02..bf8f9f16fc 100644
--- a/core/API/ResponseBuilder.php
+++ b/core/API/ResponseBuilder.php
@@ -12,14 +12,14 @@ namespace Piwik\API;
 
 use Exception;
 use Piwik\API\DataTableManipulator\Flattener;
-use Piwik\API\DataTableManipulator\LabelFilter;
 
+use Piwik\API\DataTableManipulator\LabelFilter;
+use Piwik\Common;
 use Piwik\DataTable\Renderer\Json;
-use Piwik\DataTable\Simple;
 use Piwik\DataTable\Renderer;
-use Piwik\Piwik;
-use Piwik\Common;
+use Piwik\DataTable\Simple;
 use Piwik\DataTable;
+use Piwik\Piwik;
 
 /**
  * @package Piwik
diff --git a/core/Archive.php b/core/Archive.php
index 05c6dc2ab3..b29aef2731 100644
--- a/core/Archive.php
+++ b/core/Archive.php
@@ -10,11 +10,11 @@
  */
 namespace Piwik;
 use Piwik\Archive\Parameters;
-use Piwik\Period\Range;
-
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\DataAccess\ArchiveSelector;
 
+use Piwik\Period\Range;
+
 /**
  * The archive object is used to query specific data for a day or a period of statistics for a given website.
  *
diff --git a/core/Archive/DataCollection.php b/core/Archive/DataCollection.php
index 0bc89d5bbd..c514702488 100644
--- a/core/Archive/DataCollection.php
+++ b/core/Archive/DataCollection.php
@@ -12,7 +12,6 @@
 namespace Piwik\Archive;
 
 use Exception;
-
 use Piwik\DataTable;
 
 /**
diff --git a/core/Archive/DataTableFactory.php b/core/Archive/DataTableFactory.php
index a21a4ed463..c849c29168 100644
--- a/core/Archive/DataTableFactory.php
+++ b/core/Archive/DataTableFactory.php
@@ -11,9 +11,9 @@
 
 namespace Piwik\Archive;
 
-use Piwik\Site;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
+use Piwik\Site;
 
 /**
  * Creates a DataTable or Set instance based on an array
diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php
index 09576d8c65..4ac17c04a3 100644
--- a/core/ArchiveProcessor.php
+++ b/core/ArchiveProcessor.php
@@ -10,14 +10,14 @@
  */
 namespace Piwik;
 use Exception;
-use Piwik\ArchiveProcessor\Rules;
-
-use Piwik\Period;
 
-use Piwik\Db;
+use Piwik\ArchiveProcessor\Rules;
 use Piwik\DataAccess\ArchiveSelector;
 use Piwik\DataAccess\ArchiveWriter;
 use Piwik\DataAccess\LogAggregator;
+use Piwik\Db;
+
+use Piwik\Period;
 
 /**
  * The ArchiveProcessor class is used by the Archive object to make sure the given Archive is processed and available in the DB.
diff --git a/core/ArchiveProcessor/Day.php b/core/ArchiveProcessor/Day.php
index c0732d9885..691ea7c54d 100644
--- a/core/ArchiveProcessor/Day.php
+++ b/core/ArchiveProcessor/Day.php
@@ -9,10 +9,10 @@
  * @package Piwik
  */
 namespace Piwik\ArchiveProcessor;
-use Piwik\Metrics;
 use Piwik\ArchiveProcessor;
 use Piwik\DataArray;
 use Piwik\DataTable;
+use Piwik\Metrics;
 
 /**
  * This class
diff --git a/core/ArchiveProcessor/Rules.php b/core/ArchiveProcessor/Rules.php
index 39191c4794..58ff2425df 100644
--- a/core/ArchiveProcessor/Rules.php
+++ b/core/ArchiveProcessor/Rules.php
@@ -14,12 +14,12 @@ use Exception;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\Date;
+use Piwik\Log;
 use Piwik\Piwik;
 use Piwik\Segment;
 use Piwik\SettingsPiwik;
 use Piwik\SettingsServer;
 use Piwik\Site;
-use Piwik\Log;
 use Piwik\Tracker\Cache;
 
 /**
diff --git a/core/Console.php b/core/Console.php
index 9d154bfe00..7b3e319c61 100644
--- a/core/Console.php
+++ b/core/Console.php
@@ -10,9 +10,9 @@
  */
 namespace Piwik;
 
+use Piwik\Plugins\CoreConsole\GenerateApi;
 use Piwik\Plugins\CoreConsole\GenerateController;
 use Piwik\Plugins\CoreConsole\GeneratePlugin;
-use Piwik\Plugins\CoreConsole\GenerateApi;
 use Piwik\Plugins\CoreConsole\RunTests;
 use Piwik\Plugins\CoreConsole\WatchLog;
 use Symfony\Component\Console\Application;
diff --git a/core/Controller.php b/core/Controller.php
index bcd4516594..72302d557f 100644
--- a/core/Controller.php
+++ b/core/Controller.php
@@ -20,7 +20,6 @@ use Piwik\Plugins\API\API;
 use Piwik\Plugins\LanguagesManager\LanguagesManager;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
-
 use Piwik\View;
 use Piwik\ViewDataTable;
 
diff --git a/core/Controller/Admin.php b/core/Controller/Admin.php
index 33f08d0b93..004160d453 100644
--- a/core/Controller/Admin.php
+++ b/core/Controller/Admin.php
@@ -11,12 +11,12 @@
 namespace Piwik\Controller;
 
 use Piwik\Config;
-use Piwik\Piwik;
 use Piwik\Controller;
+use Piwik\Piwik;
+use Piwik\PluginsManager;
+use Piwik\Url;
 use Piwik\Version;
 use Piwik\View;
-use Piwik\Url;
-use Piwik\PluginsManager;
 
 /**
  * Parent class of all plugins Controllers with admin functions
diff --git a/core/DataAccess/ArchiveSelector.php b/core/DataAccess/ArchiveSelector.php
index c072ac751e..e9a1d6efb5 100644
--- a/core/DataAccess/ArchiveSelector.php
+++ b/core/DataAccess/ArchiveSelector.php
@@ -12,17 +12,17 @@ namespace Piwik\DataAccess;
 
 use Exception;
 use Piwik\ArchiveProcessor\Rules;
+use Piwik\ArchiveProcessor;
+use Piwik\Common;
+use Piwik\Date;
+use Piwik\Db;
+use Piwik\Log;
 use Piwik\Period;
 use Piwik\Period\Range;
 use Piwik\Piwik;
-use Piwik\Common;
-use Piwik\Date;
-use Piwik\ArchiveProcessor;
 use Piwik\Segment;
-use Piwik\Site;
 
-use Piwik\Db;
-use Piwik\Log;
+use Piwik\Site;
 
 /**
  * Data Access object used to query archives
diff --git a/core/DataAccess/ArchiveTableCreator.php b/core/DataAccess/ArchiveTableCreator.php
index d6681fa5ae..0db27240ec 100644
--- a/core/DataAccess/ArchiveTableCreator.php
+++ b/core/DataAccess/ArchiveTableCreator.php
@@ -14,8 +14,8 @@ namespace Piwik\DataAccess;
 use Exception;
 use Piwik\Common;
 use Piwik\Date;
-use Piwik\DbHelper;
 use Piwik\Db;
+use Piwik\DbHelper;
 
 class ArchiveTableCreator
 {
diff --git a/core/DataAccess/ArchiveWriter.php b/core/DataAccess/ArchiveWriter.php
index b3538b5b79..3d21ba4a5d 100644
--- a/core/DataAccess/ArchiveWriter.php
+++ b/core/DataAccess/ArchiveWriter.php
@@ -17,11 +17,11 @@ use Piwik\Common;
 use Piwik\Config;
 use Piwik\Db;
 use Piwik\Db\BatchInsert;
-use Piwik\Period;
+use Piwik\Log;
 
+use Piwik\Period;
 use Piwik\Segment;
 use Piwik\SettingsPiwik;
-use Piwik\Log;
 
 /**
  * This class is used to create a new Archive.
diff --git a/core/DataAccess/LogAggregator.php b/core/DataAccess/LogAggregator.php
index 080a71d846..fcde08cdf5 100644
--- a/core/DataAccess/LogAggregator.php
+++ b/core/DataAccess/LogAggregator.php
@@ -12,12 +12,12 @@ namespace Piwik\DataAccess;
 
 use PDOStatement;
 use Piwik\Common;
-use Piwik\Metrics;
 use Piwik\Date;
+use Piwik\Db;
+use Piwik\Metrics;
 use Piwik\Segment;
-use Piwik\Site;
 
-use Piwik\Db;
+use Piwik\Site;
 use Piwik\Tracker\GoalManager;
 
 /**
diff --git a/core/DataArray.php b/core/DataArray.php
index 8c22414821..47c7d5a8cd 100644
--- a/core/DataArray.php
+++ b/core/DataArray.php
@@ -11,7 +11,6 @@
 namespace Piwik;
 
 use Exception;
-
 use Piwik\Tracker\GoalManager;
 
 /**
diff --git a/core/DataTable.php b/core/DataTable.php
index 08eb02ea79..50569d6069 100644
--- a/core/DataTable.php
+++ b/core/DataTable.php
@@ -12,12 +12,12 @@
 namespace Piwik;
 
 use Closure;
-use Exception;
 
+use Exception;
+use Piwik\DataTable\Filter;
 use Piwik\DataTable\Manager;
 use Piwik\DataTable\Renderer\Html;
 use Piwik\DataTable\Row;
-use Piwik\DataTable\Filter;
 use Piwik\DataTable\Row\DataTableSummaryRow;
 use ReflectionClass;
 
diff --git a/core/DataTable/Filter.php b/core/DataTable/Filter.php
index 5b79a0c8bc..73cfb13ee5 100644
--- a/core/DataTable/Filter.php
+++ b/core/DataTable/Filter.php
@@ -11,8 +11,8 @@
 namespace Piwik\DataTable;
 
 use Exception;
-use Piwik\DataTable;
 
+use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
 /**
diff --git a/core/DataTable/Filter/AddColumnsProcessedMetrics.php b/core/DataTable/Filter/AddColumnsProcessedMetrics.php
index 1a4dfbf8bc..ad5b5d194d 100644
--- a/core/DataTable/Filter/AddColumnsProcessedMetrics.php
+++ b/core/DataTable/Filter/AddColumnsProcessedMetrics.php
@@ -12,8 +12,8 @@ namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable\Filter;
 use Piwik\DataTable\Row;
-use Piwik\Metrics;
 use Piwik\DataTable;
+use Piwik\Metrics;
 
 /**
  * @package Piwik
diff --git a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
index 8fa4af3f34..8a0e335681 100644
--- a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
+++ b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
@@ -11,8 +11,8 @@
 namespace Piwik\DataTable\Filter;
 
 use Exception;
-use Piwik\DataTable;
 
+use Piwik\DataTable;
 use Piwik\Metrics;
 use Piwik\Piwik;
 use Piwik\Tracker\GoalManager;
diff --git a/core/DataTable/Filter/AddSummaryRow.php b/core/DataTable/Filter/AddSummaryRow.php
index 12504fa033..1aa0325799 100644
--- a/core/DataTable/Filter/AddSummaryRow.php
+++ b/core/DataTable/Filter/AddSummaryRow.php
@@ -10,8 +10,8 @@
  */
 namespace Piwik\DataTable\Filter;
 
-use Piwik\DataTable;
 use Piwik\DataTable\Filter;
+use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
 /**
diff --git a/core/DataTable/Filter/ColumnCallbackAddColumnQuotient.php b/core/DataTable/Filter/ColumnCallbackAddColumnQuotient.php
index 4e95a8a9a2..69862cfc44 100644
--- a/core/DataTable/Filter/ColumnCallbackAddColumnQuotient.php
+++ b/core/DataTable/Filter/ColumnCallbackAddColumnQuotient.php
@@ -10,8 +10,8 @@
  */
 namespace Piwik\DataTable\Filter;
 
-use Piwik\DataTable;
 use Piwik\DataTable\Filter;
+use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
 /**
diff --git a/core/DataTable/Filter/ColumnCallbackReplace.php b/core/DataTable/Filter/ColumnCallbackReplace.php
index 26f1b12433..e50bd29aa4 100644
--- a/core/DataTable/Filter/ColumnCallbackReplace.php
+++ b/core/DataTable/Filter/ColumnCallbackReplace.php
@@ -10,8 +10,8 @@
  */
 namespace Piwik\DataTable\Filter;
 
-use Piwik\DataTable;
 use Piwik\DataTable\Filter;
+use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
 /**
diff --git a/core/DataTable/Filter/MetadataCallbackReplace.php b/core/DataTable/Filter/MetadataCallbackReplace.php
index 56f9b6b056..2f5b6f5548 100644
--- a/core/DataTable/Filter/MetadataCallbackReplace.php
+++ b/core/DataTable/Filter/MetadataCallbackReplace.php
@@ -11,7 +11,6 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable;
-
 use Piwik\DataTable\Row;
 
 /**
diff --git a/core/DataTable/Filter/PatternRecursive.php b/core/DataTable/Filter/PatternRecursive.php
index 9f98af0209..ceaab23d22 100644
--- a/core/DataTable/Filter/PatternRecursive.php
+++ b/core/DataTable/Filter/PatternRecursive.php
@@ -11,9 +11,9 @@
 namespace Piwik\DataTable\Filter;
 
 use Exception;
-use Piwik\DataTable;
-use Piwik\DataTable\Filter;
 
+use Piwik\DataTable\Filter;
+use Piwik\DataTable;
 use Piwik\DataTable\Manager;
 
 /**
diff --git a/core/DataTable/Filter/ReplaceColumnNames.php b/core/DataTable/Filter/ReplaceColumnNames.php
index a11d5e3c9f..932c42e599 100644
--- a/core/DataTable/Filter/ReplaceColumnNames.php
+++ b/core/DataTable/Filter/ReplaceColumnNames.php
@@ -12,9 +12,9 @@ namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable\Filter;
 use Piwik\DataTable\Simple;
+use Piwik\DataTable;
 use Piwik\Metrics;
 use Piwik\Piwik;
-use Piwik\DataTable;
 use Piwik\Tracker\GoalManager;
 
 /**
diff --git a/core/DataTable/Filter/ReplaceSummaryRowLabel.php b/core/DataTable/Filter/ReplaceSummaryRowLabel.php
index 2e65716922..ef20db28bf 100644
--- a/core/DataTable/Filter/ReplaceSummaryRowLabel.php
+++ b/core/DataTable/Filter/ReplaceSummaryRowLabel.php
@@ -10,8 +10,8 @@
  */
 namespace Piwik\DataTable\Filter;
 
-use Piwik\DataTable;
 use Piwik\DataTable\Filter;
+use Piwik\DataTable;
 use Piwik\DataTable\Manager;
 
 /**
diff --git a/core/DataTable/Filter/Sort.php b/core/DataTable/Filter/Sort.php
index 72bc433bef..1b58a27269 100644
--- a/core/DataTable/Filter/Sort.php
+++ b/core/DataTable/Filter/Sort.php
@@ -11,10 +11,10 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable\Filter;
-use Piwik\DataTable\Simple;
 use Piwik\DataTable\Row;
-use Piwik\Metrics;
+use Piwik\DataTable\Simple;
 use Piwik\DataTable;
+use Piwik\Metrics;
 
 /**
  * Sort the DataTable based on the value of column $columnToSort ordered by $order.
diff --git a/core/DataTable/Filter/Truncate.php b/core/DataTable/Filter/Truncate.php
index 1cd6f98bf0..bea38ad178 100644
--- a/core/DataTable/Filter/Truncate.php
+++ b/core/DataTable/Filter/Truncate.php
@@ -10,8 +10,8 @@
  */
 namespace Piwik\DataTable\Filter;
 
-use Piwik\DataTable;
 use Piwik\DataTable\Filter;
+use Piwik\DataTable;
 use Piwik\DataTable\Manager;
 
 /**
diff --git a/core/DataTable/Renderer.php b/core/DataTable/Renderer.php
index 1d82e1c52f..6a82af8f44 100644
--- a/core/DataTable/Renderer.php
+++ b/core/DataTable/Renderer.php
@@ -11,10 +11,10 @@
 namespace Piwik\DataTable;
 
 use Exception;
+use Piwik\DataTable;
 use Piwik\Loader;
 use Piwik\Metrics;
 use Piwik\Piwik;
-use Piwik\DataTable;
 
 /**
  * A DataTable Renderer can produce an output given a DataTable object.
diff --git a/core/DataTable/Renderer/Console.php b/core/DataTable/Renderer/Console.php
index 20cef78d85..d0b509de3d 100644
--- a/core/DataTable/Renderer/Console.php
+++ b/core/DataTable/Renderer/Console.php
@@ -10,8 +10,8 @@
  */
 namespace Piwik\DataTable\Renderer;
 
-use Piwik\DataTable;
 use Piwik\DataTable\Manager;
+use Piwik\DataTable;
 use Piwik\DataTable\Renderer;
 
 /**
diff --git a/core/DataTable/Renderer/Php.php b/core/DataTable/Renderer/Php.php
index 59f3b45a01..7bf2d2713c 100644
--- a/core/DataTable/Renderer/Php.php
+++ b/core/DataTable/Renderer/Php.php
@@ -12,10 +12,10 @@ namespace Piwik\DataTable\Renderer;
 
 use Exception;
 use Piwik\DataTable\Manager;
-use Piwik\DataTable\Simple;
 use Piwik\DataTable\Renderer;
-use Piwik\Piwik;
+use Piwik\DataTable\Simple;
 use Piwik\DataTable;
+use Piwik\Piwik;
 
 /**
  * Returns the equivalent PHP array for a given DataTable.
diff --git a/core/DataTable/Renderer/Rss.php b/core/DataTable/Renderer/Rss.php
index 2e3e3265bc..dee117a90f 100644
--- a/core/DataTable/Renderer/Rss.php
+++ b/core/DataTable/Renderer/Rss.php
@@ -13,8 +13,8 @@ namespace Piwik\DataTable\Renderer;
 use Exception;
 use Piwik\Common;
 use Piwik\DataTable\Renderer;
-use Piwik\Date;
 use Piwik\DataTable;
+use Piwik\Date;
 use Piwik\Url;
 
 /**
diff --git a/core/DataTable/Renderer/Xml.php b/core/DataTable/Renderer/Xml.php
index 4e2d251cd6..ec4a6585cf 100644
--- a/core/DataTable/Renderer/Xml.php
+++ b/core/DataTable/Renderer/Xml.php
@@ -11,11 +11,11 @@
 namespace Piwik\DataTable\Renderer;
 
 use Exception;
-use Piwik\DataTable;
-use Piwik\DataTable\Map;
 
-use Piwik\DataTable\Simple;
+use Piwik\DataTable\Map;
 use Piwik\DataTable\Renderer;
+use Piwik\DataTable;
+use Piwik\DataTable\Simple;
 use Piwik\Piwik;
 
 /**
diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php
index f0e1303a64..8ac6f29617 100644
--- a/core/DataTable/Row.php
+++ b/core/DataTable/Row.php
@@ -11,9 +11,8 @@
 namespace Piwik\DataTable;
 
 use Exception;
-
-use Piwik\Metrics;
 use Piwik\DataTable;
+use Piwik\Metrics;
 
 /**
  * A DataTable is composed of rows.
diff --git a/core/DataTable/Row/DataTableSummaryRow.php b/core/DataTable/Row/DataTableSummaryRow.php
index b98343f91f..7e1d939da2 100644
--- a/core/DataTable/Row/DataTableSummaryRow.php
+++ b/core/DataTable/Row/DataTableSummaryRow.php
@@ -10,8 +10,8 @@
  */
 namespace Piwik\DataTable\Row;
 
-use Piwik\DataTable;
 use Piwik\DataTable\Manager;
+use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
 /**
diff --git a/core/Db/BatchInsert.php b/core/Db/BatchInsert.php
index 464ec94fc9..2f2bd97948 100644
--- a/core/Db/BatchInsert.php
+++ b/core/Db/BatchInsert.php
@@ -14,10 +14,10 @@ use Exception;
 use Piwik\AssetManager;
 use Piwik\Common;
 use Piwik\Config;
-use Piwik\Log;
 use Piwik\Db;
 use Piwik\DbHelper;
 
+use Piwik\Log;
 use Piwik\SettingsPiwik;
 use Piwik\SettingsServer;
 
diff --git a/core/Log.php b/core/Log.php
index 8a2548b915..7063d21759 100644
--- a/core/Log.php
+++ b/core/Log.php
@@ -10,7 +10,6 @@
  */
 namespace Piwik;
 
-
 use Piwik\Db;
 
 /**
diff --git a/core/Menu/Admin.php b/core/Menu/Admin.php
index 8d67d2d61a..7e74b20468 100644
--- a/core/Menu/Admin.php
+++ b/core/Menu/Admin.php
@@ -10,7 +10,6 @@
  */
 namespace Piwik\Menu;
 
-
 use Piwik\Piwik;
 
 /**
diff --git a/core/Option.php b/core/Option.php
index e4a33480dd..d986b87522 100644
--- a/core/Option.php
+++ b/core/Option.php
@@ -10,7 +10,6 @@
  */
 namespace Piwik;
 
-
 /**
  * Option provides a very simple mechanism to save/retrieve key-values pair
  * from the database (persistent key-value datastore).
diff --git a/core/Period.php b/core/Period.php
index f875e89311..6e143dcf78 100644
--- a/core/Period.php
+++ b/core/Period.php
@@ -9,8 +9,8 @@
  * @package Piwik
  */
 namespace Piwik;
-use Exception;
 
+use Exception;
 use Piwik\Period\Day;
 use Piwik\Period\Month;
 use Piwik\Period\Range;
diff --git a/core/Period/Range.php b/core/Period/Range.php
index 48406fb83c..7579701cfc 100644
--- a/core/Period/Range.php
+++ b/core/Period/Range.php
@@ -12,8 +12,8 @@ namespace Piwik\Period;
 
 use Exception;
 use Piwik\Common;
-use Piwik\Period;
 use Piwik\Date;
+use Piwik\Period;
 
 /**
  * from a starting date to an ending date
diff --git a/core/Period/Year.php b/core/Period/Year.php
index d6fa964916..4bad292180 100644
--- a/core/Period/Year.php
+++ b/core/Period/Year.php
@@ -10,8 +10,8 @@
  */
 namespace Piwik\Period;
 
-use Piwik\Period;
 use Piwik\Date;
+use Piwik\Period;
 
 /**
  * @package Piwik
diff --git a/core/Piwik.php b/core/Piwik.php
index 4299f2673c..b70892de3b 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -15,8 +15,8 @@ use Piwik\Db\Adapter;
 use Piwik\Db\Schema;
 use Piwik\Db;
 use Piwik\Plugin;
-use Piwik\Plugins\UsersManager\API;
 
+use Piwik\Plugins\UsersManager\API;
 use Piwik\Session;
 use Piwik\Tracker;
 use Piwik\View;
diff --git a/core/Plugin/MetadataLoader.php b/core/Plugin/MetadataLoader.php
index 94d5a65cc1..22cd2ed55a 100644
--- a/core/Plugin/MetadataLoader.php
+++ b/core/Plugin/MetadataLoader.php
@@ -12,8 +12,8 @@ namespace Piwik\Plugin;
 
 use Exception;
 use Piwik\Common;
-use Piwik\Version;
 use Piwik\PluginsManager;
+use Piwik\Version;
 
 /**
  * @see core/Version.php
diff --git a/core/Session.php b/core/Session.php
index df511d1464..c51de9b91e 100644
--- a/core/Session.php
+++ b/core/Session.php
@@ -11,7 +11,6 @@
 namespace Piwik;
 
 use Exception;
-
 use Piwik\Session\SaveHandler\DbTable;
 use Zend_Session;
 
diff --git a/core/Site.php b/core/Site.php
index a97fc31621..262795076f 100644
--- a/core/Site.php
+++ b/core/Site.php
@@ -10,8 +10,8 @@
  */
 
 namespace Piwik;
-use Exception;
 
+use Exception;
 use Piwik\Plugins\SitesManager\API;
 
 /**
diff --git a/core/Tracker/Cache.php b/core/Tracker/Cache.php
index 837b7e8673..8ae471f54f 100644
--- a/core/Tracker/Cache.php
+++ b/core/Tracker/Cache.php
@@ -11,9 +11,9 @@
 namespace Piwik\Tracker;
 
 use Piwik\ArchiveProcessor\Rules;
+use Piwik\CacheFile;
 use Piwik\Config;
 use Piwik\Piwik;
-use Piwik\CacheFile;
 use Piwik\Tracker;
 
 /**
diff --git a/core/Tracker/GoalManager.php b/core/Tracker/GoalManager.php
index f77a7d7c92..16b0cba03c 100644
--- a/core/Tracker/GoalManager.php
+++ b/core/Tracker/GoalManager.php
@@ -11,8 +11,8 @@
 namespace Piwik\Tracker;
 
 use Exception;
-use Piwik\Config;
 use Piwik\Common;
+use Piwik\Config;
 use Piwik\Tracker;
 
 /**
diff --git a/core/Tracker/Request.php b/core/Tracker/Request.php
index 8f16bb1650..844254e593 100644
--- a/core/Tracker/Request.php
+++ b/core/Tracker/Request.php
@@ -2,8 +2,8 @@
 namespace Piwik\Tracker;
 
 use Exception;
-use Piwik\Config;
 use Piwik\Common;
+use Piwik\Config;
 use Piwik\Cookie;
 use Piwik\IP;
 use Piwik\Tracker;
diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php
index 08411b3942..99f2c81764 100644
--- a/core/Tracker/Visit.php
+++ b/core/Tracker/Visit.php
@@ -11,13 +11,12 @@
 
 namespace Piwik\Tracker;
 
-use Piwik\Config;
+use Exception;
 use Piwik\Common;
+use Piwik\Config;
 use Piwik\IP;
-use Piwik\Tracker;
-
-use Exception;
 
+use Piwik\Tracker;
 use UserAgentParser;
 
 /**
diff --git a/core/Unzip.php b/core/Unzip.php
index 4eb7d93e29..d3bb716caf 100644
--- a/core/Unzip.php
+++ b/core/Unzip.php
@@ -12,7 +12,6 @@
 namespace Piwik;
 
 use Piwik\Unzip\Gzip;
-
 use Piwik\Unzip\PclZip;
 use Piwik\Unzip\Tar;
 use Piwik\Unzip\ZipArchive;
diff --git a/core/UpdateCheck.php b/core/UpdateCheck.php
index f381ec6c65..45e0c02370 100644
--- a/core/UpdateCheck.php
+++ b/core/UpdateCheck.php
@@ -11,7 +11,6 @@
 namespace Piwik;
 
 use Exception;
-
 use Piwik\Plugins\SitesManager\API;
 
 /**
diff --git a/core/Updates.php b/core/Updates.php
index afecf07680..a0b1204a0c 100644
--- a/core/Updates.php
+++ b/core/Updates.php
@@ -10,8 +10,6 @@
  */
 namespace Piwik;
 
-
-
 /**
  * Abstract class for update scripts
  *
diff --git a/core/Updates/0.5.4.php b/core/Updates/0.5.4.php
index a386e4b306..9e79fba2a1 100644
--- a/core/Updates/0.5.4.php
+++ b/core/Updates/0.5.4.php
@@ -11,8 +11,8 @@
 
 namespace Piwik\Updates;
 
-use Piwik\Config;
 use Piwik\Common;
+use Piwik\Config;
 use Piwik\Updater;
 use Piwik\Updates;
 
diff --git a/core/Updates/0.6.3.php b/core/Updates/0.6.3.php
index 3737c96bce..12e4451b6a 100644
--- a/core/Updates/0.6.3.php
+++ b/core/Updates/0.6.3.php
@@ -11,8 +11,8 @@
 
 namespace Piwik\Updates;
 
-use Piwik\Config;
 use Piwik\Common;
+use Piwik\Config;
 use Piwik\Updater;
 use Piwik\Updates;
 
diff --git a/core/Updates/1.2.3.php b/core/Updates/1.2.3.php
index 7f786e2d09..6bc0b8116e 100644
--- a/core/Updates/1.2.3.php
+++ b/core/Updates/1.2.3.php
@@ -11,8 +11,8 @@
 
 namespace Piwik\Updates;
 
-use Piwik\Config;
 use Piwik\Common;
+use Piwik\Config;
 use Piwik\Updater;
 use Piwik\Updates;
 
diff --git a/core/Updates/1.7.2-rc7.php b/core/Updates/1.7.2-rc7.php
index 454d14599e..55f1ff3d68 100755
--- a/core/Updates/1.7.2-rc7.php
+++ b/core/Updates/1.7.2-rc7.php
@@ -12,9 +12,9 @@
 namespace Piwik\Updates;
 
 use Piwik\Common;
+use Piwik\Db;
 use Piwik\Updater;
 use Piwik\Updates;
-use Piwik\Db;
 
 /**
  * @package Updates
diff --git a/core/Updates/1.8.3-b1.php b/core/Updates/1.8.3-b1.php
index d931ef8082..92d5062879 100644
--- a/core/Updates/1.8.3-b1.php
+++ b/core/Updates/1.8.3-b1.php
@@ -12,10 +12,10 @@
 namespace Piwik\Updates;
 
 use Piwik\Common;
+use Piwik\Db;
 use Piwik\Plugins\ScheduledReports\ScheduledReports;
 use Piwik\Updater;
 use Piwik\Updates;
-use Piwik\Db;
 
 /**
  * @package Updates
diff --git a/core/Updates/2.0-a12.php b/core/Updates/2.0-a12.php
index 4f8aac1272..de9815cfec 100644
--- a/core/Updates/2.0-a12.php
+++ b/core/Updates/2.0-a12.php
@@ -11,9 +11,9 @@
 namespace Piwik\Updates;
 
 use Piwik\Common;
+use Piwik\Db;
 use Piwik\Updater;
 use Piwik\Updates;
-use Piwik\Db;
 
 /**
  * @package Updates
diff --git a/core/Updates/2.0-a13.php b/core/Updates/2.0-a13.php
index 5a572d8073..b2168967ee 100644
--- a/core/Updates/2.0-a13.php
+++ b/core/Updates/2.0-a13.php
@@ -11,10 +11,10 @@
 namespace Piwik\Updates;
 
 use Piwik\Common;
+use Piwik\Db;
 use Piwik\Filesystem;
 use Piwik\Updater;
 use Piwik\Updates;
-use Piwik\Db;
 
 /**
  * @package Updates
diff --git a/core/View.php b/core/View.php
index c0b6c9bcc2..4b593103f9 100644
--- a/core/View.php
+++ b/core/View.php
@@ -11,7 +11,6 @@
 namespace Piwik;
 
 use Exception;
-
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
 use Piwik\View\ViewInterface;
diff --git a/core/View/ReportsByDimension.php b/core/View/ReportsByDimension.php
index b394736271..2662f814d9 100644
--- a/core/View/ReportsByDimension.php
+++ b/core/View/ReportsByDimension.php
@@ -11,8 +11,8 @@
 namespace Piwik\View;
 
 use Piwik\FrontController;
-use Piwik\View;
 use Piwik\Url;
+use Piwik\View;
 
 /**
  * A facade that makes it easier to use the '_reportsByDimension.twig' template.
diff --git a/core/ViewDataTable.php b/core/ViewDataTable.php
index 8317c94e22..4edacabea4 100644
--- a/core/ViewDataTable.php
+++ b/core/ViewDataTable.php
@@ -16,8 +16,8 @@ use Piwik\Period;
 use Piwik\Period\Range;
 use Piwik\Plugins\API\API;
 use Piwik\ViewDataTable\Properties;
-use Piwik\ViewDataTable\VisualizationPropertiesProxy;
 use Piwik\ViewDataTable\Visualization;
+use Piwik\ViewDataTable\VisualizationPropertiesProxy;
 
 /**
  * This class is used to load (from the API) and customize the output of a given DataTable.
diff --git a/core/ViewDataTable/Properties.php b/core/ViewDataTable/Properties.php
index 9929b663cc..4f5886a327 100644
--- a/core/ViewDataTable/Properties.php
+++ b/core/ViewDataTable/Properties.php
@@ -12,11 +12,11 @@
 namespace Piwik\ViewDataTable;
 
 use Exception;
-use ReflectionClass;
-
 use Piwik\Config;
 use Piwik\Metrics;
 
+use ReflectionClass;
+
 /**
  * Contains the list of all core DataTable display properties for use with ViewDataTable.
  *
diff --git a/core/ViewDataTable/Visualization.php b/core/ViewDataTable/Visualization.php
index 45e3c61e32..c2b7cbe096 100644
--- a/core/ViewDataTable/Visualization.php
+++ b/core/ViewDataTable/Visualization.php
@@ -11,8 +11,8 @@
 
 namespace Piwik\ViewDataTable;
 
-use Piwik\View;
 use Piwik\DataTable;
+use Piwik\View;
 
 /**
  * Base class for all DataTable visualizations. Different visualizations are used to
diff --git a/core/functions.php b/core/functions.php
index b1cf05abc7..ca8a34d7c0 100644
--- a/core/functions.php
+++ b/core/functions.php
@@ -12,8 +12,8 @@
 // All classes and functions below are defined in the global namespace
 namespace {
 
-    use Piwik\EventDispatcher;
     use Piwik\DataTable;
+    use Piwik\EventDispatcher;
     use Piwik\Menu\Admin;
     use Piwik\Menu\Main;
     use Piwik\Menu\Top;