diff options
author | mattab <matthieu.aubry@gmail.com> | 2014-05-09 10:55:29 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2014-05-09 10:55:29 +0400 |
commit | 9015fd82c4843c19afc5a6b482b8deeadc5e6650 (patch) | |
tree | 34085bd18437232ff83efec08840339cb7d5ddce /plugins | |
parent | 19cea197f6434dad5858128273b5c9817dcb23d5 (diff) |
Organised imports, using phpstorm optimize imports feature
Diffstat (limited to 'plugins')
30 files changed, 37 insertions, 37 deletions
diff --git a/plugins/API/API.php b/plugins/API/API.php index bb2d4af630..6d2b0e4e46 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -11,14 +11,14 @@ namespace Piwik\Plugins\API; use Piwik\API\Proxy; use Piwik\API\Request; use Piwik\Config; +use Piwik\DataTable; use Piwik\DataTable\Filter\ColumnDelete; use Piwik\DataTable\Row; -use Piwik\DataTable; use Piwik\Date; use Piwik\Menu\MenuTop; use Piwik\Metrics; -use Piwik\Period\Range; use Piwik\Period; +use Piwik\Period\Range; use Piwik\Piwik; use Piwik\Plugins\CoreAdminHome\CustomLogo; use Piwik\Tracker\GoalManager; diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php index 3236500b4b..8ed8931e00 100644 --- a/plugins/API/ProcessedReport.php +++ b/plugins/API/ProcessedReport.php @@ -12,9 +12,9 @@ use Exception; use Piwik\API\Request; use Piwik\Archive\DataTableFactory; use Piwik\Common; +use Piwik\DataTable; use Piwik\DataTable\Row; use Piwik\DataTable\Simple; -use Piwik\DataTable; use Piwik\Date; use Piwik\Metrics; use Piwik\MetricsFormatter; diff --git a/plugins/API/RowEvolution.php b/plugins/API/RowEvolution.php index a34543f365..4f203ebf58 100644 --- a/plugins/API/RowEvolution.php +++ b/plugins/API/RowEvolution.php @@ -13,10 +13,10 @@ use Piwik\API\DataTableManipulator\LabelFilter; use Piwik\API\Request; use Piwik\API\ResponseBuilder; use Piwik\Common; +use Piwik\DataTable; use Piwik\DataTable\Filter\CalculateEvolutionFilter; use Piwik\DataTable\Filter\SafeDecodeLabel; use Piwik\DataTable\Row; -use Piwik\DataTable; use Piwik\Period; use Piwik\Piwik; use Piwik\Site; diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php index 2ed50efadf..52d5d0c6a0 100644 --- a/plugins/Actions/ArchivingHelper.php +++ b/plugins/Actions/ArchivingHelper.php @@ -10,10 +10,10 @@ namespace Piwik\Plugins\Actions; use PDOStatement; use Piwik\Config; +use Piwik\DataTable\Row\DataTableSummaryRow; +use Piwik\DataTable; use Piwik\DataTable\Manager; use Piwik\DataTable\Row; -use Piwik\DataTable; -use Piwik\DataTable\Row\DataTableSummaryRow; use Piwik\Metrics; use Piwik\Piwik; use Piwik\Tracker\Action; diff --git a/plugins/Annotations/API.php b/plugins/Annotations/API.php index 367edca08c..418d9be0ec 100755 --- a/plugins/Annotations/API.php +++ b/plugins/Annotations/API.php @@ -10,8 +10,8 @@ namespace Piwik\Plugins\Annotations; use Exception; use Piwik\Date; -use Piwik\Period; use Piwik\Period\Range; +use Piwik\Period; use Piwik\Piwik; use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Evolution as EvolutionViz; diff --git a/plugins/CoreAdminHome/API.php b/plugins/CoreAdminHome/API.php index 0c4b925bff..94aa0491ca 100644 --- a/plugins/CoreAdminHome/API.php +++ b/plugins/CoreAdminHome/API.php @@ -13,8 +13,8 @@ use Piwik\DataAccess\ArchiveTableCreator; use Piwik\Date; use Piwik\Db; use Piwik\Option; -use Piwik\Period; use Piwik\Period\Week; +use Piwik\Period; use Piwik\Piwik; use Piwik\Plugins\PrivacyManager\PrivacyManager; use Piwik\Site; diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php index 09c7798863..81b5de89cc 100644 --- a/plugins/CoreUpdater/Controller.php +++ b/plugins/CoreUpdater/Controller.php @@ -18,8 +18,8 @@ use Piwik\Filesystem; use Piwik\Http; use Piwik\Option; use Piwik\Piwik; -use Piwik\Plugin; use Piwik\Plugin\Manager as PluginManager; +use Piwik\Plugin; use Piwik\Plugins\CorePluginsAdmin\Marketplace; use Piwik\Plugins\LanguagesManager\LanguagesManager; use Piwik\SettingsPiwik; @@ -28,8 +28,8 @@ use Piwik\Unzip; use Piwik\UpdateCheck; use Piwik\Updater; use Piwik\Version; -use Piwik\View; use Piwik\View\OneClickDone; +use Piwik\View; /** * diff --git a/plugins/CoreVisualizations/Visualizations/Graph.php b/plugins/CoreVisualizations/Visualizations/Graph.php index 6d90aab1ea..1e63c8f741 100644 --- a/plugins/CoreVisualizations/Visualizations/Graph.php +++ b/plugins/CoreVisualizations/Visualizations/Graph.php @@ -8,8 +8,8 @@ */ namespace Piwik\Plugins\CoreVisualizations\Visualizations; -use Piwik\DataTable\Row; use Piwik\DataTable; +use Piwik\DataTable\Row; use Piwik\Piwik; use Piwik\Plugin\Visualization; diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject c518a99a1c275172f727b1e9c97195aaaafaca4 +Subproject 5b64d36811e5685e194672152430c1cc67c7466 diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php index d7ae1ac015..1afcdef098 100644 --- a/plugins/CustomVariables/Archiver.php +++ b/plugins/CustomVariables/Archiver.php @@ -13,8 +13,8 @@ use Piwik\Config; use Piwik\DataAccess\LogAggregator; use Piwik\DataArray; use Piwik\Metrics; -use Piwik\Tracker; use Piwik\Tracker\GoalManager; +use Piwik\Tracker; require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php'; diff --git a/plugins/Events/API.php b/plugins/Events/API.php index 0be6037596..bd41c6a0b8 100644 --- a/plugins/Events/API.php +++ b/plugins/Events/API.php @@ -9,8 +9,8 @@ namespace Piwik\Plugins\Events; use Piwik\Archive; -use Piwik\DataTable; use Piwik\DataTable\Row; +use Piwik\DataTable; use Piwik\Metrics; use Piwik\Piwik; diff --git a/plugins/ExampleAPI/API.php b/plugins/ExampleAPI/API.php index 638238350c..2c3fa728fc 100644 --- a/plugins/ExampleAPI/API.php +++ b/plugins/ExampleAPI/API.php @@ -8,8 +8,8 @@ */ namespace Piwik\Plugins\ExampleAPI; -use Piwik\DataTable; use Piwik\DataTable\Row; +use Piwik\DataTable; use Piwik\Piwik; use Piwik\Version; diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php index 77bcb7a030..e6a090a9d0 100644 --- a/plugins/Goals/Controller.php +++ b/plugins/Goals/Controller.php @@ -11,13 +11,13 @@ namespace Piwik\Plugins\Goals; use Exception; use Piwik\API\Request; use Piwik\Common; -use Piwik\DataTable\Filter\AddColumnsProcessedMetricsGoal; use Piwik\DataTable; +use Piwik\DataTable\Filter\AddColumnsProcessedMetricsGoal; use Piwik\FrontController; use Piwik\Piwik; use Piwik\Plugins\Referrers\API as APIReferrers; -use Piwik\View\ReportsByDimension; use Piwik\View; +use Piwik\View\ReportsByDimension; /** * diff --git a/plugins/Insights/tests/ApiTest.php b/plugins/Insights/tests/ApiTest.php index a05a2d9f4e..06223f1e63 100644 --- a/plugins/Insights/tests/ApiTest.php +++ b/plugins/Insights/tests/ApiTest.php @@ -8,8 +8,8 @@ namespace Piwik\Plugins\Insights\tests; use Piwik\API\Request as ApiRequest; -use Piwik\DataTable\Row; use Piwik\DataTable; +use Piwik\DataTable\Row; use Piwik\Plugins\Insights\API; use Piwik\Plugins\Insights\tests\Fixtures\SomeVisitsDifferentPathsOnTwoDays; diff --git a/plugins/Insights/tests/InsightReportTest.php b/plugins/Insights/tests/InsightReportTest.php index 3e50a2ba41..49041f8262 100644 --- a/plugins/Insights/tests/InsightReportTest.php +++ b/plugins/Insights/tests/InsightReportTest.php @@ -8,8 +8,8 @@ namespace Piwik\Plugins\Insights\tests; -use Piwik\DataTable; use Piwik\DataTable\Row; +use Piwik\DataTable; use Piwik\Plugins\Insights\InsightReport; use Piwik\Plugins\Insights\Visualizations\Insight; diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index 3123ee12bc..a76136e70e 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -14,8 +14,8 @@ use Piwik\AssetManager; use Piwik\Common; use Piwik\Config; use Piwik\DataAccess\ArchiveTableCreator; -use Piwik\Db\Adapter; use Piwik\Db; +use Piwik\Db\Adapter; use Piwik\DbHelper; use Piwik\Filesystem; use Piwik\Http; diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php index ce4df518f5..8b847106a7 100644 --- a/plugins/Installation/FormDatabaseSetup.php +++ b/plugins/Installation/FormDatabaseSetup.php @@ -13,8 +13,8 @@ use HTML_QuickForm2_DataSource_Array; use HTML_QuickForm2_Factory; use HTML_QuickForm2_Rule; use Piwik\Config; -use Piwik\Db\Adapter; use Piwik\Db; +use Piwik\Db\Adapter; use Piwik\DbHelper; use Piwik\Filesystem; use Piwik\Piwik; diff --git a/plugins/Installation/SystemCheck.php b/plugins/Installation/SystemCheck.php index 4e3058d15c..aff9603e0a 100644 --- a/plugins/Installation/SystemCheck.php +++ b/plugins/Installation/SystemCheck.php @@ -10,8 +10,8 @@ namespace Piwik\Plugins\Installation; use Piwik\Common; use Piwik\Config; -use Piwik\Db\Adapter; use Piwik\Db; +use Piwik\Db\Adapter; use Piwik\DbHelper; use Piwik\Filechecks; use Piwik\Filesystem; diff --git a/plugins/Live/API.php b/plugins/Live/API.php index bbc23cc08c..de41680fb2 100644 --- a/plugins/Live/API.php +++ b/plugins/Live/API.php @@ -11,13 +11,13 @@ namespace Piwik\Plugins\Live; use Exception; use Piwik\Common; use Piwik\Config; -use Piwik\DataTable\Row; use Piwik\DataTable; +use Piwik\DataTable\Row; use Piwik\Date; use Piwik\Db; use Piwik\MetricsFormatter; -use Piwik\Period; use Piwik\Period\Range; +use Piwik\Period; use Piwik\Piwik; use Piwik\Plugins\Referrers\API as APIReferrers; use Piwik\Plugins\SitesManager\API as APISitesManager; diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index 0112ca6a03..0eca7043c3 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -19,10 +19,10 @@ use Piwik\Plugins\API\API as APIMetadata; use Piwik\Plugins\CustomVariables\CustomVariables; use Piwik\Plugins\Referrers\API as APIReferrers; use Piwik\Plugins\UserCountry\LocationProvider\GeoIp; +use Piwik\Tracker; use Piwik\Tracker\Action; use Piwik\Tracker\GoalManager; use Piwik\Tracker\Visit; -use Piwik\Tracker; use Piwik\UrlHelper; /** diff --git a/plugins/PrivacyManager/PrivacyManager.php b/plugins/PrivacyManager/PrivacyManager.php index e8a1718b84..10b05cac5c 100644 --- a/plugins/PrivacyManager/PrivacyManager.php +++ b/plugins/PrivacyManager/PrivacyManager.php @@ -16,8 +16,8 @@ use Piwik\Db; use Piwik\Menu\MenuAdmin; use Piwik\Metrics; use Piwik\Option; -use Piwik\Period\Range; use Piwik\Period; +use Piwik\Period\Range; use Piwik\Piwik; use Piwik\Plugins\Goals\Archiver; use Piwik\ScheduledTask; diff --git a/plugins/Referrers/Referrers.php b/plugins/Referrers/Referrers.php index df197d49b3..9a567b16d6 100644 --- a/plugins/Referrers/Referrers.php +++ b/plugins/Referrers/Referrers.php @@ -13,8 +13,8 @@ use Piwik\Common; use Piwik\Menu\MenuMain; use Piwik\Piwik; use Piwik\Plugin\ViewDataTable; -use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable\AllColumns; use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable; +use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable\AllColumns; use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Pie; use Piwik\SettingsPiwik; use Piwik\WidgetsList; diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php index e5926e1b44..26d5159dd3 100644 --- a/plugins/ScheduledReports/API.php +++ b/plugins/ScheduledReports/API.php @@ -17,8 +17,8 @@ use Piwik\Piwik; use Piwik\Plugins\LanguagesManager\LanguagesManager; use Piwik\Plugins\SegmentEditor\API as APISegmentEditor; use Piwik\Plugins\SitesManager\API as SitesManagerApi; -use Piwik\ReportRenderer; use Piwik\ReportRenderer\Html; +use Piwik\ReportRenderer; use Piwik\Site; use Piwik\Translate; use Zend_Mime; diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php index 21cd3ff2a3..5664e1b766 100644 --- a/plugins/Transitions/API.php +++ b/plugins/Transitions/API.php @@ -14,9 +14,9 @@ use Piwik\ArchiveProcessor; use Piwik\Common; use Piwik\DataAccess\LogAggregator; use Piwik\DataArray; +use Piwik\DataTable; use Piwik\DataTable\Manager; use Piwik\DataTable\Row; -use Piwik\DataTable; use Piwik\Metrics; use Piwik\Period; use Piwik\Piwik; diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization -Subproject 39f293b21a67fe81fb145bb4aa527703792727b +Subproject 6f49212ee144abe9c67d01d1b61afe1d7b1fb10 diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php index 3a6cdb1075..302866b41f 100644 --- a/plugins/UserCountry/Controller.php +++ b/plugins/UserCountry/Controller.php @@ -14,11 +14,11 @@ use Piwik\DataTable\Renderer\Json; use Piwik\Http; use Piwik\IP; use Piwik\Piwik; +use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\ServerBased; +use Piwik\Plugins\UserCountry\LocationProvider\GeoIp; +use Piwik\Plugins\UserCountry\LocationProvider; use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider; use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\Pecl; -use Piwik\Plugins\UserCountry\LocationProvider; -use Piwik\Plugins\UserCountry\LocationProvider\GeoIp; -use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\ServerBased; use Piwik\View; /** diff --git a/plugins/UserCountry/GeoIPAutoUpdater.php b/plugins/UserCountry/GeoIPAutoUpdater.php index 5699e7b80c..a26807fb20 100755 --- a/plugins/UserCountry/GeoIPAutoUpdater.php +++ b/plugins/UserCountry/GeoIPAutoUpdater.php @@ -17,9 +17,9 @@ use Piwik\Http; use Piwik\Log; use Piwik\Option; use Piwik\Piwik; -use Piwik\Plugins\UserCountry\LocationProvider; -use Piwik\Plugins\UserCountry\LocationProvider\GeoIp; use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\Php; +use Piwik\Plugins\UserCountry\LocationProvider\GeoIp; +use Piwik\Plugins\UserCountry\LocationProvider; use Piwik\ScheduledTask; use Piwik\ScheduledTaskTimetable; use Piwik\ScheduledTime\Monthly; diff --git a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php index 075dfa778d..234690e35e 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php @@ -12,8 +12,8 @@ namespace Piwik\Plugins\UserCountry\LocationProvider\GeoIp; use Piwik\Common; use Piwik\IP; use Piwik\Piwik; -use Piwik\Plugins\UserCountry\LocationProvider; use Piwik\Plugins\UserCountry\LocationProvider\GeoIp; +use Piwik\Plugins\UserCountry\LocationProvider; /** * A LocationProvider that uses an GeoIP module installed in an HTTP Server. diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php index 743a4e6b83..ddeb61521f 100644 --- a/plugins/UserCountry/UserCountry.php +++ b/plugins/UserCountry/UserCountry.php @@ -18,9 +18,9 @@ use Piwik\Piwik; use Piwik\Plugin\Manager; use Piwik\Plugin\ViewDataTable; use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig; -use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider; -use Piwik\Plugins\UserCountry\LocationProvider; use Piwik\Plugins\UserCountry\LocationProvider\GeoIp; +use Piwik\Plugins\UserCountry\LocationProvider; +use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider; use Piwik\Url; use Piwik\WidgetsList; diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php index 638f5feee2..fbdda4dc1f 100644 --- a/plugins/VisitsSummary/Controller.php +++ b/plugins/VisitsSummary/Controller.php @@ -10,8 +10,8 @@ namespace Piwik\Plugins\VisitsSummary; use Piwik\API\Request; use Piwik\Common; -use Piwik\DataTable\Row; use Piwik\DataTable; +use Piwik\DataTable\Row; use Piwik\Piwik; use Piwik\Plugins\Actions\API as APIActions; use Piwik\Site; |