From: Matthias Schmidt <gravatronics@live.com>
Date: Fri, 25 Mar 2016 12:25:48 +0000 (+0100)
Subject: Fix code formatting
X-Git-Tag: 3.0.0_Beta_1~1286^2~54
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=893aace32334ab54deb8461c5c0f0ecd8bd6a1a6;p=GitHub%2FWoltLab%2FWCF.git

Fix code formatting
---

diff --git a/wcfsetup/install/files/lib/acp/form/MenuAddForm.class.php b/wcfsetup/install/files/lib/acp/form/MenuAddForm.class.php
index 6744d3ce5c..1f9a181a4c 100644
--- a/wcfsetup/install/files/lib/acp/form/MenuAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/MenuAddForm.class.php
@@ -33,7 +33,7 @@ class MenuAddForm extends AbstractForm {
 	
 	/**
 	 * menu title
-	 * @var string
+	 * @var	string
 	 */
 	public $title = '';
 	
@@ -117,7 +117,7 @@ class MenuAddForm extends AbstractForm {
 	/**
 	 * Validates box position.
 	 * 
-	 * @throws      UserInputException
+	 * @throws	UserInputException
 	 */
 	protected function validatePosition() {
 		if (!in_array($this->position, Box::$availablePositions)) {
diff --git a/wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php b/wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php
index 4886ba4324..ebaac9b234 100644
--- a/wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php
@@ -63,7 +63,7 @@ class MenuItemAddForm extends AbstractForm {
 	
 	/**
 	 * list of page handlers by page id
-	 * @var \wcf\system\page\handler\IMenuPageHandler[]
+	 * @var	\wcf\system\page\handler\IMenuPageHandler[]
 	 */
 	public $pageHandlers = [];
 	
@@ -75,7 +75,7 @@ class MenuItemAddForm extends AbstractForm {
 	
 	/**
 	 * page object id
-	 * @var integer
+	 * @var	integer
 	 */
 	public $pageObjectID = null;
 	
@@ -111,7 +111,7 @@ class MenuItemAddForm extends AbstractForm {
 	
 	/**
 	 * nested list of page nodes
-	 * @var \RecursiveIteratorIterator
+	 * @var	\RecursiveIteratorIterator
 	 */
 	public $pageNodeList;
 	
diff --git a/wcfsetup/install/files/lib/acp/form/PageAddForm.class.php b/wcfsetup/install/files/lib/acp/form/PageAddForm.class.php
index 425425c0ef..5cece48518 100644
--- a/wcfsetup/install/files/lib/acp/form/PageAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PageAddForm.class.php
@@ -38,73 +38,73 @@ class PageAddForm extends AbstractForm {
 	
 	/**
 	 * true if created page is multi-lingual
-	 * @var boolean
+	 * @var	boolean
 	 */
 	public $isMultilingual = 0;
 	
 	/**
 	 * parent page id
-	 * @var integer
+	 * @var	integer
 	 */
 	public $parentPageID = 0;
 	
 	/**
 	 * page name
-	 * @var string
+	 * @var	string
 	 */
 	public $name = '';
 	
 	/**
 	 * true if page is disabled
-	 * @var boolean
+	 * @var	boolean
 	 */
 	public $isDisabled = 0;
 	
 	/**
 	 * true if page is landing page
-	 * @var boolean
+	 * @var	boolean
 	 */
 	public $isLandingPage = 0;
 	
 	/**
 	 * package id of the page
-	 * @var integer
+	 * @var	integer
 	 */
 	public $packageID = 1;
 	
 	/**
 	 * list of available applications
-	 * @var Application[]
+	 * @var	Application[]
 	 */
 	public $availableApplications = [];
 	
 	/**
 	 * page custom URL
-	 * @var string[]
+	 * @var	string[]
 	 */
 	public $customURL = [];
 	
 	/**
 	 * page titles
-	 * @var string[]
+	 * @var	string[]
 	 */
 	public $title = [];
 	
 	/**
 	 * page contents
-	 * @var string[]
+	 * @var	string[]
 	 */
 	public $content = [];
 	
 	/**
 	 * page meta descriptions
-	 * @var string[]
+	 * @var	string[]
 	 */
 	public $metaDescription = [];
 	
 	/**
 	 * page meta keywords
-	 * @var string[]
+	 * @var	string[]
 	 */
 	public $metaKeywords = [];
 	
diff --git a/wcfsetup/install/files/lib/acp/form/PageEditForm.class.php b/wcfsetup/install/files/lib/acp/form/PageEditForm.class.php
index 05d809e798..5346da6a12 100644
--- a/wcfsetup/install/files/lib/acp/form/PageEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PageEditForm.class.php
@@ -27,13 +27,13 @@ class PageEditForm extends PageAddForm {
 	
 	/**
 	 * page id
-	 * @var integer
+	 * @var	integer
 	 */
 	public $pageID = 0;
 	
 	/**
 	 * page object
-	 * @var Page
+	 * @var	Page
 	 */
 	public $page = null;
 	
diff --git a/wcfsetup/install/files/lib/acp/form/PageLandingForm.class.php b/wcfsetup/install/files/lib/acp/form/PageLandingForm.class.php
index 79e3ce39f2..c996b41023 100644
--- a/wcfsetup/install/files/lib/acp/form/PageLandingForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PageLandingForm.class.php
@@ -29,13 +29,13 @@ class PageLandingForm extends AbstractForm {
 	
 	/**
 	 * list of available applications
-	 * @var Application[]
+	 * @var	Application[]
 	 */
 	public $applications;
 	
 	/**
 	 * landing page id per application package id
-	 * @var integer[]
+	 * @var	integer[]
 	 */
 	public $landingPages = [];
 	
@@ -46,7 +46,7 @@ class PageLandingForm extends AbstractForm {
 	
 	/**
 	 * list of available pages
-	 * @var Page[]
+	 * @var	Page[]
 	 */
 	public $pages = [];
 	
diff --git a/wcfsetup/install/files/lib/acp/form/RescueModeForm.class.php b/wcfsetup/install/files/lib/acp/form/RescueModeForm.class.php
index f4b14feca8..3138b7c7c9 100644
--- a/wcfsetup/install/files/lib/acp/form/RescueModeForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/RescueModeForm.class.php
@@ -34,12 +34,12 @@ use wcf\util\UserUtil;
  */
 class RescueModeForm extends AbstractCaptchaForm {
 	/**
-	 * @var Application[]
+	 * @var	Application[]
 	 */
 	public $applications;
 	
 	/**
-	 * @var string[]
+	 * @var	string[]
 	 */
 	public $applicationValues = [];
 	
@@ -50,7 +50,7 @@ class RescueModeForm extends AbstractCaptchaForm {
 	public $password = '';
 	
 	/**
-	 * @var User
+	 * @var	User
 	 */
 	public $user;
 	
diff --git a/wcfsetup/install/files/lib/acp/page/IndexPage.class.php b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php
index 93bb2d0ab7..5ef133d475 100755
--- a/wcfsetup/install/files/lib/acp/page/IndexPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php
@@ -17,7 +17,7 @@ use wcf\system\WCF;
 class IndexPage extends AbstractPage {
 	/**
 	 * server information
-	 * @var string[]
+	 * @var	string[]
 	 */
 	public $server = [];
 	
diff --git a/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogPage.class.php b/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogPage.class.php
index 6e8e7775c6..8b74371fb3 100644
--- a/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PaidSubscriptionTransactionLogPage.class.php
@@ -33,7 +33,7 @@ class PaidSubscriptionTransactionLogPage extends AbstractPage {
 	
 	/**
 	 * log entry id
-	 * @var integer
+	 * @var	integer
 	 */
 	public $logID = 0;
 	
diff --git a/wcfsetup/install/files/lib/data/application/Application.class.php b/wcfsetup/install/files/lib/data/application/Application.class.php
index a3635cd9fa..04f99cf387 100644
--- a/wcfsetup/install/files/lib/data/application/Application.class.php
+++ b/wcfsetup/install/files/lib/data/application/Application.class.php
@@ -22,7 +22,7 @@ use wcf\util\FileUtil;
 class Application extends DatabaseObject {
 	/**
 	 * related package object
-	 * @var Package
+	 * @var	Package
 	 */
 	protected $package;
 	
@@ -65,7 +65,7 @@ class Application extends DatabaseObject {
 	/**
 	 * Returns related package object.
 	 * 
-	 * @return      Package         related package object
+	 * @return	Package		related package object
 	 */
 	public function getPackage() {
 		if ($this->package === null) {
diff --git a/wcfsetup/install/files/lib/data/box/Box.class.php b/wcfsetup/install/files/lib/data/box/Box.class.php
index 653d99ec71..62a4f270a7 100644
--- a/wcfsetup/install/files/lib/data/box/Box.class.php
+++ b/wcfsetup/install/files/lib/data/box/Box.class.php
@@ -61,7 +61,7 @@ class Box extends DatabaseObject {
 	
 	/**
 	 * menu object
-	 * @var Menu
+	 * @var	Menu
 	 */
 	protected $menu;
 	
diff --git a/wcfsetup/install/files/lib/data/category/CategoryNodeTree.class.php b/wcfsetup/install/files/lib/data/category/CategoryNodeTree.class.php
index 6adcea26f9..1951a13947 100644
--- a/wcfsetup/install/files/lib/data/category/CategoryNodeTree.class.php
+++ b/wcfsetup/install/files/lib/data/category/CategoryNodeTree.class.php
@@ -17,7 +17,7 @@ class CategoryNodeTree implements \IteratorAggregate {
 	/**
 	 * maximum depth considered when building the node tree.
 	 * 
-	 * @var integer
+	 * @var	integer
 	 */
 	protected $maxDepth = -1;
 	
diff --git a/wcfsetup/install/files/lib/data/menu/Menu.class.php b/wcfsetup/install/files/lib/data/menu/Menu.class.php
index 53e4fc20c0..5046a6fa1f 100644
--- a/wcfsetup/install/files/lib/data/menu/Menu.class.php
+++ b/wcfsetup/install/files/lib/data/menu/Menu.class.php
@@ -29,13 +29,13 @@ class Menu extends DatabaseObject {
 	
 	/**
 	 * menu item node tree
-	 * @var MenuItemNodeTree
+	 * @var	MenuItemNodeTree
 	 */
 	protected $menuItemNodeTree;
 	
 	/**
 	 * box object
-	 * @var Box
+	 * @var	Box
 	 */
 	protected $box;
 	
@@ -55,7 +55,7 @@ class Menu extends DatabaseObject {
 	/**
 	 * Returns the items of this menu.
 	 * 
-	 * @return      \RecursiveIteratorIterator
+	 * @return	\RecursiveIteratorIterator
 	 */
 	public function getMenuItemNodeList() {
 		return $this->getMenuItemNodeTree()->getNodeList();
@@ -92,7 +92,7 @@ class Menu extends DatabaseObject {
 	/**
 	 * Returns the box of this menu.
 	 * 
-	 * @return      Box
+	 * @return	Box
 	 */
 	public function getBox() {
 		if ($this->box === null) {
@@ -103,7 +103,9 @@ class Menu extends DatabaseObject {
 	}
 	
 	/**
-	 * @return      MenuItemNodeTree
+	 * Returns the menu item node tree with the menu's items.
+	 * 
+	 * @return	MenuItemNodeTree
 	 */
 	protected function getMenuItemNodeTree() {
 		if ($this->menuItemNodeTree === null) {
diff --git a/wcfsetup/install/files/lib/data/menu/MenuCache.class.php b/wcfsetup/install/files/lib/data/menu/MenuCache.class.php
index 0a8ef35bdd..38fc6996cc 100644
--- a/wcfsetup/install/files/lib/data/menu/MenuCache.class.php
+++ b/wcfsetup/install/files/lib/data/menu/MenuCache.class.php
@@ -13,16 +13,16 @@ use wcf\system\SingletonFactory;
  * @package	com.woltlab.wcf
  * @subpackage	data.menu
  * @category	Community Framework
- * @since       2.2
+ * @since	2.2
  */
 class MenuCache extends SingletonFactory {
 	/**
-	 * @var Menu[]
+	 * @var	Menu[]
 	 */
 	protected $cachedMenus;
 	
 	/**
-	 * @var MenuItemList[]
+	 * @var	MenuItemList[]
 	 */
 	protected $cachedMenuItems;
 	
@@ -37,8 +37,8 @@ class MenuCache extends SingletonFactory {
 	/**
 	 * Returns a menu by id.
 	 * 
-	 * @param       integer         $menuID         menu id
-	 * @return      Menu|null       menu object or null if menu id is unknown
+	 * @param	integer		$menuID		menu id
+	 * @return	Menu|null	menu object or null if menu id is unknown
 	 */
 	public function getMenuByID($menuID) {
 		if (isset($this->cachedMenus[$menuID])) {
@@ -51,8 +51,8 @@ class MenuCache extends SingletonFactory {
 	/**
 	 * Returns a menu item list by menu id.
 	 * 
-	 * @param       integer         $menuID         menu id
-	 * @return      MenuItemList|null       menu item list object or null if menu id is unknown
+	 * @param	integer			$menuID		menu id
+	 * @return	MenuItemList|null	menu item list object or null if menu id is unknown
 	 */
 	public function getMenuItemsByMenuID($menuID) {
 		if (isset($this->cachedMenuItems[$menuID])) {
diff --git a/wcfsetup/install/files/lib/data/menu/MenuEditor.class.php b/wcfsetup/install/files/lib/data/menu/MenuEditor.class.php
index a234350116..ced425ef3e 100644
--- a/wcfsetup/install/files/lib/data/menu/MenuEditor.class.php
+++ b/wcfsetup/install/files/lib/data/menu/MenuEditor.class.php
@@ -35,16 +35,16 @@ class MenuEditor extends DatabaseObjectEditor {
 		
 		if (is_array($title)) {
 			if (count($title) > 1) {
-				$sql = "SELECT  languageCategoryID
-					FROM    wcf".WCF_N."_language_category
-					WHERE   languageCategory = ?";
+				$sql = "SELECT	languageCategoryID
+					FROM	wcf".WCF_N."_language_category
+					WHERE	languageCategory = ?";
 				$statement = WCF::getDB()->prepareStatement($sql, 1);
 				$statement->execute(['wcf.menu']);
 				$languageCategoryID = $statement->fetchSingleColumn();
 				
-				$sql = "INSERT INTO     wcf".WCF_N."_language_item
+				$sql = "INSERT INTO	wcf".WCF_N."_language_item
 							(languageID, languageItem, languageItemValue, languageItemOriginIsSystem, languageCategoryID, packageID)
-					VALUES          (?, ?, ?, ?, ?, ?)";
+					VALUES		(?, ?, ?, ?, ?, ?)";
 				$statement = WCF::getDB()->prepareStatement($sql);
 				
 				WCF::getDB()->beginTransaction();
diff --git a/wcfsetup/install/files/lib/data/menu/ViewableMenu.class.php b/wcfsetup/install/files/lib/data/menu/ViewableMenu.class.php
index b03e7af883..411ae26852 100644
--- a/wcfsetup/install/files/lib/data/menu/ViewableMenu.class.php
+++ b/wcfsetup/install/files/lib/data/menu/ViewableMenu.class.php
@@ -6,7 +6,7 @@ use wcf\system\WCF;
 
 class ViewableMenu extends DatabaseObjectDecorator {
 	/**
-	 * @var MenuItemNodeTree
+	 * @var	MenuItemNodeTree
 	 */
 	protected $menuItems;
 	
diff --git a/wcfsetup/install/files/lib/data/menu/item/MenuItem.class.php b/wcfsetup/install/files/lib/data/menu/item/MenuItem.class.php
index 0fbc9adc92..11ed7a4d9d 100644
--- a/wcfsetup/install/files/lib/data/menu/item/MenuItem.class.php
+++ b/wcfsetup/install/files/lib/data/menu/item/MenuItem.class.php
@@ -31,46 +31,46 @@ class MenuItem extends DatabaseObject {
 	protected static $databaseTableIndexName = 'itemID';
 	
 	/**
-	 * @var IMenuPageHandler
+	 * @var	IMenuPageHandler
 	 */
 	protected $handler;
 	
 	/**
 	 * page object
-	 * @var Page
+	 * @var	Page
 	 */
 	protected $page;
 	
 	/**
 	 * Returns true if the active user can delete this menu item.
 	 *
-	 * @return boolean
+	 * @return	boolean
 	 */
 	public function canDelete() {
 		if (WCF::getSession()->getPermission('admin.content.cms.canManageMenu') && !$this->originIsSystem) {
 			return true;
 		}
-			
+		
 		return false;
 	}
 	
 	/**
 	 * Returns true if the active user can disable this menu item.
 	 *
-	 * @return boolean
+	 * @return	boolean
 	 */
 	public function canDisable() {
 		if (WCF::getSession()->getPermission('admin.content.cms.canManageMenu')) {
 			return true;
 		}
-			
+		
 		return false;
 	}
 	
 	/**
 	 * Returns the URL of this menu item.
 	 * 
-	 * @return      string
+	 * @return	string
 	 */
 	public function getURL() {
 		if ($this->pageObjectID) {
@@ -91,7 +91,7 @@ class MenuItem extends DatabaseObject {
 	/**
 	 * Returns the page that is linked by this menu item.
 	 * 
-	 * @return      Page|null
+	 * @return	Page|null
 	 */
 	public function getPage() {
 		if ($this->page === null && $this->pageID) {
@@ -104,7 +104,7 @@ class MenuItem extends DatabaseObject {
 	/**
 	 * Returns false if this item should be hidden from menu.
 	 * 
-	 * @return      boolean
+	 * @return	boolean
 	 */
 	public function isVisible() {
 		if ($this->getPage() !== null && !$this->getPage()->isVisible()) {
@@ -121,7 +121,7 @@ class MenuItem extends DatabaseObject {
 	/**
 	 * Returns the number of outstanding items for this menu.
 	 * 
-	 * @return      integer
+	 * @return	integer
 	 */
 	public function getOutstandingItems() {
 		if ($this->getMenuPageHandler() !== null) {
@@ -132,7 +132,9 @@ class MenuItem extends DatabaseObject {
 	}
 	
 	/**
-	 * @return      IMenuPageHandler|null
+	 * TODO: Comment
+	 * 
+	 * @return	IMenuPageHandler|null
 	 */
 	protected function getMenuPageHandler() {
 		$page = $this->getPage();
diff --git a/wcfsetup/install/files/lib/data/menu/item/MenuItemEditor.class.php b/wcfsetup/install/files/lib/data/menu/item/MenuItemEditor.class.php
index 6ab86c0177..6ca32b87c4 100644
--- a/wcfsetup/install/files/lib/data/menu/item/MenuItemEditor.class.php
+++ b/wcfsetup/install/files/lib/data/menu/item/MenuItemEditor.class.php
@@ -37,16 +37,16 @@ class MenuItemEditor extends DatabaseObjectEditor implements IEditableCachedObje
 		
 		if (is_array($title)) {
 			if (count($title) > 1) {
-				$sql = "SELECT  languageCategoryID
-					FROM    wcf".WCF_N."_language_category
-					WHERE   languageCategory = ?";
+				$sql = "SELECT	languageCategoryID
+					FROM	wcf".WCF_N."_language_category
+					WHERE	languageCategory = ?";
 				$statement = WCF::getDB()->prepareStatement($sql, 1);
 				$statement->execute(['wcf.menu']);
 				$languageCategoryID = $statement->fetchSingleColumn();
 				
-				$sql = "INSERT INTO     wcf".WCF_N."_language_item
+				$sql = "INSERT INTO	wcf".WCF_N."_language_item
 							(languageID, languageItem, languageItemValue, languageItemOriginIsSystem, languageCategoryID, packageID)
-					VALUES          (?, ?, ?, ?, ?, ?)";
+					VALUES		(?, ?, ?, ?, ?, ?)";
 				$statement = WCF::getDB()->prepareStatement($sql);
 				
 				WCF::getDB()->beginTransaction();
diff --git a/wcfsetup/install/files/lib/data/menu/item/MenuItemList.class.php b/wcfsetup/install/files/lib/data/menu/item/MenuItemList.class.php
index db3fcb5a23..8e7ee69ff4 100644
--- a/wcfsetup/install/files/lib/data/menu/item/MenuItemList.class.php
+++ b/wcfsetup/install/files/lib/data/menu/item/MenuItemList.class.php
@@ -22,7 +22,7 @@ class MenuItemList extends DatabaseObjectList {
 	/**
 	 * Sets the menu items used to improve menu cache performance.
 	 * 
-	 * @param       MenuItem[]      $menuItems      list of menu item objects
+	 * @param	MenuItem[]	$menuItems	list of menu item objects
 	 */
 	public function setMenuItems(array $menuItems) {
 		$this->objects = $menuItems;
diff --git a/wcfsetup/install/files/lib/data/menu/item/MenuItemNode.class.php b/wcfsetup/install/files/lib/data/menu/item/MenuItemNode.class.php
index cc71b93594..c732f17656 100644
--- a/wcfsetup/install/files/lib/data/menu/item/MenuItemNode.class.php
+++ b/wcfsetup/install/files/lib/data/menu/item/MenuItemNode.class.php
@@ -27,7 +27,7 @@ class MenuItemNode implements \Countable, \RecursiveIterator {
 	
 	/**
 	 * true if item or one of its children is active
-	 * @var boolean
+	 * @var	boolean
 	 */
 	protected $isActive = false;
 	
@@ -144,7 +144,7 @@ class MenuItemNode implements \Countable, \RecursiveIterator {
 	/**
 	 * Returns true if this item (or one of its children) is marked as active.
 	 * 
-	 * @return      boolean
+	 * @return	boolean
 	 */
 	public function isActiveNode() {
 		return $this->isActive;
diff --git a/wcfsetup/install/files/lib/data/menu/item/MenuItemNodeTree.class.php b/wcfsetup/install/files/lib/data/menu/item/MenuItemNodeTree.class.php
index 933b7d2eeb..4afdeba382 100644
--- a/wcfsetup/install/files/lib/data/menu/item/MenuItemNodeTree.class.php
+++ b/wcfsetup/install/files/lib/data/menu/item/MenuItemNodeTree.class.php
@@ -40,15 +40,15 @@ class MenuItemNodeTree {
 	
 	/**
 	 * number of visible items
-	 * @var integer
+	 * @var	integer
 	 */
 	protected $visibleItemCount = 0;
 	
 	/**
 	 * Creates a new MenuItemNodeTree object.
 	 * 
-	 * @param	integer		$menuID         menu id
-	 * @param       MenuItemList    $menuItemList   optional object to be provided when building the tree from cache
+	 * @param	integer		$menuID		menu id
+	 * @param	MenuItemList	$menuItemList	optional object to be provided when building the tree from cache
 	 */
 	public function __construct($menuID, MenuItemList $menuItemList = null) {
 		$this->menuID = $menuID;
@@ -114,9 +114,9 @@ class MenuItemNodeTree {
 	/**
 	 * Generates the node tree recursively.
 	 * 
-	 * @param	integer			$parentID       parent menu item id
-	 * @param	MenuItemNode		$parentNode     parent menu item object
-	 * @return	MenuItemNode[]          nested menu item tree
+	 * @param	integer			$parentID	parent menu item id
+	 * @param	MenuItemNode		$parentNode	parent menu item object
+	 * @return	MenuItemNode[]		nested menu item tree
 	 */
 	protected function generateNodeTree($parentID = null, MenuItemNode $parentNode = null) {
 		$nodes = array();
@@ -159,7 +159,7 @@ class MenuItemNodeTree {
 	/**
 	 * Returns the number of visible items.
 	 * 
-	 * @return      integer
+	 * @return	integer
 	 */
 	public function getVisibleItemCount() {
 		return $this->visibleItemCount;
diff --git a/wcfsetup/install/files/lib/data/page/Page.class.php b/wcfsetup/install/files/lib/data/page/Page.class.php
index f61ea17a6c..b7685faaa6 100644
--- a/wcfsetup/install/files/lib/data/page/Page.class.php
+++ b/wcfsetup/install/files/lib/data/page/Page.class.php
@@ -35,47 +35,47 @@ class Page extends DatabaseObject {
 	protected static $databaseTableIndexName = 'pageID';
 	
 	/**
-	 * @var \wcf\system\page\handler\IMenuPageHandler
+	 * @var	\wcf\system\page\handler\IMenuPageHandler
 	 */
 	protected $pageHandler;
 	
 	/**
 	 * Returns true if the active user can delete this page.
 	 * 
-	 * @return boolean
+	 * @return	boolean
 	 */
 	public function canDelete() {
 		if (WCF::getSession()->getPermission('admin.content.cms.canManagePage') && !$this->originIsSystem && !$this->isLandingPage) {
 			return true;
 		}
-			
+		
 		return false;
 	}
 	
 	/**
 	 * Returns true if the active user can disable this page.
 	 *
-	 * @return boolean
+	 * @return	boolean
 	 */
 	public function canDisable() {
 		if (WCF::getSession()->getPermission('admin.content.cms.canManagePage') && !$this->originIsSystem && !$this->isLandingPage) {
 			return true;
 		}
-			
+		
 		return false;
 	}
 	
 	/**
 	 * Returns the page content.
 	 * 
-	 * @return      array           content data
+	 * @return	array		content data
 	 */
 	public function getPageContent() {
 		$content = [];
 		
 		$sql = "SELECT	*
 			FROM	wcf".WCF_N."_page_content
-			WHERE   pageID = ?";
+			WHERE	pageID = ?";
 		$statement = WCF::getDB()->prepareStatement($sql);
 		$statement->execute([$this->pageID]);
 		while ($row = $statement->fetchArray()) {
@@ -95,9 +95,9 @@ class Page extends DatabaseObject {
 	 * Returns content for a single language, passing `null` for `$languageID` is undefined
 	 * for multilingual pages.
 	 * 
-	 * @param       integer         $languageID     language id or `null` if there are no localized versions
-	 * @return      string[]        page content data
-	 * @throws      \wcf\system\database\DatabaseException
+	 * @param	integer		$languageID	language id or `null` if there are no localized versions
+	 * @return	string[]	page content data
+	 * @throws	\wcf\system\database\DatabaseException
 	 */
 	public function getPageContentByLanguage($languageID = null) {
 		$conditions = new PreparedStatementConditionBuilder();
@@ -106,7 +106,7 @@ class Page extends DatabaseObject {
 		else $conditions->add("languageID IS NULL");
 		
 		$sql = "SELECT  *
-			FROM    wcf".WCF_N."_page_content
+			FROM	wcf".WCF_N."_page_content
 			".$conditions;
 		$statement = WCF::getDB()->prepareStatement($sql, 1);
 		$statement->execute($conditions->getParameters());
@@ -118,7 +118,7 @@ class Page extends DatabaseObject {
 	/**
 	 * Returns the page URL.
 	 * 
-	 * @return      string
+	 * @return	string
 	 */
 	public function getLink() {
 		if ($this->controller) {
@@ -134,13 +134,13 @@ class Page extends DatabaseObject {
 		}
 		else {
 			return LinkHandler::getInstance()->getCmsLink($this->pageID);
-		}	
+		}
 	}
 	
 	/**
 	 * Returns shortened link for acp page list.
 	 *
-	 * @return      string
+	 * @return	string
 	 */
 	public function getDisplayLink() {
 		return str_replace($this->getApplication()->getPageURL(), '', $this->getLink());
@@ -149,7 +149,7 @@ class Page extends DatabaseObject {
 	/**
 	 * Returns the application of this page.
 	 *
-	 * @return      \wcf\data\application\Application
+	 * @return	\wcf\data\application\Application
 	 */
 	public function getApplication() {
 		return ApplicationHandler::getInstance()->getApplicationByID($this->packageID);
@@ -158,7 +158,7 @@ class Page extends DatabaseObject {
 	/**
 	 * Returns the associated page handler or null.
 	 * 
-	 * @return      \wcf\system\page\handler\IMenuPageHandler|null
+	 * @return	\wcf\system\page\handler\IMenuPageHandler|null
 	 */
 	public function getHandler() {
 		if ($this->handler) {
@@ -172,7 +172,7 @@ class Page extends DatabaseObject {
 	 * Returns false if this page should be hidden from menus, but does not control the accessibility
 	 * of the page itself.
 	 *
-	 * @return      boolean         false if the page should be hidden from menus
+	 * @return	boolean		false if the page should be hidden from menus
 	 */
 	public function isVisible() {
 		if (!$this->validateOptions()) return false;
@@ -184,7 +184,7 @@ class Page extends DatabaseObject {
 	/**
 	 * Returns the page's internal name.
 	 *
-	 * @return      string
+	 * @return	string
 	 */
 	public function __toString() {
 		return $this->name;
@@ -193,8 +193,8 @@ class Page extends DatabaseObject {
 	/**
 	 * Returns the page with the given identifier.
 	 * 
-	 * @param       string          $identifier     unique page identifier
-	 * @return      Page
+	 * @param	string		$identifier	unique page identifier
+	 * @return	Page
 	 */
 	public static function getPageByIdentifier($identifier) {
 		$sql = "SELECT	*
diff --git a/wcfsetup/install/files/lib/data/page/PageAction.class.php b/wcfsetup/install/files/lib/data/page/PageAction.class.php
index 31bf36aeae..7a4ff9b486 100644
--- a/wcfsetup/install/files/lib/data/page/PageAction.class.php
+++ b/wcfsetup/install/files/lib/data/page/PageAction.class.php
@@ -26,7 +26,7 @@ class PageAction extends AbstractDatabaseObjectAction implements ISearchAction,
 	protected $className = PageEditor::class;
 	
 	/**
-	 * @var PageEditor
+	 * @var	PageEditor
 	 */
 	protected $pageEditor;
 	
diff --git a/wcfsetup/install/files/lib/data/page/PageCache.class.php b/wcfsetup/install/files/lib/data/page/PageCache.class.php
index 71a61e35f3..b7fe00a97d 100644
--- a/wcfsetup/install/files/lib/data/page/PageCache.class.php
+++ b/wcfsetup/install/files/lib/data/page/PageCache.class.php
@@ -16,7 +16,7 @@ use wcf\system\SingletonFactory;
 class PageCache extends SingletonFactory {
 	/**
 	 * page cache
-	 * @var array
+	 * @var	array
 	 */
 	protected $cache;
 	
@@ -30,8 +30,8 @@ class PageCache extends SingletonFactory {
 	/**
 	 * Returns a page by page id or null.
 	 * 
-	 * @param       integer         $pageID         page id
-	 * @return      Page|null
+	 * @param	integer		$pageID		page id
+	 * @return	Page|null
 	 */
 	public function getPage($pageID) {
 		if (isset($this->cache['pages'][$pageID])) {
@@ -44,8 +44,8 @@ class PageCache extends SingletonFactory {
 	/**
 	 * Returns a page by controller or null.
 	 * 
-	 * @param       string          $controller     controller class name
-	 * @return      Page|null
+	 * @param	string		$controller	controller class name
+	 * @return	Page|null
 	 */
 	public function getPageByController($controller) {
 		if (isset($this->cache['controller'][$controller])) {
@@ -58,8 +58,8 @@ class PageCache extends SingletonFactory {
 	/**
 	 * Returns a page by its internal identifier or null.
 	 * 
-	 * @param       string          $identifier     internal identifier
-	 * @return      Page|null
+	 * @param	string		$identifier	internal identifier
+	 * @return	Page|null
 	 */
 	public function getPageByIdentifier($identifier) {
 		if (isset($this->cache['identifier'][$identifier])) {
diff --git a/wcfsetup/install/files/lib/page/CmsPage.class.php b/wcfsetup/install/files/lib/page/CmsPage.class.php
index 6ec6304cc3..9b67dfe703 100644
--- a/wcfsetup/install/files/lib/page/CmsPage.class.php
+++ b/wcfsetup/install/files/lib/page/CmsPage.class.php
@@ -19,28 +19,28 @@ use wcf\system\WCF;
  */
 class CmsPage extends AbstractPage {
 	/**
-	 * @var string[]
+	 * @var	string[]
 	 */
 	public $content;
 	
 	/**
-	 * @var integer
+	 * @var	integer
 	 */
 	public $languageID;
 	
 	/**
-	 * @var Page
+	 * @var	Page
 	 */
 	public $page;
 	
 	/**
-	 * @var integer
+	 * @var	integer
 	 */
 	public $pageID;
 	
 	/**
 	 * @inheritDoc
-	 * @throws      IllegalLinkException
+	 * @throws	IllegalLinkException
 	 */
 	public function readParameters() {
 		parent::readParameters();
diff --git a/wcfsetup/install/files/lib/system/SingletonFactory.class.php b/wcfsetup/install/files/lib/system/SingletonFactory.class.php
index c917d43bc2..6c57139c0f 100644
--- a/wcfsetup/install/files/lib/system/SingletonFactory.class.php
+++ b/wcfsetup/install/files/lib/system/SingletonFactory.class.php
@@ -15,7 +15,7 @@ use wcf\system\exception\SystemException;
 abstract class SingletonFactory {
 	/**
 	 * list of singletons
-	 * @var SingletonFactory[]
+	 * @var	SingletonFactory[]
 	 */
 	protected static $__singletonObjects = array();
 	
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index bc371f36af..718c434f92 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -64,7 +64,7 @@ if (!defined('NO_IMPORTS')) {
 class WCF {
 	/**
 	 * list of currently loaded applications
-	 * @var Application[]
+	 * @var	Application[]
 	 */
 	protected static $applications = array();
 	
diff --git a/wcfsetup/install/files/lib/system/WCFACP.class.php b/wcfsetup/install/files/lib/system/WCFACP.class.php
index b9aa7fde5e..6e0a71e7c7 100644
--- a/wcfsetup/install/files/lib/system/WCFACP.class.php
+++ b/wcfsetup/install/files/lib/system/WCFACP.class.php
@@ -27,13 +27,13 @@ use wcf\util\HeaderUtil;
 class WCFACP extends WCF {
 	/**
 	 * rescue mode
-	 * @var boolean
+	 * @var	boolean
 	 */
 	protected static $inRescueMode;
 	
 	/**
 	 * URL to WCF within rescue mode
-	 * @var string
+	 * @var	string
 	 */
 	protected static $rescueModePageURL;
 	
@@ -71,7 +71,7 @@ class WCFACP extends WCF {
 	/**
 	 * Returns true if ACP is currently in rescue mode.
 	 * 
-	 * @return      boolean
+	 * @return	boolean
 	 */
 	public static function inRescueMode() {
 		if (self::$inRescueMode === null) {
@@ -99,7 +99,7 @@ class WCFACP extends WCF {
 	/**
 	 * Returns URL for rescue mode page.
 	 * 
-	 * @return string
+	 * @return	string
 	 */
 	public static function getRescueModePageURL() {
 		if (self::inRescueMode()) {
diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php
index a382573295..73c5b8d474 100644
--- a/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@ -54,7 +54,7 @@ class WCFSetup extends WCF {
 	
 	/**
 	 * installation directories
-	 * @var string[]
+	 * @var	string[]
 	 */
 	protected static $directories = [];
 	
@@ -72,7 +72,7 @@ class WCFSetup extends WCF {
 	
 	/**
 	 * list of installed files
-	 * @var string[]
+	 * @var	string[]
 	 */
 	protected static $installedFiles = [];
 	
@@ -173,7 +173,7 @@ class WCFSetup extends WCF {
 				self::$directories[$application] = $directory;
 				
 				if ($application === 'wcf' && @file_exists(self::$directories['wcf'])) {
-					define('RELATIVE_WCF_DIR', FileUtil::getRelativePath(INSTALL_SCRIPT_DIR, self::$directories['wcf']));	
+					define('RELATIVE_WCF_DIR', FileUtil::getRelativePath(INSTALL_SCRIPT_DIR, self::$directories['wcf']));
 				}
 			}
 		}
@@ -776,7 +776,7 @@ class WCFSetup extends WCF {
 	 * 
 	 * @param	\wcf\system\database\Database	$db
 	 * @param	integer				$dbNumber
-	 * @return      string[]        list of already existing tables
+	 * @return	string[]	list of already existing tables
 	 */
 	protected function getConflictedTables($db, $dbNumber) {
 		// get content of the sql structure file
diff --git a/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php b/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php
index c7ada4dc6d..c33ce248ce 100644
--- a/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php
+++ b/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php
@@ -41,7 +41,7 @@ class ApplicationHandler extends SingletonFactory {
 	 * Returns an application based upon it's abbreviation. Will return the
 	 * primary application if $abbreviation equals to 'wcf'
 	 * 
-	 * @param       string  $abbreviation   package abbreviation, e.g. `wbb` for `com.woltlab.wbb`
+	 * @param	string		$abbreviation	package abbreviation, e.g. `wbb` for `com.woltlab.wbb`
 	 * @return	Application
 	 */
 	public function getApplication($abbreviation) {
@@ -59,8 +59,8 @@ class ApplicationHandler extends SingletonFactory {
 	/**
 	 * Returns an application by package id.
 	 * 
-	 * @param       integer         $packageID      package id
-	 * @return      Application     application object
+	 * @param	integer		$packageID	package id
+	 * @return	Application	application object
 	 * @since	2.2
 	 */
 	public function getApplicationByID($packageID) {
@@ -125,7 +125,7 @@ class ApplicationHandler extends SingletonFactory {
 	/**
 	 * Returns abbreviation for a given package id or null if application is unknown.
 	 * 
-	 * @param       int     $packageID      unique package id
+	 * @param	integer		$packageID	unique package id
 	 * @return	string
 	 */
 	public function getAbbreviation($packageID) {
diff --git a/wcfsetup/install/files/lib/system/box/BoxHandler.class.php b/wcfsetup/install/files/lib/system/box/BoxHandler.class.php
index 43c8c92709..dce7219d68 100644
--- a/wcfsetup/install/files/lib/system/box/BoxHandler.class.php
+++ b/wcfsetup/install/files/lib/system/box/BoxHandler.class.php
@@ -18,7 +18,7 @@ use wcf\system\SingletonFactory;
 class BoxHandler extends SingletonFactory {
 	/**
 	 * boxes grouped by position
-	 * @var Box[][]
+	 * @var	Box[][]
 	 */
 	protected $boxes = [];
 	
@@ -39,8 +39,8 @@ class BoxHandler extends SingletonFactory {
 	/**
 	 * Returns boxes for the given position.
 	 * 
-	 * @param       string          $position
-	 * @return      Box[]
+	 * @param	string		$position
+	 * @return	Box[]
 	 */
 	public function getBoxes($position) {
 		if (isset($this->boxes[$position])) {
diff --git a/wcfsetup/install/files/lib/system/breadcrumb/Breadcrumbs.class.php b/wcfsetup/install/files/lib/system/breadcrumb/Breadcrumbs.class.php
index f868223aea..39e49809d1 100644
--- a/wcfsetup/install/files/lib/system/breadcrumb/Breadcrumbs.class.php
+++ b/wcfsetup/install/files/lib/system/breadcrumb/Breadcrumbs.class.php
@@ -15,7 +15,7 @@ use wcf\system\SingletonFactory;
 class Breadcrumbs extends SingletonFactory implements \Countable, \Iterator {
 	/**
 	 * list of breadcrumbs
-	 * @var Breadcrumb[]
+	 * @var	Breadcrumb[]
 	 */
 	protected $items = [];
 	
diff --git a/wcfsetup/install/files/lib/system/cache/builder/MenuCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/MenuCacheBuilder.class.php
index 043bf99cbc..320c3cf44c 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/MenuCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/MenuCacheBuilder.class.php
@@ -13,7 +13,7 @@ use wcf\data\menu\MenuList;
  * @package	com.woltlab.wcf
  * @subpackage	system.cache.builder
  * @category	Community Framework
- * @since       2.2
+ * @since	2.2
  */
 class MenuCacheBuilder extends AbstractCacheBuilder {
 	/**
diff --git a/wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php
index 0ea83ed0d8..5fc0428c45 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/RoutingCacheBuilder.class.php
@@ -36,7 +36,7 @@ class RoutingCacheBuilder extends AbstractCacheBuilder {
 	 * and environment level to prevent any issues with controllers with the same name but
 	 * correct spelling to be incorrectly handled.
 	 * 
-	 * @return      array
+	 * @return	array
 	 */
 	protected function getCaseInsensitiveControllers() {
 		$data = [
@@ -94,7 +94,7 @@ class RoutingCacheBuilder extends AbstractCacheBuilder {
 	 * Builds up a lookup and a reverse lookup list per application in order to resolve
 	 * custom page mappings.
 	 * 
-	 * @return      array
+	 * @return	array
 	 */
 	protected function getCustomUrls() {
 		$data = [
@@ -107,9 +107,9 @@ class RoutingCacheBuilder extends AbstractCacheBuilder {
 		}
 		
 		// fetch pages with a controller and a custom url
-		$sql = "SELECT  controller, controllerCustomURL, packageID
-			FROM    wcf".WCF_N."_page
-			WHERE   controller <> ''
+		$sql = "SELECT	controller, controllerCustomURL, packageID
+			FROM	wcf".WCF_N."_page
+			WHERE	controller <> ''
 				AND controllerCustomURL <> ''";
 		$statement = WCF::getDB()->prepareStatement($sql);
 		$statement->execute();
@@ -119,10 +119,10 @@ class RoutingCacheBuilder extends AbstractCacheBuilder {
 		}
 		
 		// fetch content pages using the common page controller
-		$sql = "SELECT  	page_content.customURL AS controllerCustomURL, page_content.pageID, page_content.languageID, page.packageID
-			FROM    	wcf".WCF_N."_page_content page_content
-			LEFT JOIN       wcf".WCF_N."_page page
-			ON              (page.pageID = page_content.pageID)";
+		$sql = "SELECT		page_content.customURL AS controllerCustomURL, page_content.pageID, page_content.languageID, page.packageID
+			FROM		wcf".WCF_N."_page_content page_content
+			LEFT JOIN	wcf".WCF_N."_page page
+			ON		(page.pageID = page_content.pageID)";
 		$statement = WCF::getDB()->prepareStatement($sql);
 		$statement->execute();
 		while ($row = $statement->fetchArray()) {
@@ -159,7 +159,7 @@ class RoutingCacheBuilder extends AbstractCacheBuilder {
 	/**
 	 * Returns the list of landing pages per application.
 	 * 
-	 * @return      string[]
+	 * @return	string[]
 	 */
 	protected function getLandingPages() {
 		$data = [];
diff --git a/wcfsetup/install/files/lib/system/event/EventHandler.class.php b/wcfsetup/install/files/lib/system/event/EventHandler.class.php
index 56e5e15ba4..cf24bce1b5 100644
--- a/wcfsetup/install/files/lib/system/event/EventHandler.class.php
+++ b/wcfsetup/install/files/lib/system/event/EventHandler.class.php
@@ -79,7 +79,7 @@ class EventHandler extends SingletonFactory {
 	 * @param	string		$className
 	 * @param	string		$name
 	 * @param	array		&$parameters
-	 * @throws      SystemException
+	 * @throws	SystemException
 	 */
 	protected function executeInheritedActions($eventObj, $eventName, $className, $name, array &$parameters) {
 		// create objects of the actions
@@ -158,7 +158,7 @@ class EventHandler extends SingletonFactory {
 	 * @param	mixed		$eventObj
 	 * @param	string		$eventName
 	 * @param	array		&$parameters
-	 * @throws      SystemException
+	 * @throws	SystemException
 	 */
 	public function fireAction($eventObj, $eventName, array &$parameters = array()) {
 		// get class name
@@ -236,7 +236,7 @@ class EventHandler extends SingletonFactory {
 	 * 
 	 * @param	string  $className
 	 * @param	string  $eventName
-	 * @return      string  unique action name
+	 * @return	string  unique action name
 	 */
 	public static function generateKey($className, $eventName) {
 		return $eventName.'@'.$className;
diff --git a/wcfsetup/install/files/lib/system/html/input/HtmlInputProcessor.class.php b/wcfsetup/install/files/lib/system/html/input/HtmlInputProcessor.class.php
index 53a13dc2dd..aa5e557dfc 100644
--- a/wcfsetup/install/files/lib/system/html/input/HtmlInputProcessor.class.php
+++ b/wcfsetup/install/files/lib/system/html/input/HtmlInputProcessor.class.php
@@ -10,12 +10,12 @@ use wcf\system\html\input\node\HtmlInputNodeProcessor;
  */
 class HtmlInputProcessor {
 	/**
-	 * @var IHtmlInputFilter
+	 * @var	IHtmlInputFilter
 	 */
 	protected $htmlInputFilter;
 	
 	/**
-	 * @var HtmlInputNodeProcessor
+	 * @var	HtmlInputNodeProcessor
 	 */
 	protected $htmlInputNodeProcessor;
 	
@@ -35,7 +35,7 @@ class HtmlInputProcessor {
 	}
 	
 	/**
-	 * @return IHtmlInputFilter|MessageHtmlInputFilter
+	 * @return	IHtmlInputFilter|MessageHtmlInputFilter
 	 */
 	public function getHtmlInputFilter() {
 		if ($this->htmlInputFilter === null) {
@@ -50,7 +50,7 @@ class HtmlInputProcessor {
 	}
 	
 	/**
-	 * @return HtmlInputNodeProcessor
+	 * @return	HtmlInputNodeProcessor
 	 */
 	public function getHtmlInputNodeProcessor() {
 		if ($this->htmlInputNodeProcessor === null) {
diff --git a/wcfsetup/install/files/lib/system/html/input/filter/IHtmlInputFilter.class.php b/wcfsetup/install/files/lib/system/html/input/filter/IHtmlInputFilter.class.php
index be1ceb60b4..25da34f0d7 100644
--- a/wcfsetup/install/files/lib/system/html/input/filter/IHtmlInputFilter.class.php
+++ b/wcfsetup/install/files/lib/system/html/input/filter/IHtmlInputFilter.class.php
@@ -9,8 +9,8 @@ interface IHtmlInputFilter {
 	/**
 	 * Applies filters on unsafe html.
 	 * 
-	 * @param       string  $html   unsafe html
-	 * @return      string  filtered html
+	 * @param	string		$html		unsafe html
+	 * @return	string		filtered html
 	 */
 	public function apply($html);
 }
diff --git a/wcfsetup/install/files/lib/system/html/input/filter/MessageHtmlInputFilter.class.php b/wcfsetup/install/files/lib/system/html/input/filter/MessageHtmlInputFilter.class.php
index 3522e40bbe..c18f967195 100644
--- a/wcfsetup/install/files/lib/system/html/input/filter/MessageHtmlInputFilter.class.php
+++ b/wcfsetup/install/files/lib/system/html/input/filter/MessageHtmlInputFilter.class.php
@@ -7,7 +7,7 @@ namespace wcf\system\html\input\filter;
  */
 class MessageHtmlInputFilter implements IHtmlInputFilter {
 	/**
-	 * @var \HTMLPurifier
+	 * @var	\HTMLPurifier
 	 */
 	protected static $purifier;
 	
@@ -16,7 +16,7 @@ class MessageHtmlInputFilter implements IHtmlInputFilter {
 	}
 	
 	/**
-	 * @return      \HTMLPurifier
+	 * @return	\HTMLPurifier
 	 */
 	protected function getPurifier() {
 		if (self::$purifier === null) {
diff --git a/wcfsetup/install/files/lib/system/html/node/HtmlNodeProcessor.class.php b/wcfsetup/install/files/lib/system/html/node/HtmlNodeProcessor.class.php
index 3fd8bdc656..4460d06df0 100644
--- a/wcfsetup/install/files/lib/system/html/node/HtmlNodeProcessor.class.php
+++ b/wcfsetup/install/files/lib/system/html/node/HtmlNodeProcessor.class.php
@@ -7,7 +7,7 @@ namespace wcf\system\html\node;
  */
 class HtmlNodeProcessor {
 	/**
-	 * @var \DOMDocument
+	 * @var	\DOMDocument
 	 */
 	protected $document;
 	
diff --git a/wcfsetup/install/files/lib/system/html/output/HtmlOutputProcessor.class.php b/wcfsetup/install/files/lib/system/html/output/HtmlOutputProcessor.class.php
index 6c9e477251..c9774151d3 100644
--- a/wcfsetup/install/files/lib/system/html/output/HtmlOutputProcessor.class.php
+++ b/wcfsetup/install/files/lib/system/html/output/HtmlOutputProcessor.class.php
@@ -7,7 +7,7 @@ namespace wcf\system\html\output;
  */
 class HtmlOutputProcessor {
 	/**
-	 * @var HtmlOutputNodeProcessor
+	 * @var	HtmlOutputNodeProcessor
 	 */
 	protected $htmlOutputNodeProcessor;
 	
diff --git a/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeWoltlabMention.class.php b/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeWoltlabMention.class.php
index cb3dd4481c..d29a499a97 100644
--- a/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeWoltlabMention.class.php
+++ b/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeWoltlabMention.class.php
@@ -12,7 +12,7 @@ use wcf\util\StringUtil;
  */
 class HtmlOutputNodeWoltlabMention implements IHtmlOutputNode {
 	/**
-	 * @var UserProfile[]
+	 * @var	UserProfile[]
 	 */
 	protected $userProfiles;
 	
diff --git a/wcfsetup/install/files/lib/system/importer/AbstractACLImporter.class.php b/wcfsetup/install/files/lib/system/importer/AbstractACLImporter.class.php
index 2a92f92a64..5c81f854eb 100644
--- a/wcfsetup/install/files/lib/system/importer/AbstractACLImporter.class.php
+++ b/wcfsetup/install/files/lib/system/importer/AbstractACLImporter.class.php
@@ -62,7 +62,7 @@ class AbstractACLImporter extends AbstractImporter {
 			
 			$sql = "INSERT IGNORE INTO	wcf".WCF_N."_acl_option_to_group
 							(optionID, objectID, groupID, optionValue)
-				VALUES		        (?, ?, ?, ?)";
+				VALUES			(?, ?, ?, ?)";
 			$statement = WCF::getDB()->prepareStatement($sql);
 			$statement->execute(array($data['optionID'], $data['objectID'], $data['groupID'], $data['optionValue']));
 			
@@ -74,7 +74,7 @@ class AbstractACLImporter extends AbstractImporter {
 				
 			$sql = "INSERT IGNORE INTO	wcf".WCF_N."_acl_option_to_user
 							(optionID, objectID, userID, optionValue)
-				VALUES		        (?, ?, ?, ?)";
+				VALUES			(?, ?, ?, ?)";
 			$statement = WCF::getDB()->prepareStatement($sql);
 			$statement->execute(array($data['optionID'], $data['objectID'], $data['userID'], $data['optionValue']));
 				
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 f1b1ebd933..a19c065f06 100644
--- a/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php
+++ b/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php
@@ -20,7 +20,7 @@ use wcf\system\menu\TreeMenu;
 class PageMenu extends TreeMenu {
 	/**
 	 * @inheritDoc
-	 * @throws      SystemException
+	 * @throws	SystemException
 	 */
 	protected function init() {
 		// get menu items from cache
diff --git a/wcfsetup/install/files/lib/system/menu/user/profile/UserProfileMenu.class.php b/wcfsetup/install/files/lib/system/menu/user/profile/UserProfileMenu.class.php
index f3bbfdd01e..552c6f2f47 100644
--- a/wcfsetup/install/files/lib/system/menu/user/profile/UserProfileMenu.class.php
+++ b/wcfsetup/install/files/lib/system/menu/user/profile/UserProfileMenu.class.php
@@ -68,7 +68,7 @@ class UserProfileMenu extends SingletonFactory {
 	/**
 	 * Checks the options and permissions of given menu item.
 	 * 
-	 * @param	UserProfileMenuItem     $item
+	 * @param	UserProfileMenuItem	$item
 	 * @return	boolean
 	 */
 	protected function checkMenuItem(UserProfileMenuItem $item) {
diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
index 3c64393e89..287d1b5db4 100644
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
@@ -304,8 +304,8 @@ class PackageInstallationDispatcher {
 	/**
 	 * Installs current package.
 	 * 
-	 * @param	mixed[]         $nodeData
-	 * @return      PackageInstallationStep
+	 * @param	mixed[]		$nodeData
+	 * @return	PackageInstallationStep
 	 */
 	protected function installPackage(array $nodeData) {
 		$installationStep = new PackageInstallationStep();
@@ -532,7 +532,7 @@ class PackageInstallationDispatcher {
 	/**
 	 * Executes a package installation plugin.
 	 * 
-	 * @param	mixed[]         $nodeData
+	 * @param	mixed[]	$nodeData
 	 * @return	boolean
 	 */
 	protected function executePIP(array $nodeData) {
diff --git a/wcfsetup/install/files/lib/system/package/plugin/BoxPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/BoxPackageInstallationPlugin.class.php
index beb5f9b4df..99ddba59b2 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/BoxPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/BoxPackageInstallationPlugin.class.php
@@ -30,8 +30,8 @@ class BoxPackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
 	 * @inheritDoc
 	 */
 	protected function handleDelete(array $items) {
-		$sql = "DELETE FROM     wcf".WCF_N."_box
-			WHERE           identifier = ?
+		$sql = "DELETE FROM	wcf".WCF_N."_box
+			WHERE		identifier = ?
 					AND packageID = ?";
 		$statement = WCF::getDB()->prepareStatement($sql);
 		
@@ -47,7 +47,7 @@ class BoxPackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
 	
 	/**
 	 * @inheritDoc
-	 * @throws      SystemException
+	 * @throws	SystemException
 	 */
 	protected function getElement(\DOMXPath $xpath, array &$elements, \DOMElement $element) {
 		$nodeValue = $element->nodeValue;
@@ -91,7 +91,7 @@ class BoxPackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
 	
 	/**
 	 * @inheritDoc
-	 * @throws      SystemException
+	 * @throws	SystemException
 	 */
 	protected function prepareImport(array $data) {
 		$boxType = $data['elements']['boxtype'];
@@ -177,12 +177,12 @@ class BoxPackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
 	 * Returns the show order for a new item that will append it to the current
 	 * menu or parent item.
 	 *
-	 * @param       string  $position       box position
-	 * @return      integer
+	 * @param	string		$position	box position
+	 * @return	integer
 	 */
 	protected function getItemOrder($position) {
 		$sql = "SELECT  MAX(showOrder) AS showOrder
-			FROM    wcf".WCF_N."_box
+			FROM	wcf".WCF_N."_box
 			WHERE   position = ?";
 		$statement = WCF::getDB()->prepareStatement($sql, 1);
 		$statement->execute([$position]);
diff --git a/wcfsetup/install/files/lib/system/package/plugin/MenuItemPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/MenuItemPackageInstallationPlugin.class.php
index 6fa6fafc54..f182713164 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/MenuItemPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/MenuItemPackageInstallationPlugin.class.php
@@ -31,8 +31,8 @@ class MenuItemPackageInstallationPlugin extends AbstractXMLPackageInstallationPl
 	 * @inheritDoc
 	 */
 	protected function handleDelete(array $items) {
-		$sql = "DELETE FROM     wcf".WCF_N."_menu_item
-			WHERE           identifier = ?
+		$sql = "DELETE FROM	wcf".WCF_N."_menu_item
+			WHERE		identifier = ?
 					AND packageID = ?";
 		$statement = WCF::getDB()->prepareStatement($sql);
 		
@@ -48,7 +48,7 @@ class MenuItemPackageInstallationPlugin extends AbstractXMLPackageInstallationPl
 	
 	/**
 	 * @inheritDoc
-	 * @throws      SystemException
+	 * @throws	SystemException
 	 */
 	protected function getElement(\DOMXPath $xpath, array &$elements, \DOMElement $element) {
 		$nodeValue = $element->nodeValue;
@@ -70,14 +70,14 @@ class MenuItemPackageInstallationPlugin extends AbstractXMLPackageInstallationPl
 	
 	/**
 	 * @inheritDoc
-	 * @throws      SystemException
+	 * @throws	SystemException
 	 */
 	protected function prepareImport(array $data) {
 		$menuID = null;
 		if (!empty($data['elements']['menu'])) {
-			$sql = "SELECT  menuID
-				FROM    wcf".WCF_N."_menu
-				WHERE   identifier = ?";
+			$sql = "SELECT	menuID
+				FROM	wcf".WCF_N."_menu
+				WHERE	identifier = ?";
 			$statement = WCF::getDB()->prepareStatement($sql, 1);
 			$statement->execute([$data['elements']['menu']]);
 			$row = $statement->fetchSingleRow();
@@ -94,9 +94,9 @@ class MenuItemPackageInstallationPlugin extends AbstractXMLPackageInstallationPl
 				throw new SystemException("The menu item '" . $data['attributes']['identifier'] . "' can either have an associated menu or a parent menu item, but not both.");
 			}
 			
-			$sql = "SELECT  *
-				FROM    wcf".WCF_N."_menu_item
-				WHERE   identifier = ?";
+			$sql = "SELECT	*
+				FROM	wcf".WCF_N."_menu_item
+				WHERE	identifier = ?";
 			$statement = WCF::getDB()->prepareStatement($sql, 1);
 			$statement->execute([$data['elements']['parent']]);
 			$parent = $statement->fetchObject(MenuItem::class);
@@ -114,9 +114,9 @@ class MenuItemPackageInstallationPlugin extends AbstractXMLPackageInstallationPl
 		
 		$pageID = null;
 		if (!empty($data['elements']['page'])) {
-			$sql = "SELECT  pageID
-				FROM    wcf".WCF_N."_page
-				WHERE   identifier = ?";
+			$sql = "SELECT	pageID
+				FROM	wcf".WCF_N."_page
+				WHERE	identifier = ?";
 			$statement = WCF::getDB()->prepareStatement($sql, 1);
 			$statement->execute([$data['elements']['page']]);
 			$row = $statement->fetchSingleRow();
@@ -184,15 +184,15 @@ class MenuItemPackageInstallationPlugin extends AbstractXMLPackageInstallationPl
 	 * Returns the show order for a new item that will append it to the current
 	 * menu or parent item.
 	 * 
-	 * @param       int     $menuID
-	 * @param       int     $parentItemID
-	 * @return      int
-	 * @throws      \wcf\system\database\DatabaseException
+	 * @param	integer		$menuID
+	 * @param	integer		$parentItemID
+	 * @return	integer
+	 * @throws	\wcf\system\database\DatabaseException
 	 */
 	protected function getItemOrder($menuID, $parentItemID = null) {
-		$sql = "SELECT  MAX(showOrder) AS showOrder
-			FROM    wcf".WCF_N."_menu_item
-			WHERE   " . ($parentItemID === null ? 'menuID' : 'parentItemID') . " = ?";
+		$sql = "SELECT	MAX(showOrder) AS showOrder
+			FROM	wcf".WCF_N."_menu_item
+			WHERE	" . ($parentItemID === null ? 'menuID' : 'parentItemID') . " = ?";
 		$statement = WCF::getDB()->prepareStatement($sql, 1);
 		$statement->execute([
 			($parentItemID === null ? $menuID : $parentItemID)
diff --git a/wcfsetup/install/files/lib/system/package/plugin/MenuPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/MenuPackageInstallationPlugin.class.php
index 468b244388..27f3bb872e 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/MenuPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/MenuPackageInstallationPlugin.class.php
@@ -23,7 +23,7 @@ use wcf\system\WCF;
 class MenuPackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin {
 	/**
 	 * box meta data per menu
-	 * @var string[]
+	 * @var	string[]
 	 */
 	public $boxData = [];
 	
@@ -41,8 +41,8 @@ class MenuPackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
 	 * @inheritDoc
 	 */
 	protected function handleDelete(array $items) {
-		$sql = "DELETE FROM     wcf".WCF_N."_menu
-			WHERE           identifier = ?
+		$sql = "DELETE FROM	wcf".WCF_N."_menu
+			WHERE		identifier = ?
 					AND packageID = ?";
 		$statement = WCF::getDB()->prepareStatement($sql);
 		
@@ -58,7 +58,7 @@ class MenuPackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
 	
 	/**
 	 * @inheritDoc
-	 * @throws      SystemException
+	 * @throws	SystemException
 	 */
 	protected function getElement(\DOMXPath $xpath, array &$elements, \DOMElement $element) {
 		$nodeValue = $element->nodeValue;
@@ -179,8 +179,8 @@ class MenuPackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
 		$conditions->add("identifier IN (?)", [array_keys($this->boxData)]);
 		$conditions->add("packageID = ?", [$this->installation->getPackageID()]);
 		
-		$sql = "SELECT  *
-			FROM    wcf".WCF_N."_box
+		$sql = "SELECT	*
+			FROM	wcf".WCF_N."_box
 			".$conditions;
 		$statement = WCF::getDB()->prepareStatement($sql);
 		$statement->execute($conditions->getParameters());
diff --git a/wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php
index 48f7b5f3cb..9e94ddabec 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php
@@ -38,8 +38,8 @@ class PagePackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
 	 * @inheritDoc
 	 */
 	protected function handleDelete(array $items) {
-		$sql = "DELETE FROM     wcf".WCF_N."_page
-			WHERE           identifier = ?
+		$sql = "DELETE FROM	wcf".WCF_N."_page
+			WHERE		identifier = ?
 					AND packageID = ?";
 		$statement = WCF::getDB()->prepareStatement($sql);
 		
@@ -84,7 +84,7 @@ class PagePackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
 	
 	/**
 	 * @inheritDoc
-	 * @throws      SystemException
+	 * @throws	SystemException
 	 */
 	protected function prepareImport(array $data) {
 		$isStatic = false;
@@ -126,9 +126,9 @@ class PagePackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
 		
 		$parentPageID = null;
 		if (!empty($data['elements']['parent'])) {
-			$sql = "SELECT  pageID
-				FROM    wcf".WCF_N."_".$this->tableName."
-				WHERE   identifier = ?";
+			$sql = "SELECT	pageID
+				FROM	wcf".WCF_N."_".$this->tableName."
+				WHERE	identifier = ?";
 			$statement = WCF::getDB()->prepareStatement($sql, 1);
 			$statement->execute([$data['elements']['parent']]);
 			$row = $statement->fetchSingleRow();
@@ -212,9 +212,9 @@ class PagePackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin
 	 */
 	protected function postImport() {
 		if (!empty($this->content)) {
-			$sql = "INSERT IGNORE INTO      wcf".WCF_N."_page_content
+			$sql = "INSERT IGNORE INTO	wcf".WCF_N."_page_content
 							(pageID, languageID, title, content, metaDescription, metaKeywords, customURL)
-				VALUES                  (?, ?, ?, ?, ?, ?, ?)";
+				VALUES			(?, ?, ?, ?, ?, ?, ?)";
 			$statement = WCF::getDB()->prepareStatement($sql);
 			
 			WCF::getDB()->beginTransaction();
diff --git a/wcfsetup/install/files/lib/system/page/PageLocationManager.class.php b/wcfsetup/install/files/lib/system/page/PageLocationManager.class.php
index 716612a96b..9abe47564c 100644
--- a/wcfsetup/install/files/lib/system/page/PageLocationManager.class.php
+++ b/wcfsetup/install/files/lib/system/page/PageLocationManager.class.php
@@ -18,7 +18,7 @@ use wcf\system\SingletonFactory;
 class PageLocationManager extends SingletonFactory {
 	/**
 	 * list of locations with descending priority
-	 * @var array
+	 * @var	array
 	 */
 	protected $stack = [];
 	
@@ -54,9 +54,9 @@ class PageLocationManager extends SingletonFactory {
 	 * Appends a parent location to the stack, the later it is added the lower
 	 * is its assumed priority when matching suitable menu items.
 	 * 
-	 * @param       string          $identifier     internal page identifier
-	 * @param       integer         $pageObjectID   page object id
-	 * @throws      SystemException
+	 * @param	string		$identifier	internal page identifier
+	 * @param	integer		$pageObjectID	page object id
+	 * @throws	SystemException
 	 */
 	public function addParentLocation($identifier, $pageObjectID = 0) {
 		$page = PageCache::getInstance()->getPageByIdentifier($identifier);
@@ -73,7 +73,7 @@ class PageLocationManager extends SingletonFactory {
 	/**
 	 * Returns the list of locations with descending priority.
 	 * 
-	 * @return      array
+	 * @return	array
 	 */
 	public function getLocations() {
 		return $this->stack;
diff --git a/wcfsetup/install/files/lib/system/page/handler/ILookupPageHandler.class.php b/wcfsetup/install/files/lib/system/page/handler/ILookupPageHandler.class.php
index 5eb6f9170e..5ec0c4fa72 100644
--- a/wcfsetup/install/files/lib/system/page/handler/ILookupPageHandler.class.php
+++ b/wcfsetup/install/files/lib/system/page/handler/ILookupPageHandler.class.php
@@ -17,16 +17,16 @@ interface ILookupPageHandler extends IMenuPageHandler {
 	/**
 	 * Returns the link for a page with an object id.
 	 * 
-	 * @param       integer         $objectID       page object id
-	 * @return      string          page url
+	 * @param	integer		$objectID	page object id
+	 * @return	string		page url
 	 */
 	public function getLink($objectID);
 	
 	/**
 	 * Returns true if provided object id exists and is valid.
 	 * 
-	 * @param       integer         $objectID       page object id
-	 * @return      boolean         true if object id is valid
+	 * @param	integer		$objectID	page object id
+	 * @return	boolean		true if object id is valid
 	 */
 	public function isValid($objectID);
 	
@@ -34,8 +34,8 @@ interface ILookupPageHandler extends IMenuPageHandler {
 	 * Performs a search for pages using a query string, returning an array containing
 	 * an `objectID => title` relation.
 	 * 
-	 * @param       string          $searchString   search string
-	 * @return      string[]
+	 * @param	string		$searchString	search string
+	 * @return	string[]
 	 */
 	public function lookup($searchString);
 }
diff --git a/wcfsetup/install/files/lib/system/page/handler/IMenuPageHandler.class.php b/wcfsetup/install/files/lib/system/page/handler/IMenuPageHandler.class.php
index c38d1fa9b5..6abc43ad6c 100644
--- a/wcfsetup/install/files/lib/system/page/handler/IMenuPageHandler.class.php
+++ b/wcfsetup/install/files/lib/system/page/handler/IMenuPageHandler.class.php
@@ -15,10 +15,10 @@ namespace wcf\system\page\handler;
 interface IMenuPageHandler {
 	/**
 	 * Returns the number of outstanding items for this page for display as a badge, optionally
-	 * specifing a corresponding object id to limit the scope.
+	 * specifying a corresponding object id to limit the scope.
 	 * 
-	 * @param       integer         $objectID       optional page object id
-	 * @return      integer         number of outstanding items
+	 * @param	integer		$objectID	optional page object id
+	 * @return	integer		number of outstanding items
 	 */
 	public function getOutstandingItemCount($objectID = null);
 	
@@ -26,8 +26,8 @@ interface IMenuPageHandler {
 	 * Returns false if this page should be hidden from menus, but does not control the accessibility
 	 * of the page itself. The visibility can optionally be scoped to the given object id.
 	 * 
-	 * @param       integer         $objectID       optional page object id
-	 * @return      boolean         false if the page should be hidden from menus
+	 * @param	integer		$objectID	optional page object id
+	 * @return	boolean		false if the page should be hidden from menus
 	 */
 	public function isVisible($objectID = null);
 }
diff --git a/wcfsetup/install/files/lib/system/request/ControllerMap.class.php b/wcfsetup/install/files/lib/system/request/ControllerMap.class.php
index 6921885348..063b3e38e0 100644
--- a/wcfsetup/install/files/lib/system/request/ControllerMap.class.php
+++ b/wcfsetup/install/files/lib/system/request/ControllerMap.class.php
@@ -20,29 +20,29 @@ use wcf\system\WCF;
  */
 class ControllerMap extends SingletonFactory {
 	/**
-	 * @var string[][]
+	 * @var	string[][]
 	 */
 	protected $ciControllers;
 	
 	/**
-	 * @var string[][]
+	 * @var	string[][]
 	 */
 	protected $customUrls;
 	
 	/**
-	 * @var string[]
+	 * @var	string[]
 	 */
 	protected $landingPages;
 	
 	/**
 	 * list of <ControllerName> to <controller-name> mappings
-	 * @var array<string>
+	 * @var	string[]
 	 */
 	protected $lookupCache = [];
 	
 	/**
 	 * @inheritDoc
-	 * @throws      SystemException
+	 * @throws	SystemException
 	 */
 	protected function init() {
 		$this->ciControllers = RoutingCacheBuilder::getInstance()->getData([], 'ciControllers');
@@ -55,11 +55,11 @@ class ControllerMap extends SingletonFactory {
 	 * 
 	 * URL -> Controller
 	 * 
-	 * @param       string          $application    application identifier
-	 * @param       string          $controller     url controller
-	 * @param       boolean         $isAcpRequest   true if this is an ACP request
-	 * @return      mixed           array containing className, controller and pageType or a string containing the controller name for aliased controllers
-	 * @throws      SystemException
+	 * @param	string		$application	application identifier
+	 * @param	string		$controller	url controller
+	 * @param	boolean		$isAcpRequest	true if this is an ACP request
+	 * @return	mixed	array containing className, controller and pageType or a string containing the controller name for aliased controllers
+	 * @throws	SystemException
 	 */
 	public function resolve($application, $controller, $isAcpRequest) {
 		// validate controller
@@ -103,9 +103,9 @@ class ControllerMap extends SingletonFactory {
 	 * 
 	 * URL -> Controller
 	 * 
-	 * @param       string  $application    application identifier
-	 * @param       string  $controller     url controller
-	 * @return      array   empty array if there is no exact match
+	 * @param	string		$application	application identifier
+	 * @param	string		$controller	url controller
+	 * @return	array		empty array if there is no exact match
 	 */
 	public function resolveCustomController($application, $controller) {
 		if (isset($this->customUrls['lookup'][$application]) && isset($this->customUrls['lookup'][$application][$controller])) {
@@ -140,9 +140,9 @@ class ControllerMap extends SingletonFactory {
 	 * 
 	 * Controller -> URL
 	 * 
-	 * @param       string          $application    application identifier
-	 * @param       string          $controller     controller class, e.g. 'MembersList'
-	 * @return      string          url representation of controller, e.g. 'members-list'
+	 * @param	string		$application	application identifier
+	 * @param	string		$controller	controller class, e.g. 'MembersList'
+	 * @return	string		url representation of controller, e.g. 'members-list'
 	 */
 	public function lookup($application, $controller) {
 		$lookupKey = $application . '-' . $controller;
@@ -167,9 +167,9 @@ class ControllerMap extends SingletonFactory {
 	 * Looks up a cms page URL, returns an array containing the application identifier
 	 * and url controller name or null if there was no match.
 	 * 
-	 * @param       integer         $pageID         page id
-	 * @param       integer         $languageID     content language id
-	 * @return      string[]|null
+	 * @param	integer		$pageID		page id
+	 * @param	integer		$languageID	content language id
+	 * @return	string[]|null
 	 */
 	public function lookupCmsPage($pageID, $languageID) {
 		$key = '__WCF_CMS__' . $pageID . '-' . ($languageID ?: 0);
@@ -188,8 +188,8 @@ class ControllerMap extends SingletonFactory {
 	/**
 	 * Lookups default controller for given application.
 	 * 
-	 * @param       string  $application    application identifier
-	 * @return      null|string[]           default controller
+	 * @param	string		$application	application identifier
+	 * @return	null|string[]	default controller
 	 */
 	public function lookupDefaultController($application) {
 		$controller = $this->landingPages[$application][1];
@@ -226,9 +226,9 @@ class ControllerMap extends SingletonFactory {
 	/**
 	 * Returns true if given controller is the application's default.
 	 * 
-	 * @param       string  $application    application identifier
-	 * @param       string  $controller     url controller name
-	 * @return      boolean true if controller is the application's default
+	 * @param	string		$application	application identifier
+	 * @param	string		$controller	url controller name
+	 * @return	boolean		true if controller is the application's default
 	 */
 	public function isDefaultController($application, $controller) {
 		// lookup custom urls first
@@ -251,11 +251,11 @@ class ControllerMap extends SingletonFactory {
 	 * Returns the class data for the active request or null if for the given
 	 * configuration no proper class exist.
 	 *
-	 * @param	string		$application    application identifier
-	 * @param	string		$controller     controller name
-	 * @param       boolean         $isAcpRequest   true if this is an ACP request
-	 * @param	string		$pageType       page type, e.g. 'form' or 'action'
-	 * @return	string[]        className, controller and pageType
+	 * @param	string		$application	application identifier
+	 * @param	string		$controller	controller name
+	 * @param	boolean		$isAcpRequest	true if this is an ACP request
+	 * @param	string		$pageType	page type, e.g. 'form' or 'action'
+	 * @return	string[]	className, controller and pageType
 	 */
 	protected function getClassData($application, $controller, $isAcpRequest, $pageType) {
 		$className = $application . '\\' . ($isAcpRequest ? 'acp\\' : '') . $pageType . '\\' . $controller . ucfirst($pageType);
@@ -286,8 +286,8 @@ class ControllerMap extends SingletonFactory {
 	/**
 	 * Transforms a controller into its URL representation.
 	 *
-	 * @param       string  $controller     controller, e.g. 'BoardList'
-	 * @return      string  url representation, e.g. 'board-list'
+	 * @param	string		$controller	controller, e.g. 'BoardList'
+	 * @return	string		url representation, e.g. 'board-list'
 	 */
 	public static function transformController($controller) {
 		$parts = preg_split('~([A-Z][a-z0-9]+)~', $controller, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
diff --git a/wcfsetup/install/files/lib/system/request/Request.class.php b/wcfsetup/install/files/lib/system/request/Request.class.php
index eee94c01e2..9c80572c12 100644
--- a/wcfsetup/install/files/lib/system/request/Request.class.php
+++ b/wcfsetup/install/files/lib/system/request/Request.class.php
@@ -20,7 +20,7 @@ class Request {
 	
 	/**
 	 * request meta data
-	 * @var string[]
+	 * @var	string[]
 	 */
 	protected $metaData;
 	
@@ -45,10 +45,10 @@ class Request {
 	/**
 	 * Creates a new request object.
 	 * 
-	 * @param	string		$className      fully qualified name
-	 * @param	string		$pageName       class name
-	 * @param	string		$pageType       can be 'action', 'form' or 'page'
-	 * @param       string[]        $metaData       additional meta data
+	 * @param	string		$className	fully qualified name
+	 * @param	string		$pageName	class name
+	 * @param	string		$pageType	can be 'action', 'form' or 'page'
+	 * @param	string[]	$metaData	additional meta data
 	 */
 	public function __construct($className, $pageName, $pageType, array $metaData) {
 		$this->className = $className;
diff --git a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
index df6ae2b03b..b601080418 100644
--- a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
+++ b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
@@ -52,9 +52,9 @@ class RequestHandler extends SingletonFactory {
 	 *
 	 * @param	string		$application
 	 * @param	boolean		$isACPRequest
-	 * @throws      AJAXException
-	 * @throws      IllegalLinkException
-	 * @throws      SystemException
+	 * @throws	AJAXException
+	 * @throws	IllegalLinkException
+	 * @throws	SystemException
 	 */
 	public function handle($application = 'wcf', $isACPRequest = false) {
 		try {
@@ -104,7 +104,7 @@ class RequestHandler extends SingletonFactory {
 	 * Builds a new request.
 	 * 
 	 * @param	string		$application
-	 * @throws      IllegalLinkException
+	 * @throws	IllegalLinkException
 	 */
 	protected function buildRequest($application) {
 		try {
diff --git a/wcfsetup/install/files/lib/system/request/RouteHandler.class.php b/wcfsetup/install/files/lib/system/request/RouteHandler.class.php
index 53adfae66d..5e5f0d9a9f 100644
--- a/wcfsetup/install/files/lib/system/request/RouteHandler.class.php
+++ b/wcfsetup/install/files/lib/system/request/RouteHandler.class.php
@@ -67,7 +67,7 @@ class RouteHandler extends SingletonFactory {
 	
 	/**
 	 * list of available routes
-	 * @var IRoute[]
+	 * @var	IRoute[]
 	 */
 	protected $routes = array();
 	
@@ -172,11 +172,11 @@ class RouteHandler extends SingletonFactory {
 	 * Builds a route based upon route components, this is nothing
 	 * but a reverse lookup.
 	 * 
-	 * @param       string          $application    application identifier
+	 * @param	string		$application	application identifier
 	 * @param	array		$components
 	 * @param	boolean		$isACP
 	 * @return	string
-	 * @throws      SystemException
+	 * @throws	SystemException
 	 */
 	public function buildRoute($application, array $components, $isACP = null) {
 		if ($isACP === null) $isACP = RequestHandler::getInstance()->isACPRequest();
diff --git a/wcfsetup/install/files/lib/system/request/route/IRequestRoute.class.php b/wcfsetup/install/files/lib/system/request/route/IRequestRoute.class.php
index 0ff0adc606..0245659e71 100644
--- a/wcfsetup/install/files/lib/system/request/route/IRequestRoute.class.php
+++ b/wcfsetup/install/files/lib/system/request/route/IRequestRoute.class.php
@@ -5,19 +5,19 @@ use wcf\system\request\IRoute;
 /**
  * Default interface for route implementations.
  * 
- * @author      Alexander Ebert
- * @copyright   2001-2015 WoltLab GmbH
- * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package     com.woltlab.wcf
- * @subpackage  system.request
- * @category    Community Framework
+ * @author	Alexander Ebert
+ * @copyright	2001-2015 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	system.request
+ * @category	Community Framework
  * @since	2.2
  */
 interface IRequestRoute extends IRoute {
 	/**
 	 * Configures this route to handle either ACP or frontend requests.
 	 * 
-	 * @param boolean $isACP true if route handles ACP requests
+	 * @param	boolean		$isACP		true if route handles ACP requests
 	 */
 	public function setIsACP($isACP);
 }
diff --git a/wcfsetup/install/files/lib/system/request/route/LookupRequestRoute.class.php b/wcfsetup/install/files/lib/system/request/route/LookupRequestRoute.class.php
index b42c1b6b83..e054f74e1d 100644
--- a/wcfsetup/install/files/lib/system/request/route/LookupRequestRoute.class.php
+++ b/wcfsetup/install/files/lib/system/request/route/LookupRequestRoute.class.php
@@ -20,7 +20,7 @@ use wcf\util\FileUtil;
 class LookupRequestRoute implements IRequestRoute {
 	/**
 	 * list of parsed route information
-	 * @var array
+	 * @var	array
 	 */
 	protected $routeData = [];
 	
@@ -105,7 +105,7 @@ class LookupRequestRoute implements IRequestRoute {
 	
 	/**
 	 * @inheritDoc
-	 * @throws      SystemException
+	 * @throws	SystemException
 	 */
 	public function buildLink(array $components) {
 		throw new SystemException('LookupRequestRoute cannot build links, please verify capabilities by calling canHandle() first.');
diff --git a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
index 4f1f116582..e067ec81f1 100644
--- a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
@@ -368,7 +368,7 @@ class SessionHandler extends SingletonFactory {
 	 * Returns the value of a session variable.
 	 * 
 	 * @param	string		$key
-	 * @return      mixed
+	 * @return	mixed
 	 */
 	public function getVar($key) {
 		if (isset($this->variables[$key])) {
@@ -599,8 +599,8 @@ class SessionHandler extends SingletonFactory {
 	 * Checks if the active user has the given permissions and throws a
 	 * PermissionDeniedException if that isn't the case.
 	 * 
-	 * @param       array<string>   $permissions    list of permissions where each one must pass
-	 * @throws      PermissionDeniedException
+	 * @param	string[]	$permissions	ist of permissions where each one must pass
+	 * @throws	PermissionDeniedException
 	 */
 	public function checkPermissions(array $permissions) {
 		foreach ($permissions as $permission) {
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 1c7c478ee2..5d95417bf7 100644
--- a/wcfsetup/install/files/lib/system/template/plugin/TimeModifierTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/TimeModifierTemplatePlugin.class.php
@@ -38,12 +38,12 @@ class TimeModifierTemplatePlugin implements IModifierTemplatePlugin {
 	 * Returns the relative date time identical to the relative time generated
 	 * through JavaScript.
 	 * 
-	 * @param       \DateTime       $dateTimeObject         target date object
-	 * @param       integer         $timestamp              target timestamp
-	 * @param       string          $date                   localized date
-	 * @param       string          $time                   localized time
-	 * @param       boolean         $isFutureDate           true if timestamp is in the future
-	 * @return      string          relative time
+	 * @param	\DateTime	$dateTimeObject		target date object
+	 * @param	integer		$timestamp		target timestamp
+	 * @param	string		$date			localized date
+	 * @param	string		$time			localized time
+	 * @param	boolean		$isFutureDate		true if timestamp is in the future
+	 * @return	string		relative time
 	 */
 	protected function getRelativeTime(\DateTime $dateTimeObject, $timestamp, $date, $time, $isFutureDate) {
 		if ($isFutureDate) {
diff --git a/wcfsetup/install/files/lib/system/user/notification/event/ModerationQueueCommentResponseUserNotificationEvent.class.php b/wcfsetup/install/files/lib/system/user/notification/event/ModerationQueueCommentResponseUserNotificationEvent.class.php
index ff63e0be90..78e47f1165 100644
--- a/wcfsetup/install/files/lib/system/user/notification/event/ModerationQueueCommentResponseUserNotificationEvent.class.php
+++ b/wcfsetup/install/files/lib/system/user/notification/event/ModerationQueueCommentResponseUserNotificationEvent.class.php
@@ -163,7 +163,7 @@ class ModerationQueueCommentResponseUserNotificationEvent extends AbstractShared
 	/**
 	 * Returns the language item prefix for the notification texts.
 	 * 
-	 * @return string
+	 * @return	string
 	 */
 	public function getLanguageItemPrefix() {
 		if ($this->languageItemPrefix === null) {