From: Torben Brodt <t.brodt@gmail.com>
Date: Tue, 31 Jan 2012 19:12:25 +0000 (+0100)
Subject: removed wrong namespaces, ordered use clauses alphabetically, marked missing classes... 
X-Git-Tag: 2.0.0_Beta_1~1358^2~19^2^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ec1b1daf0ec675115942a7bb732e6a05961b93e4;p=GitHub%2FWoltLab%2FWCF.git

removed wrong namespaces, ordered use clauses alphabetically, marked missing classes with TODOs
---

diff --git a/wcfsetup/install/files/acp/install.php b/wcfsetup/install/files/acp/install.php
index 1706119b77..f3ad6b6474 100644
--- a/wcfsetup/install/files/acp/install.php
+++ b/wcfsetup/install/files/acp/install.php
@@ -1,10 +1,10 @@
 <?php
 namespace wcf\acp;
 use wcf\data\language\LanguageEditor;
+use wcf\system\WCF;
 use wcf\system\cache\CacheHandler;
 use wcf\system\session\SessionHandler;
 use wcf\system\template\ACPTemplateEngine;
-use wcf\system\WCF;
 
 /**
  * @author	Marcel Werk
diff --git a/wcfsetup/install/files/lib/acp/action/InstallPackageAction.class.php b/wcfsetup/install/files/lib/acp/action/InstallPackageAction.class.php
index d253c54882..4d7b50b4db 100755
--- a/wcfsetup/install/files/lib/acp/action/InstallPackageAction.class.php
+++ b/wcfsetup/install/files/lib/acp/action/InstallPackageAction.class.php
@@ -2,9 +2,9 @@
 namespace wcf\acp\action;
 use wcf\action\AbstractDialogAction;
 use wcf\data\package\installation\queue\PackageInstallationQueue;
+use wcf\system\WCF;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\package\PackageInstallationDispatcher;
-use wcf\system\WCF;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php b/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php
index 2f18ed59ba..2e7d829425 100755
--- a/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php
+++ b/wcfsetup/install/files/lib/acp/action/LogoutAction.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\acp\action;
 use wcf\action\AbstractSecureAction;
-use wcf\system\exception\IllegalLinkException;
 use wcf\system\WCF;
+use wcf\system\exception\IllegalLinkException;
 use wcf\util\HeaderUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php b/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php
index 205c9efd2b..45c178de44 100644
--- a/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php
+++ b/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php
@@ -4,10 +4,10 @@ use wcf\action\AbstractDialogAction;
 use wcf\data\package\Package;
 use wcf\data\package\installation\queue\PackageInstallationQueue;
 use wcf\data\package\installation\queue\PackageInstallationQueueEditor;
+use wcf\system\WCF;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\SystemException;
 use wcf\system\package\PackageUninstallationDispatcher;
-use wcf\system\WCF;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php b/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php
index 874950cd6c..c158202ce9 100644
--- a/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php
+++ b/wcfsetup/install/files/lib/acp/action/WorkerProxyAction.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\acp\action;
 use wcf\action\AbstractSecureAction;
+use wcf\system\WCF;
 use wcf\system\exception\AJAXException;
 use wcf\system\exception\SystemException;
-use wcf\system\WCF;
 use wcf\util\ClassUtil;
 use wcf\util\JSON;
 
diff --git a/wcfsetup/install/files/lib/acp/form/ACPForm.class.php b/wcfsetup/install/files/lib/acp/form/ACPForm.class.php
index 5b9f2f41f1..2ea0610bdf 100755
--- a/wcfsetup/install/files/lib/acp/form/ACPForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/ACPForm.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\acp\form;
-use wcf\system\menu\acp\ACPMenu;
 use wcf\form\AbstractForm;
+use wcf\system\menu\acp\ACPMenu;
 
 /**
  * Provides a default implementation for the show method in acp forms.
diff --git a/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php b/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php
index 4365a21493..49e4760b5f 100755
--- a/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php
@@ -2,9 +2,9 @@
 namespace wcf\acp\form;
 use wcf\data\cronjob\CronjobAction;
 use wcf\data\package\Package;
+use wcf\system\WCF;
 use wcf\system\exception\SystemException;
 use wcf\system\exception\UserInputException;
-use wcf\system\WCF;
 use wcf\util\CronjobUtil;
 use wcf\util\StringUtil;
 
diff --git a/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php b/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php
index 82b5d5ae71..165974689d 100755
--- a/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/CronjobEditForm.class.php
@@ -2,8 +2,8 @@
 namespace wcf\acp\form;
 use wcf\data\cronjob\Cronjob;
 use wcf\data\cronjob\CronjobAction;
-use wcf\system\exception\IllegalLinkException;
 use wcf\system\WCF;
+use wcf\system\exception\IllegalLinkException;
 
 /**
  * Shows the cronjob edit form.
diff --git a/wcfsetup/install/files/lib/acp/form/LoginForm.class.php b/wcfsetup/install/files/lib/acp/form/LoginForm.class.php
index 5215806885..16b166a260 100755
--- a/wcfsetup/install/files/lib/acp/form/LoginForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LoginForm.class.php
@@ -2,11 +2,11 @@
 namespace wcf\acp\form;
 use wcf\data\user\User;
 use wcf\form\AbstractForm;
-use wcf\system\user\authentication\UserAuthenticationFactory;
-use wcf\system\user\authentication\EmailUserAuthentication;
+use wcf\system\WCF;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\exception\UserInputException;
-use wcf\system\WCF;
+use wcf\system\user\authentication\EmailUserAuthentication;
+use wcf\system\user\authentication\UserAuthenticationFactory;
 use wcf\util\HeaderUtil;
 use wcf\util\StringUtil;
 
diff --git a/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php b/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php
index 6d8e095d95..47b3804740 100755
--- a/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\acp\form;
+use wcf\system\WCF;
 use wcf\system\exception\UserInputException;
 use wcf\system\request\LinkHandler;
-use wcf\system\WCF;
 use wcf\util\HeaderUtil;
 use wcf\util\StringUtil;
 
diff --git a/wcfsetup/install/files/lib/acp/form/OptionForm.class.php b/wcfsetup/install/files/lib/acp/form/OptionForm.class.php
index 1f20740251..a303939d38 100644
--- a/wcfsetup/install/files/lib/acp/form/OptionForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/OptionForm.class.php
@@ -1,13 +1,13 @@
 <?php
 namespace wcf\acp\form;
-use wcf\system\menu\acp\ACPMenu;
-use wcf\data\option\category\OptionCategory;
-use wcf\data\option\OptionAction;
 use wcf\data\option\Option;
-use wcf\system\exception\IllegalLinkException;
-use wcf\system\language\I18nHandler;
+use wcf\data\option\OptionAction;
+use wcf\data\option\category\OptionCategory;
 use wcf\system\WCF;
 use wcf\system\WCFACP;
+use wcf\system\exception\IllegalLinkException;
+use wcf\system\language\I18nHandler;
+use wcf\system\menu\acp\ACPMenu;
 
 /**
  * Shows the option edit form.
diff --git a/wcfsetup/install/files/lib/acp/form/OptionImportForm.class.php b/wcfsetup/install/files/lib/acp/form/OptionImportForm.class.php
index 06b099e907..fb07aa3284 100755
--- a/wcfsetup/install/files/lib/acp/form/OptionImportForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/OptionImportForm.class.php
@@ -1,11 +1,10 @@
 <?php
 namespace wcf\acp\form;
-use wcf\acp\option\Options;
 use wcf\data\option\OptionAction;
-use wcf\system\exception\UserInputException;
-use wcf\system\exception\SystemException;
 use wcf\system\WCF;
 use wcf\system\WCFACP;
+use wcf\system\exception\SystemException;
+use wcf\system\exception\UserInputException;
 use wcf\util\XML;
 
 /**
diff --git a/wcfsetup/install/files/lib/acp/form/PackageUpdateAuthForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageUpdateAuthForm.class.php
index 01df233d85..13371928ac 100755
--- a/wcfsetup/install/files/lib/acp/form/PackageUpdateAuthForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PackageUpdateAuthForm.class.php
@@ -2,10 +2,10 @@
 namespace wcf\acp\form;
 use wcf\data\package\update\server\PackageUpdateServer;
 use wcf\data\package\update\server\PackageUpdateServerEditor;
+use wcf\system\WCF;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\package\PackageUpdateAuthorizationRequiredException;
 use wcf\system\request\RequestHandler;
-use wcf\system\WCF;
 use wcf\util\ArrayUtil;
 use wcf\util\StringUtil;
 
diff --git a/wcfsetup/install/files/lib/acp/form/PackageUpdateForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageUpdateForm.class.php
index 893f7cd21b..c251f8d3ab 100755
--- a/wcfsetup/install/files/lib/acp/form/PackageUpdateForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PackageUpdateForm.class.php
@@ -1,11 +1,11 @@
 <?php
 namespace wcf\acp\form;
+use wcf\system\WCF;
+use wcf\system\WCFACP;
 use wcf\system\exception\SystemException;
 use wcf\system\exception\UserInputException;
 use wcf\system\package\PackageUpdateDispatcher;
 use wcf\system\request\LinkHandler;
-use wcf\system\WCF;
-use wcf\system\WCFACP;
 use wcf\util\HeaderUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/acp/form/PackageUpdateSearchForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageUpdateSearchForm.class.php
index 650248bb5d..1f5c0a255e 100644
--- a/wcfsetup/install/files/lib/acp/form/PackageUpdateSearchForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PackageUpdateSearchForm.class.php
@@ -2,12 +2,12 @@
 namespace wcf\acp\form;
 use wcf\data\package\update\server\PackageUpdateServer;
 use wcf\data\search\SearchEditor;
+use wcf\system\WCF;
+use wcf\system\WCFACP;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\UserInputException;
 use wcf\system\package\PackageUpdateDispatcher;
 use wcf\system\request\LinkHandler;
-use wcf\system\WCF;
-use wcf\system\WCFACP;
 use wcf\util\ArrayUtil;
 use wcf\util\HeaderUtil;
 use wcf\util\StringUtil;
diff --git a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php
index f2a880c52d..18fa6db328 100644
--- a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php
@@ -1,14 +1,14 @@
 <?php
 namespace wcf\acp\form;
-use wcf\system\menu\acp\ACPMenu;
 use wcf\data\option\Option;
-use wcf\data\user\group\UserGroup;
 use wcf\data\user\UserAction;
+use wcf\data\user\group\UserGroup;
 use wcf\form\AbstractForm;
+use wcf\system\WCF;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\UserInputException;
 use wcf\system\language\LanguageFactory;
-use wcf\system\WCF;
+use wcf\system\menu\acp\ACPMenu;
 use wcf\util\ArrayUtil;
 use wcf\util\StringUtil;
 use wcf\util\UserUtil;
diff --git a/wcfsetup/install/files/lib/acp/form/UserAssignToGroupForm.class.php b/wcfsetup/install/files/lib/acp/form/UserAssignToGroupForm.class.php
index 7058fbfdf6..c3f1509147 100755
--- a/wcfsetup/install/files/lib/acp/form/UserAssignToGroupForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserAssignToGroupForm.class.php
@@ -1,8 +1,9 @@
 <?php
 namespace wcf\acp\form;
-use wcf\data\user\group\UserGroup;
 use wcf\data\user\User;
 use wcf\data\user\UserEditor;
+use wcf\data\user\group\UserGroup;
+use wcf\system\WCF;
 use wcf\system\clipboard\ClipboardHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\IllegalLinkException;
@@ -10,7 +11,6 @@ use wcf\system\exception\PermissionDeniedException;
 use wcf\system\exception\SystemException;
 use wcf\system\exception\UserInputException;
 use wcf\system\session\SessionHandler;
-use wcf\system\WCF;
 use wcf\util\ArrayUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
index 2661c9b8d6..3f418b3c32 100755
--- a/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserEditForm.class.php
@@ -5,9 +5,9 @@ use wcf\data\user\UserAction;
 use wcf\data\user\UserEditor;
 use wcf\data\user\group\UserGroup;
 use wcf\form\AbstractForm;
+use wcf\system\WCF;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\PermissionDeniedException;
-use wcf\system\WCF;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php b/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php
index b76fcae584..73b642eccb 100755
--- a/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserEmailAddressExportForm.class.php
@@ -1,11 +1,11 @@
 <?php
 namespace wcf\acp\form;
 use wcf\data\user\User;
+use wcf\system\WCF;
 use wcf\system\clipboard\ClipboardHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\SystemException;
-use wcf\system\WCF;
 use wcf\util\ArrayUtil;
 use wcf\util\StringUtil;
 
diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
index 97bff7ae74..9e19569f4f 100755
--- a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
@@ -1,14 +1,14 @@
 <?php
 namespace wcf\acp\form;
-use wcf\system\menu\acp\ACPMenu;
 use wcf\data\user\group\UserGroup;
 use wcf\data\user\group\UserGroupAction;
 use wcf\data\user\group\UserGroupEditor;
-use wcf\system\exception\UserInputException;
-use wcf\system\exception\SystemException;
-use wcf\system\language\I18nHandler;
 use wcf\system\WCF;
 use wcf\system\WCFACP;
+use wcf\system\exception\SystemException;
+use wcf\system\exception\UserInputException;
+use wcf\system\language\I18nHandler;
+use wcf\system\menu\acp\ACPMenu;
 use wcf\util\ClassUtil;
 use wcf\util\StringUtil;
 
diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php
index 5dfc11905d..b6d5515281 100755
--- a/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php
@@ -5,10 +5,10 @@ use wcf\data\user\group\UserGroup;
 use wcf\data\user\group\UserGroupAction;
 use wcf\data\user\group\UserGroupEditor;
 use wcf\form\AbstractForm;
+use wcf\system\WCF;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\language\I18nHandler;
-use wcf\system\WCF;
 
 /**
  * Shows the group edit form.
diff --git a/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php b/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php
index 7f02c0b630..20cfa1a50a 100755
--- a/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php
@@ -1,14 +1,14 @@
 <?php
 namespace wcf\acp\form;
-use wcf\data\user\group\UserGroup;
 use wcf\data\user\UserList;
-use wcf\util\ArrayUtil;
-use wcf\util\StringUtil;
+use wcf\data\user\group\UserGroup;
+use wcf\system\WCF;
 use wcf\system\clipboard\ClipboardHandler;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\SystemException;
 use wcf\system\exception\UserInputException;
-use wcf\system\WCF;
+use wcf\util\ArrayUtil;
+use wcf\util\StringUtil;
 
 /**
  * Shows the user mail form.
diff --git a/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php b/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php
index 990289a950..58e804038e 100755
--- a/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php
@@ -1,6 +1,5 @@
 <?php
 namespace wcf\acp\form;
-use wcf\system\menu\acp\ACPMenu;
 use wcf\data\option\Option;
 use wcf\data\search\SearchEditor;
 use wcf\form\AbstractForm;
@@ -8,6 +7,7 @@ use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\UserInputException;
 use wcf\system\language\LanguageFactory;
+use wcf\system\menu\acp\ACPMenu;
 use wcf\system\request\LinkHandler;
 use wcf\system\wcf;
 use wcf\util\ArrayUtil;
diff --git a/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php b/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php
index c47267a4aa..e3f1a420ad 100644
--- a/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php
@@ -1,10 +1,9 @@
 <?php
 namespace wcf\acp\form;
-use wcf\system\menu\acp\ACPMenu;
+use wcf\data\option\Option;
 use wcf\data\user\User;
 use wcf\data\user\UserEditor;
 use wcf\data\user\group\UserGroup;
-use wcf\data\option\Option;
 use wcf\form\AbstractForm;
 use wcf\system\WCF;
 use wcf\system\WCFACP;
@@ -13,6 +12,7 @@ use wcf\system\event\EventHandler;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\exception\UserInputException;
 use wcf\system\language\LanguageFactory;
+use wcf\system\menu\acp\ACPMenu;
 use wcf\system\request\LinkHandler;
 use wcf\system\user\storage\UserStorageHandler;
 use wcf\util\ArrayUtil;
diff --git a/wcfsetup/install/files/lib/acp/page/ACPSessionLogListPage.class.php b/wcfsetup/install/files/lib/acp/page/ACPSessionLogListPage.class.php
index 60203337c2..7853423589 100755
--- a/wcfsetup/install/files/lib/acp/page/ACPSessionLogListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/ACPSessionLogListPage.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\acp\page;
-use wcf\system\menu\acp\ACPMenu;
 use wcf\page\SortablePage;
 use wcf\system\WCF;
+use wcf\system\menu\acp\ACPMenu;
 
 /**
  * Shows a list of log sessions.
diff --git a/wcfsetup/install/files/lib/acp/page/ACPSessionLogPage.class.php b/wcfsetup/install/files/lib/acp/page/ACPSessionLogPage.class.php
index b533beca22..2e21af976f 100755
--- a/wcfsetup/install/files/lib/acp/page/ACPSessionLogPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/ACPSessionLogPage.class.php
@@ -1,10 +1,10 @@
 <?php
 namespace wcf\acp\page;
-use wcf\system\menu\acp\ACPMenu;
 use wcf\data\acp\session\log\ACPSessionLog;
 use wcf\page\SortablePage;
-use wcf\system\exception\IllegalLinkException;
 use wcf\system\WCF;
+use wcf\system\exception\IllegalLinkException;
+use wcf\system\menu\acp\ACPMenu;
 
 /**
  * Shows the details of a logged sessions.
diff --git a/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php b/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php
index c1f6d353a0..c7e858365e 100755
--- a/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php
@@ -1,12 +1,12 @@
 <?php
 namespace wcf\acp\page;
-use wcf\system\menu\acp\ACPMenu;
 use wcf\page\AbstractPage;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\cache\source\MemcacheAdapter;
+use wcf\system\WCF;
 use wcf\system\cache\CacheHandler;
+use wcf\system\cache\source\MemcacheAdapter;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\menu\acp\ACPMenu;
 use wcf\system\package\PackageDependencyHandler;
-use wcf\system\WCF;
 use wcf\util\FileUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php b/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php
index aadff1c727..999bbb3aef 100755
--- a/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\acp\page;
-use wcf\system\menu\acp\ACPMenu;
 use wcf\page\SortablePage;
-use wcf\system\package\PackageDependencyHandler;
 use wcf\system\WCF;
+use wcf\system\menu\acp\ACPMenu;
+use wcf\system\package\PackageDependencyHandler;
 
 /**
  * Shows information about configured cron jobs.
diff --git a/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php b/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php
index 16a7f413a4..5a0ef1f033 100755
--- a/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\acp\page;
-use wcf\system\menu\acp\ACPMenu;
 use wcf\page\SortablePage;
-use wcf\system\package\PackageDependencyHandler;
 use wcf\system\WCF;
+use wcf\system\menu\acp\ACPMenu;
+use wcf\system\package\PackageDependencyHandler;
 
 /**
  * Shows cronjob log information.
diff --git a/wcfsetup/install/files/lib/acp/page/IndexPage.class.php b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php
index e3dc9420b4..25e245416a 100755
--- a/wcfsetup/install/files/lib/acp/page/IndexPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php
@@ -1,10 +1,10 @@
 <?php
 namespace wcf\acp\page;
 use wcf\page\AbstractPage;
-use wcf\system\cache\CacheHandler;
-use wcf\system\package\PackageInstallationDispatcher;
 use wcf\system\WCF;
 use wcf\system\WCFACP;
+use wcf\system\cache\CacheHandler;
+use wcf\system\package\PackageInstallationDispatcher;
 
 /**
  * Shows the welcome page in admin control panel.
diff --git a/wcfsetup/install/files/lib/acp/page/PackageAutoUpdateListPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageAutoUpdateListPage.class.php
index 2244070f0a..ffaa020180 100755
--- a/wcfsetup/install/files/lib/acp/page/PackageAutoUpdateListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackageAutoUpdateListPage.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\acp\page;
-use wcf\system\menu\acp\ACPMenu;
 use wcf\page\AbstractPage;
 use wcf\system\WCF;
 use wcf\system\WCFACP;
+use wcf\system\menu\acp\ACPMenu;
 use wcf\system\package\PackageUpdateDispatcher;
 
 /**
diff --git a/wcfsetup/install/files/lib/acp/page/PackageListDetailedPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageListDetailedPage.class.php
index 9b9475ccfb..c65ff2482d 100644
--- a/wcfsetup/install/files/lib/acp/page/PackageListDetailedPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackageListDetailedPage.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\acp\page;
-use wcf\system\menu\acp\ACPMenu;
 use wcf\data\package\PackageList;
 use wcf\page\SortablePage;
 use wcf\system\WCF;
+use wcf\system\menu\acp\ACPMenu;
 
 /**
  * Shows a list of all installed packages.
diff --git a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
index 932a26a33a..4b7cc37158 100755
--- a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
@@ -3,9 +3,9 @@ namespace wcf\acp\page;
 use wcf\data\package\Package;
 use wcf\data\package\PackageList;
 use wcf\page\AbstractPage;
+use wcf\system\WCF;
 use wcf\system\menu\acp\ACPMenu;
 use wcf\system\request\RouteHandler;
-use wcf\system\WCF;
 use wcf\util\HeaderUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/acp/page/PackagePage.class.php b/wcfsetup/install/files/lib/acp/page/PackagePage.class.php
index a363a382fa..124d667d48 100755
--- a/wcfsetup/install/files/lib/acp/page/PackagePage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackagePage.class.php
@@ -2,11 +2,11 @@
 namespace wcf\acp\page;
 use wcf\data\package\installation\queue\PackageInstallationQueue;
 use wcf\page\AbstractPage;
+use wcf\system\WCF;
+use wcf\system\WCFACP;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\package\PackageInstallationDispatcher;
 use wcf\system\package\PackageUninstallationDispatcher;
-use wcf\system\WCF;
-use wcf\system\WCFACP;
 
 /**
  * Handles all request on the package.php script
@@ -71,7 +71,7 @@ class PackagePage extends AbstractPage {
 				die('ROLLBACK');
 				WCF::getSession()->checkPermissions(array('admin.system.package.canInstallPackage'));
 				require_once(WCF_DIR.'lib/acp/package/PackageInstallationRollback.class.php');
-				new PackageInstallationRollback($this->queueID);
+				new PackageInstallationRollback($this->queueID); // TODO: undefined class PackageInstallationRollback
 			break;
 			
 			case 'openQueue':
diff --git a/wcfsetup/install/files/lib/acp/page/PackageUpdateSearchResultPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageUpdateSearchResultPage.class.php
index 43f8be3cfc..84e345b9fd 100755
--- a/wcfsetup/install/files/lib/acp/page/PackageUpdateSearchResultPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackageUpdateSearchResultPage.class.php
@@ -1,12 +1,12 @@
 <?php
 namespace wcf\acp\page;
-use wcf\system\menu\acp\ACPMenu;
 use wcf\data\package\Package;
 use wcf\data\search\Search;
 use wcf\page\SortablePage;
+use wcf\system\WCF;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\IllegalLinkException;
-use wcf\system\WCF;
+use wcf\system\menu\acp\ACPMenu;
 
 /**
  * Shows the list of package update search results.
diff --git a/wcfsetup/install/files/lib/acp/page/PackageViewPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageViewPage.class.php
index e4d8c5e5d4..4d9c3b14c1 100755
--- a/wcfsetup/install/files/lib/acp/page/PackageViewPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackageViewPage.class.php
@@ -2,9 +2,9 @@
 namespace wcf\acp\page;
 use wcf\data\package\Package;
 use wcf\page\AbstractPage;
-use wcf\system\menu\acp\ACPMenu;
-use wcf\system\exception\IllegalLinkException;
 use wcf\system\WCF;
+use wcf\system\exception\IllegalLinkException;
+use wcf\system\menu\acp\ACPMenu;
 
 /**
  * Shows all information about an installed package.
diff --git a/wcfsetup/install/files/lib/acp/page/UpdateServerListPage.class.php b/wcfsetup/install/files/lib/acp/page/UpdateServerListPage.class.php
index 0b766057ef..e6dd2aa70a 100755
--- a/wcfsetup/install/files/lib/acp/page/UpdateServerListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/UpdateServerListPage.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\acp\page;
-use wcf\system\menu\acp\ACPMenu;
 use wcf\page\SortablePage;
 use wcf\system\WCF;
+use wcf\system\menu\acp\ACPMenu;
 
 /**
  * Shows information about available update package servers.
diff --git a/wcfsetup/install/files/lib/acp/page/UserGroupListPage.class.php b/wcfsetup/install/files/lib/acp/page/UserGroupListPage.class.php
index c6fae86d96..800fd1d71e 100755
--- a/wcfsetup/install/files/lib/acp/page/UserGroupListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/UserGroupListPage.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\acp\page;
-use wcf\system\menu\acp\ACPMenu;
 use wcf\page\SortablePage;
 use wcf\system\WCF;
+use wcf\system\menu\acp\ACPMenu;
 
 /**
  * Shows a list of all user groups.
diff --git a/wcfsetup/install/files/lib/acp/page/UserListPage.class.php b/wcfsetup/install/files/lib/acp/page/UserListPage.class.php
index ac5d0dd863..d5a3ab5f3e 100755
--- a/wcfsetup/install/files/lib/acp/page/UserListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/UserListPage.class.php
@@ -1,18 +1,18 @@
 <?php
 namespace wcf\acp\page;
-use wcf\system\menu\acp\ACPMenu;
 use wcf\data\user\User;
 use wcf\data\user\group\UserGroup;
 use wcf\data\user\option\ViewableUserOption;
 use wcf\page\SortablePage;
+use wcf\system\WCF;
 use wcf\system\cache\CacheHandler;
 use wcf\system\clipboard\ClipboardHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\SystemException;
+use wcf\system\menu\acp\ACPMenu;
 use wcf\system\request\LinkHandler;
-use wcf\system\WCF;
 use wcf\util\DateUtil;
 use wcf\util\StringUtil;
 
diff --git a/wcfsetup/install/files/lib/action/AbstractAction.class.php b/wcfsetup/install/files/lib/action/AbstractAction.class.php
index dab278c868..fe4b37adc8 100644
--- a/wcfsetup/install/files/lib/action/AbstractAction.class.php
+++ b/wcfsetup/install/files/lib/action/AbstractAction.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\action;
+use wcf\system\WCF;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\IllegalLinkException;
-use wcf\system\WCF;
 
 /**
  * This class provides default implementations for the Action interface.
diff --git a/wcfsetup/install/files/lib/action/AbstractSecureAction.class.php b/wcfsetup/install/files/lib/action/AbstractSecureAction.class.php
index c47bed4efd..711325c17b 100644
--- a/wcfsetup/install/files/lib/action/AbstractSecureAction.class.php
+++ b/wcfsetup/install/files/lib/action/AbstractSecureAction.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\action;
-use wcf\system\exception\IllegalLinkException;
 use wcf\system\WCF;
+use wcf\system\exception\IllegalLinkException;
 
 /**
  * Extends AbstractAction by a function to validate a given security token.
diff --git a/wcfsetup/install/files/lib/action/ClipboardAction.class.php b/wcfsetup/install/files/lib/action/ClipboardAction.class.php
index 8fd94be194..212a3b391c 100644
--- a/wcfsetup/install/files/lib/action/ClipboardAction.class.php
+++ b/wcfsetup/install/files/lib/action/ClipboardAction.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\action;
+use wcf\system\WCF;
 use wcf\system\clipboard\ClipboardHandler;
 use wcf\system\exception\AJAXException;
-use wcf\system\WCF;
 use wcf\util\ArrayUtil;
 use wcf\util\JSON;
 use wcf\util\StringUtil;
diff --git a/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php b/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php
index 6a2bb9a27e..b102fafd5d 100644
--- a/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php
+++ b/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php
@@ -1,10 +1,10 @@
 <?php
 namespace wcf\data;
+use wcf\system\WCF;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\exception\SystemException;
 use wcf\system\exception\ValidateActionException;
-use wcf\system\WCF;
 use wcf\util\ClassUtil;
 use wcf\util\StringUtil;
 
diff --git a/wcfsetup/install/files/lib/data/DatabaseObjectDecorator.class.php b/wcfsetup/install/files/lib/data/DatabaseObjectDecorator.class.php
index 01d4a7e131..b10757d559 100644
--- a/wcfsetup/install/files/lib/data/DatabaseObjectDecorator.class.php
+++ b/wcfsetup/install/files/lib/data/DatabaseObjectDecorator.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\data;
-use wcf\system\exception\SystemException;
 use wcf\system\WCF;
+use wcf\system\exception\SystemException;
 
 /**
  * Basic implementation for object decorators.
diff --git a/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php b/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php
index 4fdef16772..4518f357a6 100644
--- a/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php
+++ b/wcfsetup/install/files/lib/data/DatabaseObjectList.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\data;
+use wcf\system\WCF;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
-use wcf\system\WCF;
 
 /**
  * Abstract class for a list of database objects.
diff --git a/wcfsetup/install/files/lib/data/acp/template/ACPTemplateAction.class.php b/wcfsetup/install/files/lib/data/acp/template/ACPTemplateAction.class.php
index 8dbf4f1138..c980c5a502 100644
--- a/wcfsetup/install/files/lib/data/acp/template/ACPTemplateAction.class.php
+++ b/wcfsetup/install/files/lib/data/acp/template/ACPTemplateAction.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\data\acp\template;
 use wcf\data\AbstractDatabaseObjectAction;
-use wcf\system\exception\ValidateActionException;
 use wcf\system\WCF;
+use wcf\system\exception\ValidateActionException;
 
 /**
  * Executes ACP templates-related actions.
diff --git a/wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php b/wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php
index 0ac33e1e1e..d8ed91d168 100644
--- a/wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php
+++ b/wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\data\cronjob;
 use wcf\data\DatabaseObject;
-use wcf\util\CronjobUtil;
 use wcf\system\WCF;
+use wcf\util\CronjobUtil;
 
 /**
  * Represents a cronjob.
diff --git a/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php b/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php
index 8ae0a12ebc..8ebf90ae6d 100644
--- a/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php
+++ b/wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php
@@ -2,8 +2,8 @@
 namespace wcf\data\cronjob;
 use wcf\data\AbstractDatabaseObjectAction;
 use wcf\data\cronjob\log\CronjobLogEditor;
-use wcf\system\exception\ValidateActionException;
 use wcf\system\WCF;
+use wcf\system\exception\ValidateActionException;
 use wcf\util\DateUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/data/cronjob/CronjobEditor.class.php b/wcfsetup/install/files/lib/data/cronjob/CronjobEditor.class.php
index b976c213c4..afb6a377ae 100644
--- a/wcfsetup/install/files/lib/data/cronjob/CronjobEditor.class.php
+++ b/wcfsetup/install/files/lib/data/cronjob/CronjobEditor.class.php
@@ -2,8 +2,8 @@
 namespace wcf\data\cronjob;
 use wcf\data\DatabaseObjectEditor;
 use wcf\data\IEditableCachedObject;
-use wcf\system\cache\CacheHandler;
 use wcf\system\WCF;
+use wcf\system\cache\CacheHandler;
 
 /**
  * Provides functions to edit cronjobs.
diff --git a/wcfsetup/install/files/lib/data/language/LanguageAction.class.php b/wcfsetup/install/files/lib/data/language/LanguageAction.class.php
index d533bdb8af..7ff5e5cd31 100644
--- a/wcfsetup/install/files/lib/data/language/LanguageAction.class.php
+++ b/wcfsetup/install/files/lib/data/language/LanguageAction.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\data\language;
 use wcf\data\AbstractDatabaseObjectAction;
+use wcf\system\WCF;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\exception\ValidateActionException;
-use wcf\system\WCF;
 
 /**
  * Executes language-related actions.
diff --git a/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php b/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php
index b024de5af0..bb9b013eb3 100644
--- a/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php
+++ b/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php
@@ -5,14 +5,14 @@ use wcf\data\language\category\LanguageCategory;
 use wcf\data\language\category\LanguageCategoryEditor;
 use wcf\data\language\item\LanguageItemEditor;
 use wcf\data\language\item\LanguageItemList;
+use wcf\system\Regex;
+use wcf\system\WCF;
 use wcf\system\cache\CacheHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\io\File;
 use wcf\system\language\LanguageFactory;
 use wcf\system\package\PackageDependencyHandler;
-use wcf\system\Regex;
-use wcf\system\WCF;
 use wcf\util\DirectoryUtil;
 use wcf\util\StringUtil;
 use wcf\util\XML;
diff --git a/wcfsetup/install/files/lib/data/language/category/LanguageCategoryAction.class.php b/wcfsetup/install/files/lib/data/language/category/LanguageCategoryAction.class.php
index e14299bbe3..2a7e970e9c 100644
--- a/wcfsetup/install/files/lib/data/language/category/LanguageCategoryAction.class.php
+++ b/wcfsetup/install/files/lib/data/language/category/LanguageCategoryAction.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\data\language\category;
 use wcf\data\AbstractDatabaseObjectAction;
-use wcf\system\exception\ValidateActionException;
 use wcf\system\WCF;
+use wcf\system\exception\ValidateActionException;
 
 /**
  * Executes language category-related actions.
diff --git a/wcfsetup/install/files/lib/data/language/item/LanguageItemAction.class.php b/wcfsetup/install/files/lib/data/language/item/LanguageItemAction.class.php
index 1db88232c1..7f824950aa 100644
--- a/wcfsetup/install/files/lib/data/language/item/LanguageItemAction.class.php
+++ b/wcfsetup/install/files/lib/data/language/item/LanguageItemAction.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\data\language\item;
 use wcf\data\AbstractDatabaseObjectAction;
-use wcf\system\exception\ValidateActionException;
 use wcf\system\WCF;
+use wcf\system\exception\ValidateActionException;
 
 /**
  * Executes language item-related actions.
diff --git a/wcfsetup/install/files/lib/data/object/type/ObjectTypeCache.class.php b/wcfsetup/install/files/lib/data/object/type/ObjectTypeCache.class.php
index c348ee3c48..20973b29df 100644
--- a/wcfsetup/install/files/lib/data/object/type/ObjectTypeCache.class.php
+++ b/wcfsetup/install/files/lib/data/object/type/ObjectTypeCache.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\data\object\type;
-use wcf\system\cache\CacheHandler;
 use wcf\system\SingletonFactory;
+use wcf\system\cache\CacheHandler;
 
 /**
  * Manages the object type cache.
diff --git a/wcfsetup/install/files/lib/data/option/Option.class.php b/wcfsetup/install/files/lib/data/option/Option.class.php
index 0620e69d9f..ea37df3f5e 100644
--- a/wcfsetup/install/files/lib/data/option/Option.class.php
+++ b/wcfsetup/install/files/lib/data/option/Option.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\data\option;
 use wcf\data\DatabaseObject;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\WCF;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/data/option/OptionAction.class.php b/wcfsetup/install/files/lib/data/option/OptionAction.class.php
index e53e2171e3..3ce7f53833 100644
--- a/wcfsetup/install/files/lib/data/option/OptionAction.class.php
+++ b/wcfsetup/install/files/lib/data/option/OptionAction.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\data\option;
 use wcf\data\AbstractDatabaseObjectAction;
-use wcf\system\exception\ValidateActionException;
 use wcf\system\WCF;
+use wcf\system\exception\ValidateActionException;
 
 /**
  * Executes option-related actions.
diff --git a/wcfsetup/install/files/lib/data/option/OptionEditor.class.php b/wcfsetup/install/files/lib/data/option/OptionEditor.class.php
index d40f81f69c..81752bcfc5 100644
--- a/wcfsetup/install/files/lib/data/option/OptionEditor.class.php
+++ b/wcfsetup/install/files/lib/data/option/OptionEditor.class.php
@@ -2,9 +2,9 @@
 namespace wcf\data\option;
 use wcf\data\DatabaseObjectEditor;
 use wcf\data\IEditableCachedObject;
+use wcf\system\WCF;
 use wcf\system\cache\CacheHandler;
 use wcf\system\io\File;
-use wcf\system\WCF;
 use wcf\util\FileUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/data/option/category/OptionCategoryAction.class.php b/wcfsetup/install/files/lib/data/option/category/OptionCategoryAction.class.php
index b45ad62283..58ead39855 100644
--- a/wcfsetup/install/files/lib/data/option/category/OptionCategoryAction.class.php
+++ b/wcfsetup/install/files/lib/data/option/category/OptionCategoryAction.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\data\option\category;
 use wcf\data\AbstractDatabaseObjectAction;
-use wcf\system\exception\ValidateActionException;
 use wcf\system\WCF;
+use wcf\system\exception\ValidateActionException;
 
 /**
  * Executes option categories-related actions.
diff --git a/wcfsetup/install/files/lib/data/package/Package.class.php b/wcfsetup/install/files/lib/data/package/Package.class.php
index e47df20aa2..05aec52f6f 100644
--- a/wcfsetup/install/files/lib/data/package/Package.class.php
+++ b/wcfsetup/install/files/lib/data/package/Package.class.php
@@ -1,11 +1,11 @@
 <?php
 namespace wcf\data\package;
 use wcf\data\DatabaseObject;
+use wcf\system\WCF;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\io\File;
 use wcf\system\package\PackageDependencyHandler;
-use wcf\system\WCF;
 use wcf\util\FileUtil;
 use wcf\util\StringUtil;
 
diff --git a/wcfsetup/install/files/lib/data/package/PackageCache.class.php b/wcfsetup/install/files/lib/data/package/PackageCache.class.php
index 3304a603fe..3b8af34749 100644
--- a/wcfsetup/install/files/lib/data/package/PackageCache.class.php
+++ b/wcfsetup/install/files/lib/data/package/PackageCache.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\data\package;
-use wcf\system\cache\CacheHandler;
 use wcf\system\SingletonFactory;
+use wcf\system\cache\CacheHandler;
 
 /**
  * Manages the package cache.
diff --git a/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueAction.class.php b/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueAction.class.php
index dd12193296..d7999a4e4a 100644
--- a/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueAction.class.php
+++ b/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueueAction.class.php
@@ -2,8 +2,8 @@
 namespace wcf\data\package\installation\queue;
 use wcf\data\AbstractDatabaseObjectAction;
 use wcf\data\package\Package;
-use wcf\system\exception\ValidateActionException;
 use wcf\system\WCF;
+use wcf\system\exception\ValidateActionException;
 
 /**
  * Executes package installation queue-related actions.
diff --git a/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServer.class.php b/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServer.class.php
index 7a20167996..e38003f048 100644
--- a/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServer.class.php
+++ b/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServer.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\data\package\update\server;
 use wcf\data\DatabaseObject;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\WCF;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
 
 /**
  * Contains business logic related to handling of package update servers.
diff --git a/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerAction.class.php b/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerAction.class.php
index cac5fa6a94..0f304b26d7 100644
--- a/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerAction.class.php
+++ b/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerAction.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\data\package\update\server;
 use wcf\data\AbstractDatabaseObjectAction;
-use wcf\system\exception\ValidateActionException;
 use wcf\system\WCF;
+use wcf\system\exception\ValidateActionException;
 
 /**
  * Executes package update server-related actions.
diff --git a/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItem.class.php b/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItem.class.php
index ffedc4ddf7..ca061ed812 100644
--- a/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItem.class.php
+++ b/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItem.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\data\page\menu\item;
 use wcf\data\ProcessibleDatabaseObject;
-use wcf\system\menu\page\DefaultPageMenuItemProvider;
 use wcf\system\menu\ITreeMenuItem;
+use wcf\system\menu\page\DefaultPageMenuItemProvider;
 use wcf\system\request\LinkHandler;
 
 /**
diff --git a/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemEditor.class.php b/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemEditor.class.php
index 298bdb7cf0..e7dda328cd 100644
--- a/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemEditor.class.php
+++ b/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItemEditor.class.php
@@ -2,8 +2,8 @@
 namespace wcf\data\page\menu\item;
 use wcf\data\DatabaseObjectEditor;
 use wcf\data\IEditableCachedObject;
-use wcf\system\cache\CacheHandler;
 use wcf\system\WCF;
+use wcf\system\cache\CacheHandler;
 
 /**
  * Provides functions to edit page menu items.
diff --git a/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php b/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php
index d1f16e093d..ae44844673 100644
--- a/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php
+++ b/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\data\style;
 use wcf\data\DatabaseObjectDecorator;
-use wcf\system\cache\CacheHandler;
 use wcf\system\WCF;
+use wcf\system\cache\CacheHandler;
 use wcf\util\FileUtil;
 use wcf\util\StringUtil;
 use wcf\util\StyleUtil;
diff --git a/wcfsetup/install/files/lib/data/style/StyleEditor.class.php b/wcfsetup/install/files/lib/data/style/StyleEditor.class.php
index bd3d58ca6b..c57b882966 100644
--- a/wcfsetup/install/files/lib/data/style/StyleEditor.class.php
+++ b/wcfsetup/install/files/lib/data/style/StyleEditor.class.php
@@ -1,17 +1,17 @@
 <?php
 namespace wcf\data\style;
-use wcf\data\template\group\TemplateGroup;
-use wcf\data\template\group\TemplateGroupEditor;
-use wcf\data\template\TemplateEditor;
 use wcf\data\DatabaseObjectEditor;
 use wcf\data\IEditableCachedObject;
+use wcf\data\template\TemplateEditor;
+use wcf\data\template\group\TemplateGroup;
+use wcf\data\template\group\TemplateGroupEditor;
+use wcf\system\WCF;
 use wcf\system\cache\CacheHandler;
 use wcf\system\exception\SystemException;
-use wcf\system\image\Thumbnail;
+use wcf\system\image\Thumbnail; // TODO: Undefined class Thumbnail
 use wcf\system\io\File;
 use wcf\system\io\Tar;
 use wcf\system\io\TarWriter;
-use wcf\system\WCF;
 use wcf\util\FileUtil;
 use wcf\util\StringUtil;
 use wcf\util\StyleUtil;
diff --git a/wcfsetup/install/files/lib/data/template/Template.class.php b/wcfsetup/install/files/lib/data/template/Template.class.php
index 7850c238d2..5751b1e7dd 100644
--- a/wcfsetup/install/files/lib/data/template/Template.class.php
+++ b/wcfsetup/install/files/lib/data/template/Template.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\data\template;
 use wcf\data\DatabaseObject;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\WCF;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\util\FileUtil;
 use wcf\util\StringUtil;
 
diff --git a/wcfsetup/install/files/lib/data/template/TemplateAction.class.php b/wcfsetup/install/files/lib/data/template/TemplateAction.class.php
index 6e345cb4ce..922fd363df 100644
--- a/wcfsetup/install/files/lib/data/template/TemplateAction.class.php
+++ b/wcfsetup/install/files/lib/data/template/TemplateAction.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\data\template;
 use wcf\data\AbstractDatabaseObjectAction;
-use wcf\system\exception\ValidateActionException;
 use wcf\system\WCF;
+use wcf\system\exception\ValidateActionException;
 
 /**
  * Executes template-related actions.
diff --git a/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php b/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php
index c9f6efd7e3..ca70ac1903 100644
--- a/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php
+++ b/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\data\template;
 use wcf\data\DatabaseObjectEditor;
-use wcf\system\io\File;
 use wcf\system\Regex;
 use wcf\system\WCF;
+use wcf\system\io\File;
 use wcf\util\DirectoryUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/data/template/group/TemplateGroupAction.class.php b/wcfsetup/install/files/lib/data/template/group/TemplateGroupAction.class.php
index c0cc9ccfed..3e551f8b1d 100644
--- a/wcfsetup/install/files/lib/data/template/group/TemplateGroupAction.class.php
+++ b/wcfsetup/install/files/lib/data/template/group/TemplateGroupAction.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\data\template\group;
 use wcf\data\AbstractDatabaseObjectAction;
-use wcf\system\exception\ValidateActionException;
 use wcf\system\WCF;
+use wcf\system\exception\ValidateActionException;
 
 /**
  * Executes template group-related actions.
diff --git a/wcfsetup/install/files/lib/data/template/group/TemplateGroupEditor.class.php b/wcfsetup/install/files/lib/data/template/group/TemplateGroupEditor.class.php
index d30c7864a4..f101610a5d 100644
--- a/wcfsetup/install/files/lib/data/template/group/TemplateGroupEditor.class.php
+++ b/wcfsetup/install/files/lib/data/template/group/TemplateGroupEditor.class.php
@@ -2,8 +2,8 @@
 namespace wcf\data\template\group;
 use wcf\data\DatabaseObjectEditor;
 use wcf\system\WCF;
-use wcf\util\FileUtil;
 use wcf\util\DirectoryUtil;
+use wcf\util\FileUtil;
 
 /**
  * TemplateGroupEditor provides functions to create, edit or delete template group. 
diff --git a/wcfsetup/install/files/lib/data/user/User.class.php b/wcfsetup/install/files/lib/data/user/User.class.php
index 48b570274d..30193c03fa 100644
--- a/wcfsetup/install/files/lib/data/user/User.class.php
+++ b/wcfsetup/install/files/lib/data/user/User.class.php
@@ -1,12 +1,12 @@
 <?php
 namespace wcf\data\user;
 use wcf\data\DatabaseObject;
-use wcf\data\user\group\UserGroup;
 use wcf\data\user\UserList;
+use wcf\data\user\group\UserGroup;
+use wcf\system\WCF;
 use wcf\system\cache\CacheHandler;
 use wcf\system\request\IRouteController;
 use wcf\system\user\storage\UserStorageHandler;
-use wcf\system\WCF;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/data/user/UserAction.class.php b/wcfsetup/install/files/lib/data/user/UserAction.class.php
index 52e6ad9480..fbf28138e6 100644
--- a/wcfsetup/install/files/lib/data/user/UserAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/UserAction.class.php
@@ -2,9 +2,9 @@
 namespace wcf\data\user;
 use wcf\data\AbstractDatabaseObjectAction;
 use wcf\data\user\group\UserGroup;
+use wcf\system\WCF;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\ValidateActionException;
-use wcf\system\WCF;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php
index feebfd5e8c..21e0735901 100644
--- a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php
+++ b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php
@@ -1,10 +1,10 @@
 <?php
 namespace wcf\data\user\group;
 use wcf\data\DatabaseObject;
+use wcf\system\WCF;
 use wcf\system\cache\CacheHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
-use wcf\system\WCF;
 
 /**
  * Represents a user group.
diff --git a/wcfsetup/install/files/lib/data/user/group/UserGroupEditor.class.php b/wcfsetup/install/files/lib/data/user/group/UserGroupEditor.class.php
index a56b6b06f6..9450c19c6c 100644
--- a/wcfsetup/install/files/lib/data/user/group/UserGroupEditor.class.php
+++ b/wcfsetup/install/files/lib/data/user/group/UserGroupEditor.class.php
@@ -3,10 +3,10 @@ namespace wcf\data\user\group;
 use wcf\data\DatabaseObjectEditor;
 use wcf\data\IEditableCachedObject;
 use wcf\data\acp\session\ACPSession;
+use wcf\system\WCF;
 use wcf\system\cache\CacheHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\session\SessionHandler;
-use wcf\system\WCF;
 
 /**
  * Provides functions to edit user groups.
diff --git a/wcfsetup/install/files/lib/data/user/option/UserOption.class.php b/wcfsetup/install/files/lib/data/user/option/UserOption.class.php
index 306857a716..0e03471215 100644
--- a/wcfsetup/install/files/lib/data/user/option/UserOption.class.php
+++ b/wcfsetup/install/files/lib/data/user/option/UserOption.class.php
@@ -2,8 +2,8 @@
 namespace wcf\data\user\option;
 use wcf\data\option\Option;
 use wcf\data\user\User;
-use wcf\system\option\user\IUserOptionOutput;
 use wcf\system\WCF;
+use wcf\system\option\user\IUserOptionOutput;
 
 /**
  * Represents a user option.
diff --git a/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php b/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php
index fa1cfab972..520bb7ae71 100644
--- a/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php
+++ b/wcfsetup/install/files/lib/data/user/option/ViewableUserOption.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\data\user\option;
-use wcf\data\user\User;
 use wcf\data\DatabaseObjectDecorator;
+use wcf\data\user\User;
 use wcf\system\exception\SystemException;
 use wcf\system\option\user\IUserOptionOutputContactInformation;
 use wcf\util\ClassUtil;
diff --git a/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryList.class.php b/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryList.class.php
index 9cde6ca480..f9e40ea224 100644
--- a/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryList.class.php
+++ b/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategoryList.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\data\user\option\category;
 use wcf\data\DatabaseObjectList;
-use wcf\system\database\util\ConditionBuilder;
 use wcf\system\WCF;
+use wcf\system\database\util\ConditionBuilder;
 
 /**
  * Represents an list of user option categories.
diff --git a/wcfsetup/install/files/lib/form/AbstractSecureForm.class.php b/wcfsetup/install/files/lib/form/AbstractSecureForm.class.php
index d1260645d7..7b18b8e4be 100644
--- a/wcfsetup/install/files/lib/form/AbstractSecureForm.class.php
+++ b/wcfsetup/install/files/lib/form/AbstractSecureForm.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\form;
-use wcf\system\exception\IllegalLinkException;
 use wcf\system\WCF;
+use wcf\system\exception\IllegalLinkException;
 
 /**
  * Extends AbstractForm by a function to validate a given security token.
diff --git a/wcfsetup/install/files/lib/page/AbstractPage.class.php b/wcfsetup/install/files/lib/page/AbstractPage.class.php
index 0681049295..f957b340bd 100644
--- a/wcfsetup/install/files/lib/page/AbstractPage.class.php
+++ b/wcfsetup/install/files/lib/page/AbstractPage.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\page;
+use wcf\system\WCF;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\IllegalLinkException;
-use wcf\system\WCF;
 
 /**
  * This class provides default implementations for the Page interface.
diff --git a/wcfsetup/install/files/lib/page/AbstractSecurePage.class.php b/wcfsetup/install/files/lib/page/AbstractSecurePage.class.php
index ae3fd7658b..3939220d97 100644
--- a/wcfsetup/install/files/lib/page/AbstractSecurePage.class.php
+++ b/wcfsetup/install/files/lib/page/AbstractSecurePage.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\page;
-use wcf\system\exception\IllegalLinkException;
 use wcf\system\WCF;
+use wcf\system\exception\IllegalLinkException;
 
 /**
  * Extends AbstractPage by a function to validate a given security token.
diff --git a/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php b/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php
index 42656d01af..436695dfd2 100644
--- a/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php
+++ b/wcfsetup/install/files/lib/page/MultipleLinkPage.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\page;
+use wcf\system\WCF;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\SystemException;
-use wcf\system\WCF;
 use wcf\util\ClassUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index a5dd3b07f2..3339bee02b 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -6,13 +6,13 @@ use wcf\data\package\PackageCache;
 use wcf\system\application\ApplicationHandler;
 use wcf\system\cache\CacheHandler;
 use wcf\system\database\statement\PreparedStatement;
+use wcf\system\exception;
 use wcf\system\language\LanguageFactory;
 use wcf\system\package\PackageInstallationDispatcher;
 use wcf\system\session\SessionFactory;
 use wcf\system\session\SessionHandler;
 use wcf\system\template\TemplateEngine;
 use wcf\system\user\storage\UserStorageHandler;
-use wcf\system\exception;
 use wcf\util;
 
 // try to disable execution time limit
diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php
index e2bdfcde97..604deccfb7 100644
--- a/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@ -5,6 +5,8 @@ use wcf\data\language\SetupLanguage;
 use wcf\data\package\installation\queue\PackageInstallationQueueEditor;
 use wcf\data\user\User;
 use wcf\data\user\UserAction;
+use wcf\system\Regex;
+use wcf\system\WCF;
 use wcf\system\cache\CacheHandler;
 use wcf\system\database\util\SQLParser;
 use wcf\system\exception\SystemException;
@@ -13,12 +15,10 @@ use wcf\system\io\File;
 use wcf\system\io\Tar;
 use wcf\system\language\LanguageFactory;
 use wcf\system\package\PackageArchive;
-use wcf\system\Regex;
 use wcf\system\session\ACPSessionFactory;
 use wcf\system\session\SessionHandler;
 use wcf\system\setup\Installer;
 use wcf\system\template\SetupTemplateEngine;
-use wcf\system\WCF;
 use wcf\util\DirectoryUtil;
 use wcf\util\FileUtil;
 use wcf\util\StringUtil;
diff --git a/wcfsetup/install/files/lib/system/application/AbstractApplication.class.php b/wcfsetup/install/files/lib/system/application/AbstractApplication.class.php
index 39ab8510fd..7c6448caab 100644
--- a/wcfsetup/install/files/lib/system/application/AbstractApplication.class.php
+++ b/wcfsetup/install/files/lib/system/application/AbstractApplication.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\application;
-use wcf\system\cache\CacheHandler;
 use wcf\system\WCF;
+use wcf\system\cache\CacheHandler;
 
 /**
  * Default implementation for all applications for the community framework.
diff --git a/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php b/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php
index a548e67ab7..2d5a620e67 100644
--- a/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php
+++ b/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\application;
-use wcf\system\cache\CacheHandler;
 use wcf\system\SingletonFactory;
+use wcf\system\cache\CacheHandler;
 
 /**
  * Handles multi-application environments.
diff --git a/wcfsetup/install/files/lib/system/cache/CacheHandler.class.php b/wcfsetup/install/files/lib/system/cache/CacheHandler.class.php
index 4cba243a56..fc50833412 100644
--- a/wcfsetup/install/files/lib/system/cache/CacheHandler.class.php
+++ b/wcfsetup/install/files/lib/system/cache/CacheHandler.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\cache;
-use wcf\system\exception\SystemException;
 use wcf\system\SingletonFactory;
+use wcf\system\exception\SystemException;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php
index b3b6bf648a..352fdbdf2e 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/ACPMenuCacheBuilder.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\cache\builder;
 use wcf\data\acp\menu\item\ACPMenuItem;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\WCF;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
 
 /**
  * Caches the acp menu items tree.
diff --git a/wcfsetup/install/files/lib/system/cache/builder/ApplicationCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/ApplicationCacheBuilder.class.php
index d0c00d6673..39dc7c7c75 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/ApplicationCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/ApplicationCacheBuilder.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\cache\builder;
-use wcf\data\application\group\ApplicationGroup;
 use wcf\data\application;
+use wcf\data\application\group\ApplicationGroup;
 use wcf\data\package\Package;
 use wcf\data\package\PackageList;
 use wcf\system\WCF;
diff --git a/wcfsetup/install/files/lib/system/cache/builder/ClipboardPageCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/ClipboardPageCacheBuilder.class.php
index 1d752fad3f..1247ad0453 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/ClipboardPageCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/ClipboardPageCacheBuilder.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\cache\builder;
+use wcf\system\WCF;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\package\PackageDependencyHandler;
-use wcf\system\WCF;
 
 /**
  * Caches clipboard pages.
diff --git a/wcfsetup/install/files/lib/system/cache/builder/CronjobCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/CronjobCacheBuilder.class.php
index b2ed6e7f01..bb391ad59f 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/CronjobCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/CronjobCacheBuilder.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\cache\builder;
+use wcf\system\WCF;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\package\PackageDependencyHandler;
-use wcf\system\WCF;
 
 /**
  * Caches cronjob information.
diff --git a/wcfsetup/install/files/lib/system/cache/builder/EventListenerCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/EventListenerCacheBuilder.class.php
index b7d5bef013..51f48545da 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/EventListenerCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/EventListenerCacheBuilder.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\cache\builder;
-use wcf\system\event\EventHandler;
 use wcf\system\WCF;
+use wcf\system\event\EventHandler;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/cache/builder/IconCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/IconCacheBuilder.class.php
index 61da89bfba..c2e4d88238 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/IconCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/IconCacheBuilder.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\cache\builder;
 use wcf\data\package\Package;
+use wcf\system\WCF;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\package\PackageDependencyHandler;
-use wcf\system\WCF;
 use wcf\util\FileUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/cache/builder/LanguageCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/LanguageCacheBuilder.class.php
index 22044f981d..6ce0d0be8f 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/LanguageCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/LanguageCacheBuilder.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\cache\builder;
-use wcf\data\language\category\LanguageCategoryList;
 use wcf\data\language\LanguageList;
+use wcf\data\language\category\LanguageCategoryList;
 use wcf\system\WCF;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/cache/builder/OptionCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/OptionCacheBuilder.class.php
index 52ebce81cb..b6dea38d13 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/OptionCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/OptionCacheBuilder.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\cache\builder;
-use wcf\data\option\category\OptionCategory;
 use wcf\data\option\Option;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\data\option\category\OptionCategory;
 use wcf\system\WCF;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
 
 /**
  * Caches the options and option categories
diff --git a/wcfsetup/install/files/lib/system/cache/builder/PageMenuCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/PageMenuCacheBuilder.class.php
index ad997fb6fe..4a0605e752 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/PageMenuCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/PageMenuCacheBuilder.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\cache\builder;
 use wcf\data\page\menu\item\PageMenuItem;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\WCF;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
 
 /**
  * Caches the page menu items.
diff --git a/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php
index 5363177a4c..a57a266d2a 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\cache\builder;
+use wcf\system\WCF;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
-use wcf\system\WCF;
 use wcf\util\ClassUtil;
 use wcf\util\StringUtil;
 
diff --git a/wcfsetup/install/files/lib/system/cache/source/DiskCacheSource.class.php b/wcfsetup/install/files/lib/system/cache/source/DiskCacheSource.class.php
index 49cc2eff02..30aa14003b 100644
--- a/wcfsetup/install/files/lib/system/cache/source/DiskCacheSource.class.php
+++ b/wcfsetup/install/files/lib/system/cache/source/DiskCacheSource.class.php
@@ -1,12 +1,12 @@
 <?php
 namespace wcf\system\cache\source;
-use wcf\system\exception\SystemException;
-use wcf\system\io\File;
 use wcf\system\Callback;
 use wcf\system\Regex;
 use wcf\system\WCF;
-use wcf\util\FileUtil;
+use wcf\system\exception\SystemException;
+use wcf\system\io\File;
 use wcf\util\DirectoryUtil;
+use wcf\util\FileUtil;
 
 /**
  * DiskCacheSource is an implementation of CacheSource that stores the cache as simple files in the file system.
diff --git a/wcfsetup/install/files/lib/system/cache/source/MemcacheAdapter.class.php b/wcfsetup/install/files/lib/system/cache/source/MemcacheAdapter.class.php
index 3ef59bf571..6f4b38c10a 100644
--- a/wcfsetup/install/files/lib/system/cache/source/MemcacheAdapter.class.php
+++ b/wcfsetup/install/files/lib/system/cache/source/MemcacheAdapter.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\cache\source;
-use wcf\system\exception\SystemException;
 use wcf\system\SingletonFactory;
+use wcf\system\exception\SystemException;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/cleanup/CleanupHandler.class.php b/wcfsetup/install/files/lib/system/cleanup/CleanupHandler.class.php
index 8d88ad3b5b..ae8908c018 100644
--- a/wcfsetup/install/files/lib/system/cleanup/CleanupHandler.class.php
+++ b/wcfsetup/install/files/lib/system/cleanup/CleanupHandler.class.php
@@ -1,10 +1,10 @@
 <?php
 namespace wcf\system\cleanup;
+use wcf\system\WCF;
 use wcf\system\cache\CacheHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\SystemException;
-use wcf\system\WCF;
 use wcf\util\ArrayUtil;
 use wcf\util\ClassUtil;
 
diff --git a/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php b/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php
index 0d0283cc51..3a7378c3ba 100644
--- a/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php
+++ b/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php
@@ -1,11 +1,11 @@
 <?php
 namespace wcf\system\clipboard;
 use wcf\data\object\type\ObjectTypeCache;
+use wcf\system\SingletonFactory;
+use wcf\system\WCF;
 use wcf\system\cache\CacheHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
-use wcf\system\SingletonFactory;
-use wcf\system\WCF;
 use wcf\util\ClassUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php b/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php
index 54f3e668f0..004b62b970 100644
--- a/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php
+++ b/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php
@@ -1,10 +1,10 @@
 <?php
 namespace wcf\system\clipboard\action;
 use wcf\data\user\group\UserGroup;
+use wcf\system\WCF;
 use wcf\system\clipboard\ClipboardEditorItem;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
-use wcf\system\WCF;
 
 /**
  * Prepares clipboard editor items for user objects.
diff --git a/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php b/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php
index 02bd6ebd98..e2f69d22fa 100644
--- a/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php
@@ -1,14 +1,14 @@
 <?php
 namespace wcf\system\cronjob;
-use wcf\data\cronjob\log\CronjobLogEditor;
 use wcf\data\cronjob\Cronjob;
 use wcf\data\cronjob\CronjobEditor;
+use wcf\data\cronjob\log\CronjobLogEditor;
+use wcf\system\SingletonFactory;
+use wcf\system\WCF;
 use wcf\system\cache\CacheHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\package\PackageDependencyHandler;
-use wcf\system\SingletonFactory;
-use wcf\system\WCF;
 use wcf\util\ClassUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/cronjob/GetUpdateInfoCronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/GetUpdateInfoCronjob.class.php
index 564ccebb78..c8b4459123 100644
--- a/wcfsetup/install/files/lib/system/cronjob/GetUpdateInfoCronjob.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/GetUpdateInfoCronjob.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\cronjob;
-use wcf\acp\package\update\PackageUpdate;
 use wcf\data\cronjob\Cronjob;
+use wcf\data\package\update\PackageUpdate;
 
 /**
  * Gets update package information.
diff --git a/wcfsetup/install/files/lib/system/cronjob/RefreshSearchRobotsCronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/RefreshSearchRobotsCronjob.class.php
index 727feadda7..7255e14215 100644
--- a/wcfsetup/install/files/lib/system/cronjob/RefreshSearchRobotsCronjob.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/RefreshSearchRobotsCronjob.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\cronjob;
 use wcf\data\cronjob\Cronjob;
-use wcf\system\cache\CacheHandler;
 use wcf\system\WCF;
+use wcf\system\cache\CacheHandler;
 use wcf\util\FileUtil;
 use wcf\util\StringUtil;
 use wcf\util\XML;
diff --git a/wcfsetup/install/files/lib/system/database/Database.class.php b/wcfsetup/install/files/lib/system/database/Database.class.php
index e5fc098217..7d77deafcd 100644
--- a/wcfsetup/install/files/lib/system/database/Database.class.php
+++ b/wcfsetup/install/files/lib/system/database/Database.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\database;
-use wcf\system\database\statement\PreparedStatement;
 use wcf\data\DatabaseObject;
-use wcf\system\SystemException;
+use wcf\system\database\statement\PreparedStatement;
+
 
 /**
  * This is an abstract implementation of a database access class using PDO.
diff --git a/wcfsetup/install/files/lib/system/database/editor/MySQLDatabaseEditor.class.php b/wcfsetup/install/files/lib/system/database/editor/MySQLDatabaseEditor.class.php
index 8412c657e4..7fbe534979 100644
--- a/wcfsetup/install/files/lib/system/database/editor/MySQLDatabaseEditor.class.php
+++ b/wcfsetup/install/files/lib/system/database/editor/MySQLDatabaseEditor.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\database\editor;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\database\Database;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
 
 /**
  * This is the database editor implementation for MySQL4.1 or higher.
diff --git a/wcfsetup/install/files/lib/system/database/statement/PreparedStatement.class.php b/wcfsetup/install/files/lib/system/database/statement/PreparedStatement.class.php
index 13be986ea6..07ac7a6dc1 100644
--- a/wcfsetup/install/files/lib/system/database/statement/PreparedStatement.class.php
+++ b/wcfsetup/install/files/lib/system/database/statement/PreparedStatement.class.php
@@ -1,11 +1,11 @@
 <?php
 namespace wcf\system\database\statement;
 use wcf\data\DatabaseObject;
+use wcf\system\WCF;
 use wcf\system\benchmark\Benchmark;
 use wcf\system\database\Database;
 use wcf\system\database\DatabaseException;
 use wcf\system\exception\SystemException;
-use wcf\system\WCF;
 
 /**
  * This is an implementation of prepared statements based upon pdo statements.
diff --git a/wcfsetup/install/files/lib/system/database/util/SQLParser.class.php b/wcfsetup/install/files/lib/system/database/util/SQLParser.class.php
index ffaa048d57..da85df7c54 100644
--- a/wcfsetup/install/files/lib/system/database/util/SQLParser.class.php
+++ b/wcfsetup/install/files/lib/system/database/util/SQLParser.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\database\util;
-use wcf\system\exception\SystemException;
 use wcf\system\WCF;
+use wcf\system\exception\SystemException;
 use wcf\util\ArrayUtil;
 use wcf\util\StringUtil;
 
diff --git a/wcfsetup/install/files/lib/system/event/EventHandler.class.php b/wcfsetup/install/files/lib/system/event/EventHandler.class.php
index f4e2d02929..1d19f91918 100644
--- a/wcfsetup/install/files/lib/system/event/EventHandler.class.php
+++ b/wcfsetup/install/files/lib/system/event/EventHandler.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\event;
+use wcf\system\SingletonFactory;
 use wcf\system\cache\CacheHandler;
 use wcf\system\exception\SystemException;
-use wcf\system\SingletonFactory;
 use wcf\util\ClassUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/event/IEventListener.class.php b/wcfsetup/install/files/lib/system/event/IEventListener.class.php
index ef8e36027a..12581bb71d 100644
--- a/wcfsetup/install/files/lib/system/event/IEventListener.class.php
+++ b/wcfsetup/install/files/lib/system/event/IEventListener.class.php
@@ -1,6 +1,5 @@
 <?php
 namespace wcf\system\event;
-use wcf\data\DatabaseObjectProcessor;
 
 /**
  * EventListeners can be registered for a specific event in many controller objects.
diff --git a/wcfsetup/install/files/lib/system/event/listener/SessionAccessLogListener.class.php b/wcfsetup/install/files/lib/system/event/listener/SessionAccessLogListener.class.php
index 87d740d98c..9c3ceec73d 100644
--- a/wcfsetup/install/files/lib/system/event/listener/SessionAccessLogListener.class.php
+++ b/wcfsetup/install/files/lib/system/event/listener/SessionAccessLogListener.class.php
@@ -3,8 +3,8 @@ namespace wcf\system\event\listener;
 use wcf\data\acp\session\access\log\ACPSessionAccessLogEditor;
 use wcf\data\acp\session\log\ACPSessionLog;
 use wcf\data\acp\session\log\ACPSessionLogEditor;
-use wcf\system\event\IEventListener;
 use wcf\system\WCF;
+use wcf\system\event\IEventListener;
 
 /**
  * Creates the session access log.
diff --git a/wcfsetup/install/files/lib/system/image/ImageHandler.class.php b/wcfsetup/install/files/lib/system/image/ImageHandler.class.php
index f45998a9f2..54077d14fd 100644
--- a/wcfsetup/install/files/lib/system/image/ImageHandler.class.php
+++ b/wcfsetup/install/files/lib/system/image/ImageHandler.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\image;
+use wcf\system\SingletonFactory;
 use wcf\system\exception\SystemException;
 use wcf\system\image\adapter\ImageAdapter;
-use wcf\system\SingletonFactory;
 
 /**
  * Handler for all available image adapters.
diff --git a/wcfsetup/install/files/lib/system/language/I18nHandler.class.php b/wcfsetup/install/files/lib/system/language/I18nHandler.class.php
index 1699e24d45..7dd384bfce 100644
--- a/wcfsetup/install/files/lib/system/language/I18nHandler.class.php
+++ b/wcfsetup/install/files/lib/system/language/I18nHandler.class.php
@@ -1,10 +1,10 @@
 <?php
 namespace wcf\system\language;
+use wcf\system\SingletonFactory;
+use wcf\system\WCF;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\language\LanguageFactory;
-use wcf\system\SingletonFactory;
-use wcf\system\WCF;
 
 /**
  * Provides internationalization support for input fields.
diff --git a/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php b/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php
index aa1053f607..2d38792fad 100644
--- a/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php
+++ b/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php
@@ -1,12 +1,12 @@
 <?php
 namespace wcf\system\language;
+use wcf\data\DatabaseObject;
 use wcf\data\language\Language;
 use wcf\data\language\LanguageEditor;
-use wcf\data\DatabaseObject;
-use wcf\system\cache\CacheHandler;
-use wcf\system\template\TemplateScriptingCompiler;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
+use wcf\system\cache\CacheHandler;
+use wcf\system\template\TemplateScriptingCompiler;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/language/LanguageServerProcessor.class.php b/wcfsetup/install/files/lib/system/language/LanguageServerProcessor.class.php
index 1b7957628c..474f1fdfaa 100644
--- a/wcfsetup/install/files/lib/system/language/LanguageServerProcessor.class.php
+++ b/wcfsetup/install/files/lib/system/language/LanguageServerProcessor.class.php
@@ -1,11 +1,11 @@
 <?php
 namespace wcf\system\language;
 use wcf\data\language\Language;
+use wcf\system\SingletonFactory;
+use wcf\system\WCF;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\io\RemoteFile;
-use wcf\system\SingletonFactory;
-use wcf\system\WCF;
 use wcf\util\FileUtil;
 use wcf\util\XML;
 
diff --git a/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php b/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php
index 1bf0889faf..d19d1bccea 100644
--- a/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php
+++ b/wcfsetup/install/files/lib/system/menu/TreeMenu.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\menu;
-use wcf\system\event\EventHandler;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
+use wcf\system\event\EventHandler;
 use wcf\util\FileUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/menu/acp/ACPMenu.class.php b/wcfsetup/install/files/lib/system/menu/acp/ACPMenu.class.php
index 34eb9aa6ca..1a837f8d30 100644
--- a/wcfsetup/install/files/lib/system/menu/acp/ACPMenu.class.php
+++ b/wcfsetup/install/files/lib/system/menu/acp/ACPMenu.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\menu\acp;
-use wcf\system\menu\TreeMenu;
 use wcf\system\cache\CacheHandler;
+use wcf\system\menu\TreeMenu;
 
 /**
  * Builds the acp menu.
diff --git a/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php b/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php
index bf3f98b2d3..89ea80b854 100644
--- a/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php
+++ b/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php
@@ -1,10 +1,10 @@
 <?php
 namespace wcf\system\menu\page;
 use wcf\data\page\menu\item\PageMenuItem;
+use wcf\system\cache\CacheHandler;
 use wcf\system\event\EventHandler;
-use wcf\system\menu\TreeMenu;
 use wcf\system\menu\ITreeMenuItem;
-use wcf\system\cache\CacheHandler;
+use wcf\system\menu\TreeMenu;
 
 /**
  * Builds the page menu.
diff --git a/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php b/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php
index a1b6fbf63c..f7688f7020 100644
--- a/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/BooleanOptionType.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\option;
 use wcf\data\option\Option;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\WCF;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/option/DateOptionType.class.php b/wcfsetup/install/files/lib/system/option/DateOptionType.class.php
index f2c74af01d..d18dd5fc71 100644
--- a/wcfsetup/install/files/lib/system/option/DateOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/DateOptionType.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\option;
 use wcf\data\option\Option;
-use wcf\system\exception\UserInputException;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\exception\UserInputException;
 
 /**
  * DateOptionType is an implementation of IOptionType for date inputs.
diff --git a/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php b/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php
index af3f05efc8..346f371f6f 100644
--- a/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\option;
 use wcf\data\option\Option;
+use wcf\system\WCF;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\UserInputException;
-use wcf\system\WCF;
 use wcf\util\ArrayUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/option/OptionHandler.class.php b/wcfsetup/install/files/lib/system/option/OptionHandler.class.php
index 89c8dcb2ee..be279f47a4 100644
--- a/wcfsetup/install/files/lib/system/option/OptionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/option/OptionHandler.class.php
@@ -1,12 +1,12 @@
 <?php
 namespace wcf\system\option;
-use wcf\data\option\category\OptionCategory;
 use wcf\data\option\Option;
+use wcf\data\option\category\OptionCategory;
+use wcf\system\WCF;
 use wcf\system\cache\CacheHandler;
 use wcf\system\exception\SystemException;
 use wcf\system\exception\UserInputException;
 use wcf\system\language\I18nHandler;
-use wcf\system\WCF;
 use wcf\util\ClassUtil;
 use wcf\util\StringUtil;
 
diff --git a/wcfsetup/install/files/lib/system/option/RadioButtonOptionType.class.php b/wcfsetup/install/files/lib/system/option/RadioButtonOptionType.class.php
index 4ee71c2097..d9acd088dc 100644
--- a/wcfsetup/install/files/lib/system/option/RadioButtonOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/RadioButtonOptionType.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\option;
 use wcf\data\option\Option;
+use wcf\system\WCF;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\UserInputException;
-use wcf\system\WCF;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/option/TextI18nOptionType.class.php b/wcfsetup/install/files/lib/system/option/TextI18nOptionType.class.php
index dee53c4c8c..ecf69fd37a 100644
--- a/wcfsetup/install/files/lib/system/option/TextI18nOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/TextI18nOptionType.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\option;
 use wcf\data\option\Option;
+use wcf\system\WCF;
 use wcf\system\exception\UserInputException;
 use wcf\system\language\I18nHandler;
-use wcf\system\WCF;
 
 /**
  * TextI18nOptionType is an implementation of IOptionType for 'input type="text"' tags with i18n support.
diff --git a/wcfsetup/install/files/lib/system/option/TextOptionType.class.php b/wcfsetup/install/files/lib/system/option/TextOptionType.class.php
index 05245fe0c0..7d55d5c0e5 100644
--- a/wcfsetup/install/files/lib/system/option/TextOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/TextOptionType.class.php
@@ -1,10 +1,8 @@
 <?php
 namespace wcf\system\option;
 use wcf\data\option\Option;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\option\OptionType;
-use wcf\system\option\SearchableUserOption;
 use wcf\system\WCF;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/option/TextareaI18nOptionType.class.php b/wcfsetup/install/files/lib/system/option/TextareaI18nOptionType.class.php
index 50eb0a9abb..94b0bd2066 100644
--- a/wcfsetup/install/files/lib/system/option/TextareaI18nOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/TextareaI18nOptionType.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\option;
 use wcf\data\option\Option;
+use wcf\system\WCF;
 use wcf\system\exception\UserInputException;
 use wcf\system\language\I18nHandler;
-use wcf\system\WCF;
 
 /**
  * TextareaI18nOptionType is an implementation of IOptionType for 'textarea' tags with i18n support.
diff --git a/wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php b/wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php
index 3885f09ee3..9c1013db29 100644
--- a/wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/TimezoneOptionType.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\option;
 use wcf\data\option\Option;
-use wcf\system\exception\UserInputException;
 use wcf\system\WCF;
+use wcf\system\exception\UserInputException;
 use wcf\util\DateUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/option/user/IUserOptionOutput.class.php b/wcfsetup/install/files/lib/system/option/user/IUserOptionOutput.class.php
index 0df3d17552..e360397b0e 100644
--- a/wcfsetup/install/files/lib/system/option/user/IUserOptionOutput.class.php
+++ b/wcfsetup/install/files/lib/system/option/user/IUserOptionOutput.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\option\user;
-use wcf\data\user\option\UserOption;
 use wcf\data\user\User;
+use wcf\data\user\option\UserOption;
 
 /**
  * Any user option output class should implement this interface.
diff --git a/wcfsetup/install/files/lib/system/option/user/IUserOptionOutputContactInformation.class.php b/wcfsetup/install/files/lib/system/option/user/IUserOptionOutputContactInformation.class.php
index 419c6958e4..d08f5d15d4 100644
--- a/wcfsetup/install/files/lib/system/option/user/IUserOptionOutputContactInformation.class.php
+++ b/wcfsetup/install/files/lib/system/option/user/IUserOptionOutputContactInformation.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\option\user;
-use wcf\data\user\option\UserOption;
 use wcf\data\user\User;
+use wcf\data\user\option\UserOption;
 
 /**
  * Any user option output class should implement this interface.
diff --git a/wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php b/wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php
index bdff954d88..c3c2fba087 100644
--- a/wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/option/user/UserOptionHandler.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\option\user;
-use wcf\data\option\category\OptionCategory;
 use wcf\data\option\Option;
-use wcf\data\user\option\ViewableUserOption;
+use wcf\data\option\category\OptionCategory;
 use wcf\data\user\User;
+use wcf\data\user\option\ViewableUserOption;
 use wcf\system\exception\UserInputException;
 use wcf\system\option\OptionHandler;
 
diff --git a/wcfsetup/install/files/lib/system/package/ACPTemplatesFileHandler.class.php b/wcfsetup/install/files/lib/system/package/ACPTemplatesFileHandler.class.php
index 09573f9cb8..baef14a9ef 100644
--- a/wcfsetup/install/files/lib/system/package/ACPTemplatesFileHandler.class.php
+++ b/wcfsetup/install/files/lib/system/package/ACPTemplatesFileHandler.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\package;
 use wcf\data\package\Package;
+use wcf\system\WCF;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
-use wcf\system\WCF;
 
 /**
  * ACPTemplatesFileHandler is a FileHandler implementation for the installation of ACP-template files.
diff --git a/wcfsetup/install/files/lib/system/package/FilesFileHandler.class.php b/wcfsetup/install/files/lib/system/package/FilesFileHandler.class.php
index 20e602049f..24106fe18e 100644
--- a/wcfsetup/install/files/lib/system/package/FilesFileHandler.class.php
+++ b/wcfsetup/install/files/lib/system/package/FilesFileHandler.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\package;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\WCF;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
 
 /**
  * FilesFileHandler is a FileHandler implementation for the installation of regular files.
diff --git a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php
index f2b705c549..b4e66d2661 100644
--- a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php
@@ -1,10 +1,10 @@
 <?php
 namespace wcf\system\package;
 use wcf\data\package\Package;
+use wcf\system\WCF;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\io\Tar;
-use wcf\system\WCF;
 use wcf\util\FileUtil;
 use wcf\util\StringUtil;
 use wcf\util\XML;
diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
index c6841e0b22..2ea49e667a 100644
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
@@ -1,23 +1,23 @@
 <?php
 namespace wcf\system\package;
-use wcf\system\menu\acp\ACPMenu;
 use wcf\data\application\Application;
 use wcf\data\application\ApplicationEditor;
 use wcf\data\language\LanguageEditor;
 use wcf\data\option\OptionEditor;
-use wcf\data\package\installation\queue\PackageInstallationQueue;
-use wcf\data\package\installation\queue\PackageInstallationQueueEditor;
 use wcf\data\package\Package;
 use wcf\data\package\PackageEditor;
+use wcf\data\package\installation\queue\PackageInstallationQueue;
+use wcf\data\package\installation\queue\PackageInstallationQueueEditor;
+use wcf\system\WCF;
 use wcf\system\cache\CacheHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\form;
 use wcf\system\form\container;
 use wcf\system\form\element;
+use wcf\system\menu\acp\ACPMenu;
 use wcf\system\request\LinkHandler;
 use wcf\system\request\RouteHandler;
-use wcf\system\WCF;
 use wcf\util\FileUtil;
 use wcf\util\HeaderUtil;
 use wcf\util\StringUtil;
diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationFormManager.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationFormManager.class.php
index 4273618b9d..a07eb00c55 100644
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationFormManager.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationFormManager.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\Package;
 use wcf\data\package\installation\queue\PackageInstallationQueue;
-use wcf\system\form\FormDocument;
 use wcf\system\WCF;
+use wcf\system\form\FormDocument;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationNodeBuilder.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationNodeBuilder.class.php
index cacb722bcc..1cad1b0f2a 100644
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationNodeBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationNodeBuilder.class.php
@@ -3,9 +3,9 @@ namespace wcf\system\package;
 use wcf\data\package\installation\queue\PackageInstallationQueue;
 use wcf\data\package\installation\queue\PackageInstallationQueueEditor;
 use wcf\data\package\installation\queue\PackageInstallationQueueList;
-use wcf\system\exception\SystemException;
 use wcf\system\Callback;
 use wcf\system\WCF;
+use wcf\system\exception\SystemException;
 use wcf\util\FileUtil;
 use wcf\util\StringUtil;
 
diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationSQLParser.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationSQLParser.class.php
index 8236e6aa90..ca56e1d2a6 100644
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationSQLParser.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationSQLParser.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\package;
 use wcf\data\package\Package;
+use wcf\system\WCF;
 use wcf\system\database\util\SQLParser;
 use wcf\system\exception\SystemException;
-use wcf\system\WCF;
 
 /**
  * PackageInstallationSQLParser extends SQLParser by testing and logging functions.
diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationScheduler.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationScheduler.class.php
index f911299687..c615271cc7 100644
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationScheduler.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationScheduler.class.php
@@ -1,11 +1,11 @@
 <?php
 namespace wcf\system\package;
-use wcf\data\package\update\server\PackageUpdateServer;
 use wcf\data\package\Package;
+use wcf\data\package\update\server\PackageUpdateServer;
+use wcf\system\WCF;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\io\File;
-use wcf\system\WCF;
 use wcf\util\FileUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/package/PackageUninstallationDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageUninstallationDispatcher.class.php
index 8e308eaa6a..9d33722eba 100644
--- a/wcfsetup/install/files/lib/system/package/PackageUninstallationDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageUninstallationDispatcher.class.php
@@ -1,18 +1,18 @@
 <?php
 namespace wcf\system\package;
-use wcf\system\menu\acp\ACPMenu;
 use wcf\data\option\OptionEditor;
 use wcf\data\package\Package;
 use wcf\data\package\PackageEditor;
 use wcf\data\package\PackageList;
 use wcf\data\package\installation\queue\PackageInstallationQueue;
 use wcf\data\package\installation\queue\PackageInstallationQueueEditor;
+use wcf\system\WCF;
 use wcf\system\cache\CacheHandler;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\SystemException;
+use wcf\system\menu\acp\ACPMenu;
 use wcf\system\request\LinkHandler;
 use wcf\system\setup\Uninstaller;
-use wcf\system\WCF;
 use wcf\util\HeaderUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/package/PackageUninstallationNodeBuilder.class.php b/wcfsetup/install/files/lib/system/package/PackageUninstallationNodeBuilder.class.php
index 401ccf5446..04ba302202 100644
--- a/wcfsetup/install/files/lib/system/package/PackageUninstallationNodeBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageUninstallationNodeBuilder.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\package;
 use wcf\data\package\installation\queue\PackageInstallationQueueEditor;
-use wcf\system\package\PackageUninstallationDispatcher;
 use wcf\system\WCF;
+use wcf\system\package\PackageUninstallationDispatcher;
 
 /**
  * PackageUninstallationNodeBuilder creates a logical node-based uninstallation tree.
diff --git a/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
index d1b575141f..32d15f987e 100644
--- a/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageUpdateDispatcher.class.php
@@ -7,10 +7,10 @@ use wcf\data\package\update\server\PackageUpdateServer;
 use wcf\data\package\update\server\PackageUpdateServerEditor;
 use wcf\data\package\update\version\PackageUpdateVersionEditor;
 use wcf\data\package\update\version\PackageUpdateVersionList;
+use wcf\system\WCF;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\io\RemoteFile;
-use wcf\system\WCF;
 use wcf\util\StringUtil;
 use wcf\util\XML;
 
diff --git a/wcfsetup/install/files/lib/system/package/plugin/ACPTemplatePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/ACPTemplatePackageInstallationPlugin.class.php
index dd0e9b964a..77bedcaf32 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/ACPTemplatePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/ACPTemplatePackageInstallationPlugin.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\package\plugin;
+use wcf\system\WCF;
 use wcf\system\exception\SystemException;
 use wcf\system\io\Tar;
 use wcf\system\package\ACPTemplatesFileHandler;
-use wcf\system\WCF;
 use wcf\util\FileUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/package/plugin/AbstractMenuPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/AbstractMenuPackageInstallationPlugin.class.php
index 1cb55e877c..9e1031d55d 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/AbstractMenuPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/AbstractMenuPackageInstallationPlugin.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\package\plugin;
-use wcf\system\exception\SystemException;
 use wcf\system\WCF;
+use wcf\system\exception\SystemException;
 
 /**
  * Default implementation for menu item manipulations.
diff --git a/wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php
index 40545811f1..334b5e6a97 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\package\plugin;
-use wcf\system\exception\SystemException;
 use wcf\system\WCF;
+use wcf\system\exception\SystemException;
 
 /**
  * Default implementation of some functions for PackageInstallationPlugin using options.
diff --git a/wcfsetup/install/files/lib/system/package/plugin/AbstractPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/AbstractPackageInstallationPlugin.class.php
index 5ce39fbd86..a2d147ab85 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/AbstractPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/AbstractPackageInstallationPlugin.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\package\plugin;
+use wcf\system\WCF;
 use wcf\system\event\EventHandler;
 use wcf\system\package\PackageInstallationDispatcher;
-use wcf\system\WCF;
 
 /**
  * Default implementation of some PackageInstallationPlugin functions.
diff --git a/wcfsetup/install/files/lib/system/package/plugin/AbstractXMLPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/AbstractXMLPackageInstallationPlugin.class.php
index 9aa9ea382e..4e38871874 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/AbstractXMLPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/AbstractXMLPackageInstallationPlugin.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\package\plugin;
+use wcf\system\WCF;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
-use wcf\system\WCF;
 use wcf\util\FileUtil;
 use wcf\util\XML;
 
diff --git a/wcfsetup/install/files/lib/system/package/plugin/CoreObjectPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/CoreObjectPackageInstallationPlugin.class.php
index 31446b4b6f..0127fe3f3c 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/CoreObjectPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/CoreObjectPackageInstallationPlugin.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\package\plugin;
-use wcf\system\cache\CacheHandler;
 use wcf\system\WCF;
+use wcf\system\cache\CacheHandler;
 
 /**
  * This PIP installs, updates or deletes core objects.
diff --git a/wcfsetup/install/files/lib/system/package/plugin/EventListenerPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/EventListenerPackageInstallationPlugin.class.php
index ba6c77ae90..36af758baf 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/EventListenerPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/EventListenerPackageInstallationPlugin.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\package\plugin;
-use wcf\system\cache\CacheHandler;
 use wcf\system\WCF;
+use wcf\system\cache\CacheHandler;
 
 /**
  * This PIP installs, updates or deletes event listeners.
diff --git a/wcfsetup/install/files/lib/system/package/plugin/FilePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/FilePackageInstallationPlugin.class.php
index 8c5206f550..83e918608d 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/FilePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/FilePackageInstallationPlugin.class.php
@@ -1,11 +1,11 @@
 <?php
 namespace wcf\system\package\plugin;
-use wcf\system\package\PackageInstallationDispatcher;
 use wcf\data\package\Package;
 use wcf\data\package\PackageEditor;
+use wcf\system\WCF;
 use wcf\system\exception\SystemException;
 use wcf\system\package\FilesFileHandler;
-use wcf\system\WCF;
+use wcf\system\package\PackageInstallationDispatcher;
 use wcf\util\FileUtil;
 use wcf\util\StyleUtil;
 
diff --git a/wcfsetup/install/files/lib/system/package/plugin/LanguagePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/LanguagePackageInstallationPlugin.class.php
index 9c2cf36610..53502564d5 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/LanguagePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/LanguagePackageInstallationPlugin.class.php
@@ -1,10 +1,10 @@
 <?php
 namespace wcf\system\package\plugin;
 use wcf\data\language\LanguageEditor;
+use wcf\system\WCF;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\language\LanguageFactory;
-use wcf\system\WCF;
 use wcf\util\XML;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
index 358f976eaf..0a96f49898 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\package\plugin;
-use wcf\system\exception\SystemException;
 use wcf\system\WCF;
+use wcf\system\exception\SystemException;
 
 /**
  * This PIP installs, updates or deletes object types.
diff --git a/wcfsetup/install/files/lib/system/package/plugin/OptionPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/OptionPackageInstallationPlugin.class.php
index 80d3ab3d7f..31b74537db 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/OptionPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/OptionPackageInstallationPlugin.class.php
@@ -2,8 +2,8 @@
 namespace wcf\system\package\plugin;
 use wcf\data\option\Option;
 use wcf\data\option\OptionEditor;
-use wcf\system\exception\SystemException;
 use wcf\system\WCF;
+use wcf\system\exception\SystemException;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/package/plugin/PIPPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/PIPPackageInstallationPlugin.class.php
index 9fff9c9273..ea3836c76e 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/PIPPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/PIPPackageInstallationPlugin.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\package\plugin;
-use wcf\system\exception\SystemException;
 use wcf\system\WCF;
+use wcf\system\exception\SystemException;
 
 /**
  * This PIP installs, updates or deletes package installation plugins.
diff --git a/wcfsetup/install/files/lib/system/package/plugin/SQLPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/SQLPackageInstallationPlugin.class.php
index 9e2b01306a..1173ba7504 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/SQLPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/SQLPackageInstallationPlugin.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\package\plugin;
 use wcf\data\package\Package;
-use wcf\system\package\PackageInstallationSQLParser;
-use wcf\system\exception\SystemException;
 use wcf\system\WCF;
+use wcf\system\exception\SystemException;
+use wcf\system\package\PackageInstallationSQLParser;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/package/plugin/StylePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/StylePackageInstallationPlugin.class.php
index 34cc471323..5ba8a5832b 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/StylePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/StylePackageInstallationPlugin.class.php
@@ -2,8 +2,8 @@
 namespace wcf\system\package\plugin;
 use wcf\data\style\StyleEditor;
 use wcf\data\style\StyleList;
-use wcf\system\event\EventHandler;
 use wcf\system\WCF;
+use wcf\system\event\EventHandler;
 
 /**
  * This PIP installs, updates or deletes styles.
diff --git a/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
index 65e41f1521..abbaa8cf8b 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\package\plugin;
-use wcf\system\cache\CacheHandler;
 use wcf\system\WCF;
+use wcf\system\cache\CacheHandler;
 
 /**
  * This PIP installs, updates or deletes template listeners.
diff --git a/wcfsetup/install/files/lib/system/package/plugin/TemplatePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/TemplatePackageInstallationPlugin.class.php
index 61693f3263..1a75ae8671 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/TemplatePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/TemplatePackageInstallationPlugin.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\package\plugin;
+use wcf\system\WCF;
 use wcf\system\exception\SystemException;
 use wcf\system\io\Tar;
 use wcf\system\package\TemplatesFileHandler;
-use wcf\system\WCF;
 use wcf\util\FileUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/package/plugin/UserGroupOptionPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/UserGroupOptionPackageInstallationPlugin.class.php
index 9d8ecb2b28..3b2dbb7b3a 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/UserGroupOptionPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/UserGroupOptionPackageInstallationPlugin.class.php
@@ -1,10 +1,10 @@
 <?php
 namespace wcf\system\package\plugin;
+use wcf\data\user\group\UserGroup;
 use wcf\data\user\group\option\UserGroupOption;
 use wcf\data\user\group\option\UserGroupOptionEditor;
-use wcf\data\user\group\UserGroup;
-use wcf\system\exception\SystemException;
 use wcf\system\WCF;
+use wcf\system\exception\SystemException;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/package/plugin/UserOptionPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/UserOptionPackageInstallationPlugin.class.php
index 9e12ca7f33..b223830ae8 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/UserOptionPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/UserOptionPackageInstallationPlugin.class.php
@@ -1,11 +1,11 @@
 <?php
 namespace wcf\system\package\plugin;
-use wcf\data\user\option\category\UserOptionCategory;
-use wcf\data\user\option\category\UserOptionCategoryEditor;
 use wcf\data\user\option\UserOption;
 use wcf\data\user\option\UserOptionEditor;
-use wcf\system\exception\SystemException;
+use wcf\data\user\option\category\UserOptionCategory;
+use wcf\data\user\option\category\UserOptionCategoryEditor;
 use wcf\system\WCF;
+use wcf\system\exception\SystemException;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/page/location/IPageLocation.class.php b/wcfsetup/install/files/lib/system/page/location/IPageLocation.class.php
index 7d7b2560fe..0bf3635dca 100644
--- a/wcfsetup/install/files/lib/system/page/location/IPageLocation.class.php
+++ b/wcfsetup/install/files/lib/system/page/location/IPageLocation.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\page\location;
-use wcf\data\page\location\PageLocation;
 use wcf\data\IDatabaseObjectProcessor;
+use wcf\data\page\location\PageLocation;
 
 /**
  * Any page location class should implement this interface.
diff --git a/wcfsetup/install/files/lib/system/request/LinkHandler.class.php b/wcfsetup/install/files/lib/system/request/LinkHandler.class.php
index 459becdc46..75c0d300b8 100644
--- a/wcfsetup/install/files/lib/system/request/LinkHandler.class.php
+++ b/wcfsetup/install/files/lib/system/request/LinkHandler.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\request;
+use wcf\system\SingletonFactory;
 use wcf\system\application\ApplicationHandler;
 use wcf\system\request\RouteHandler;
-use wcf\system\SingletonFactory;
 
 /**
  * Handles relative links within the wcf.
diff --git a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
index cea5ada08d..485e506626 100644
--- a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
+++ b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\request;
-use wcf\system\exception\SystemException;
-use wcf\system\exception\IllegalLinkException;
 use wcf\system\SingletonFactory;
+use wcf\system\exception\IllegalLinkException;
+use wcf\system\exception\SystemException;
 
 /**
  * Handles http requests.
diff --git a/wcfsetup/install/files/lib/system/request/RouteHandler.class.php b/wcfsetup/install/files/lib/system/request/RouteHandler.class.php
index bf06ab0707..300da0d76c 100644
--- a/wcfsetup/install/files/lib/system/request/RouteHandler.class.php
+++ b/wcfsetup/install/files/lib/system/request/RouteHandler.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\system\request;
+use wcf\system\SingletonFactory;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\SystemException;
-use wcf\system\SingletonFactory;
 use wcf\util\FileUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
index ca1f6a1ee5..6194ba580e 100644
--- a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
@@ -1,13 +1,13 @@
 <?php
 namespace wcf\system\session;
-use wcf\data\user\group\UserGroup;
 use wcf\data\user\User;
+use wcf\data\user\group\UserGroup;
+use wcf\system\SingletonFactory;
+use wcf\system\WCF;
 use wcf\system\cache\CacheHandler;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\user\authentication\UserAuthenticationFactory;
 use wcf\system\user\storage\UserStorageHandler;
-use wcf\system\SingletonFactory;
-use wcf\system\WCF;
 use wcf\util\StringUtil;
 use wcf\util\UserUtil;
 
diff --git a/wcfsetup/install/files/lib/system/style/StyleHandler.class.php b/wcfsetup/install/files/lib/system/style/StyleHandler.class.php
index 58f60f18b0..e790263eb5 100644
--- a/wcfsetup/install/files/lib/system/style/StyleHandler.class.php
+++ b/wcfsetup/install/files/lib/system/style/StyleHandler.class.php
@@ -1,10 +1,10 @@
 <?php
 namespace wcf\system\style;
 use wcf\data\style\ActiveStyle;
-use wcf\system\cache\CacheHandler;
-use wcf\system\exception\SystemException;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
+use wcf\system\cache\CacheHandler;
+use wcf\system\exception\SystemException;
 
 /**
  * Handles style-related actions.
diff --git a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
index 441e6b201d..a8d349ff0c 100644
--- a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
+++ b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
@@ -1,13 +1,13 @@
 <?php
 namespace wcf\system\template;
+use wcf\system\Regex;
+use wcf\system\SingletonFactory;
 use wcf\system\cache\CacheHandler;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\SystemException;
-use wcf\system\Regex;
-use wcf\system\SingletonFactory;
+use wcf\util\DirectoryUtil;
 use wcf\util\HeaderUtil;
 use wcf\util\StringUtil;
-use wcf\util\DirectoryUtil;
 
 /**
  * TemplateEngine loads and displays template.
diff --git a/wcfsetup/install/files/lib/system/template/plugin/AppendCompilerTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/AppendCompilerTemplatePlugin.class.php
index d03a5fb7fd..011b2390e3 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/AppendCompilerTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/AppendCompilerTemplatePlugin.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\template\plugin;
-use wcf\system\template\TemplateScriptingCompiler;
 use wcf\system\exception\SystemException;
+use wcf\system\template\TemplateScriptingCompiler;
 
 /**
  * The 'append' compiler function calls the append function on the template object.
diff --git a/wcfsetup/install/files/lib/system/template/plugin/AssignCompilerTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/AssignCompilerTemplatePlugin.class.php
index ac6f0d9f67..e99ffec274 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/AssignCompilerTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/AssignCompilerTemplatePlugin.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\template\plugin;
-use wcf\system\template\TemplateScriptingCompiler;
 use wcf\system\exception\SystemException;
+use wcf\system\template\TemplateScriptingCompiler;
 
 /**
  * The 'assign' compiler function calls the assign function on the template object.
diff --git a/wcfsetup/install/files/lib/system/template/plugin/EventPrefilterTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/EventPrefilterTemplatePlugin.class.php
index 85c4f7d69b..a0e89d2bb3 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/EventPrefilterTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/EventPrefilterTemplatePlugin.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\template\plugin;
-use wcf\system\template\TemplateScriptingCompiler;
 use wcf\system\WCF;
+use wcf\system\template\TemplateScriptingCompiler;
 
 /**
  * The 'event' prefilter inserts template listener's code before compilation.
diff --git a/wcfsetup/install/files/lib/system/template/plugin/FetchCompilerTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/FetchCompilerTemplatePlugin.class.php
index 5bc5d44392..07ee316fb8 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/FetchCompilerTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/FetchCompilerTemplatePlugin.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\template\plugin;
-use wcf\system\template\TemplateScriptingCompiler;
 use wcf\system\exception\SystemException;
+use wcf\system\template\TemplateScriptingCompiler;
 
 /**
  * The 'fetch' compiler function fetches files from the local file system, http, or ftp and displays the content.
diff --git a/wcfsetup/install/files/lib/system/template/plugin/ImplodeCompilerTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/ImplodeCompilerTemplatePlugin.class.php
index 13abb1635d..538df6110e 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/ImplodeCompilerTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/ImplodeCompilerTemplatePlugin.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\template\plugin;
-use wcf\system\template\TemplateScriptingCompiler;
 use wcf\system\exception\SystemException;
+use wcf\system\template\TemplateScriptingCompiler;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/template/plugin/LangPrefilterTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/LangPrefilterTemplatePlugin.class.php
index c5e8c72c6a..278f95a350 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/LangPrefilterTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/LangPrefilterTemplatePlugin.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\template\plugin;
-use wcf\system\template\TemplateScriptingCompiler;
 use wcf\system\WCF;
+use wcf\system\template\TemplateScriptingCompiler;
 
 /**
  * The 'lang' prefilter compiles static language variables.
diff --git a/wcfsetup/install/files/lib/system/template/plugin/LanguageModifierTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/LanguageModifierTemplatePlugin.class.php
index 84a4faf975..a08598cc69 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/LanguageModifierTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/LanguageModifierTemplatePlugin.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\template\plugin;
-use wcf\system\template\TemplateEngine;
 use wcf\system\WCF;
+use wcf\system\template\TemplateEngine;
 
 /**
  * The 'language' modifier returns dynamic language variables.
diff --git a/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php
index 7b47d9dc43..a6ff875300 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php
@@ -1,10 +1,10 @@
 <?php
 namespace wcf\system\template\plugin;
+use wcf\system\WCF;
 use wcf\system\exception\SystemException;
 use wcf\system\request\LinkHandler;
 use wcf\system\style\StyleHandler;
 use wcf\system\template\TemplateEngine;
-use wcf\system\WCF;
 use wcf\util\StringUtil;
 
 
diff --git a/wcfsetup/install/files/lib/system/template/plugin/PlainTimeModifierTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/PlainTimeModifierTemplatePlugin.class.php
index c6ba6e0a62..f223ef9d72 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/PlainTimeModifierTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/PlainTimeModifierTemplatePlugin.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\template\plugin;
-use wcf\system\template\TemplateEngine;
 use wcf\system\WCF;
+use wcf\system\template\TemplateEngine;
 use wcf\util\DateUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/template/plugin/SmallpagesFunctionTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/SmallpagesFunctionTemplatePlugin.class.php
index b1e1cc3c0f..cd968d7ea7 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/SmallpagesFunctionTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/SmallpagesFunctionTemplatePlugin.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\template\plugin;
+use wcf\system\WCF;
 use wcf\system\exception\SystemException;
 use wcf\system\request\LinkHandler;
 use wcf\system\template\TemplateEngine;
-use wcf\system\WCF;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/template/plugin/TimeModifierTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/TimeModifierTemplatePlugin.class.php
index f059c6c34f..766cdbc556 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/TimeModifierTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/TimeModifierTemplatePlugin.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\system\template\plugin;
-use wcf\system\template\TemplateEngine;
 use wcf\system\WCF;
+use wcf\system\template\TemplateEngine;
 use wcf\util\DateUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/system/user/collapsible/content/UserCollapsibleContentHandler.class.php b/wcfsetup/install/files/lib/system/user/collapsible/content/UserCollapsibleContentHandler.class.php
index 2b1f555062..5d752a50cb 100644
--- a/wcfsetup/install/files/lib/system/user/collapsible/content/UserCollapsibleContentHandler.class.php
+++ b/wcfsetup/install/files/lib/system/user/collapsible/content/UserCollapsibleContentHandler.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\user\collapsible\content;
 use wcf\data\object\type\ObjectTypeCache;
-use wcf\system\user\storage\UserStorageHandler;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
+use wcf\system\user\storage\UserStorageHandler;
 
 /**
  * Provides methods for handling collapsible containers.
diff --git a/wcfsetup/install/files/lib/system/user/storage/UserStorageHandler.class.php b/wcfsetup/install/files/lib/system/user/storage/UserStorageHandler.class.php
index 0ebe1beda9..1d9d106719 100644
--- a/wcfsetup/install/files/lib/system/user/storage/UserStorageHandler.class.php
+++ b/wcfsetup/install/files/lib/system/user/storage/UserStorageHandler.class.php
@@ -1,9 +1,9 @@
 <?php
 namespace wcf\system\user\storage;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\package\PackageDependencyHandler;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\package\PackageDependencyHandler;
 
 /**
  * Handles the persistent user data storage.
diff --git a/wcfsetup/install/files/lib/system/worker/MailWorker.class.php b/wcfsetup/install/files/lib/system/worker/MailWorker.class.php
index 570c44153b..48171ad8f2 100644
--- a/wcfsetup/install/files/lib/system/worker/MailWorker.class.php
+++ b/wcfsetup/install/files/lib/system/worker/MailWorker.class.php
@@ -1,11 +1,11 @@
 <?php
 namespace wcf\system\worker;
 use wcf\data\user\User;
+use wcf\system\WCF;
 use wcf\system\clipboard\ClipboardHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\mail\Mail;
-use wcf\system\WCF;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/util/DateUtil.class.php b/wcfsetup/install/files/lib/util/DateUtil.class.php
index f96ecb96da..2a367060fa 100644
--- a/wcfsetup/install/files/lib/util/DateUtil.class.php
+++ b/wcfsetup/install/files/lib/util/DateUtil.class.php
@@ -1,8 +1,8 @@
 <?php
 namespace wcf\util;
-use wcf\system\WCF;
-use wcf\data\user\User;
 use wcf\data\language\Language;
+use wcf\data\user\User;
+use wcf\system\WCF;
 
 /**
  * Contains date-related functions.
diff --git a/wcfsetup/install/files/lib/util/FileUtil.class.php b/wcfsetup/install/files/lib/util/FileUtil.class.php
index ad090279a5..2911a25508 100644
--- a/wcfsetup/install/files/lib/util/FileUtil.class.php
+++ b/wcfsetup/install/files/lib/util/FileUtil.class.php
@@ -1,10 +1,10 @@
 <?php
 namespace wcf\util;
+use wcf\system\WCF;
+use wcf\system\exception\SystemException;
 use wcf\system\io\File;
 use wcf\system\io\GZipFile;
 use wcf\system\io\RemoteFile;
-use wcf\system\exception\SystemException;
-use wcf\system\WCF;
 
 /**
  * Contains file-related functions.