From d121de81bf5ab1e27b8d00451f796008577ee46a Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 29 Nov 2015 18:21:09 +0100
Subject: [PATCH] Fixed coding style/documentation issue

---
 com.woltlab.wcf/acpMenu.xml                   |  14 ++
 .../install/files/acp/templates/menuAdd.tpl   |  48 ++--
 .../files/acp/templates/menuItemAdd.tpl       | 229 +++++++++---------
 .../install/files/acp/templates/menuList.tpl  |  15 +-
 .../files/lib/acp/form/MenuAddForm.class.php  |  18 +-
 .../files/lib/acp/form/MenuEditForm.class.php |  15 +-
 .../lib/acp/form/MenuItemAddForm.class.php    |  20 +-
 .../lib/acp/form/MenuItemEditForm.class.php   |  10 +-
 .../files/lib/acp/form/PageAddForm.class.php  |  17 +-
 .../files/lib/acp/form/PageEditForm.class.php |  19 +-
 .../files/lib/data/menu/Menu.class.php        |   4 +-
 .../files/lib/data/menu/MenuAction.class.php  |  20 +-
 .../files/lib/data/menu/MenuEditor.class.php  |   4 +-
 .../files/lib/data/menu/MenuList.class.php    |   4 +-
 .../lib/data/menu/item/MenuItem.class.php     |   4 +-
 .../data/menu/item/MenuItemAction.class.php   |  22 +-
 .../data/menu/item/MenuItemEditor.class.php   |   4 +-
 .../lib/data/menu/item/MenuItemList.class.php |   4 +-
 .../lib/data/menu/item/MenuItemNode.class.php |  32 +--
 .../data/menu/item/MenuItemNodeTree.class.php |  18 +-
 .../files/lib/data/page/Page.class.php        |   6 +-
 .../files/lib/data/page/PageAction.class.php  |  22 +-
 .../files/lib/data/page/PageEditor.class.php  |   2 +-
 .../files/lib/data/page/PageList.class.php    |   2 +-
 .../files/lib/data/page/PageNode.class.php    |  32 +--
 .../lib/data/page/PageNodeTree.class.php      |  30 +--
 26 files changed, 317 insertions(+), 298 deletions(-)

diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml
index 9aa827115a..14da8edbfb 100644
--- a/com.woltlab.wcf/acpMenu.xml
+++ b/com.woltlab.wcf/acpMenu.xml
@@ -618,10 +618,24 @@
 			<permissions>admin.content.cms.canManagePage</permissions>
 		</acpmenuitem>
 		
+		<acpmenuitem name="wcf.acp.menu.link.cms.page.add">
+			<controller><![CDATA[wcf\acp\form\PageAddForm]]></controller>
+			<parent>wcf.acp.menu.link.cms.page.list</parent>
+			<permissions>admin.content.cms.canManagePage</permissions>
+			<icon>fa-plus</icon>
+		</acpmenuitem>
+		
 		<acpmenuitem name="wcf.acp.menu.link.cms.menu.list">
 			<controller><![CDATA[wcf\acp\page\MenuListPage]]></controller>
 			<parent>wcf.acp.menu.link.cms</parent>
 			<permissions>admin.content.cms.canManageMenu</permissions>
 		</acpmenuitem>
+		
+		<acpmenuitem name="wcf.acp.menu.link.cms.menu.add">
+			<controller><![CDATA[wcf\acp\form\MenuAddForm]]></controller>
+			<parent>wcf.acp.menu.link.cms.menu.list</parent>
+			<permissions>admin.content.cms.canManageMenu</permissions>
+			<icon>fa-plus</icon>
+		</acpmenuitem>
 	</import>
 </data>
diff --git a/wcfsetup/install/files/acp/templates/menuAdd.tpl b/wcfsetup/install/files/acp/templates/menuAdd.tpl
index 9178caf12f..82677d9ce2 100644
--- a/wcfsetup/install/files/acp/templates/menuAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/menuAdd.tpl
@@ -21,33 +21,31 @@
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='MenuAdd'}{/link}{else}{link controller='MenuEdit' id=$menuID}{/link}{/if}">
-	<div class="container containerPadding marginTop">
-		<fieldset>
-			<legend>{lang}wcf.global.form.data{/lang}</legend>
+	<section class="marginTop">
+		<h1>{lang}wcf.global.form.data{/lang}</h1>
 			
-			<dl{if $errorField == 'title'} class="formError"{/if}>
-				<dt><label for="title">{lang}wcf.global.title{/lang}</label></dt>
-				<dd>
-					<input type="text" id="title" name="title" value="{$i18nPlainValues['title']}" autofocus="autofocus" class="long" />
-					{if $errorField == 'title'}
-						<small class="innerError">
-							{if $errorType == 'title' || $errorType == 'multilingual'}
-								{lang}wcf.global.form.error.{@$errorType}{/lang}
-							{else}
-								{lang}wcf.acp.menu.title.error.{@$errorType}{/lang}
-							{/if}
-						</small>
-					{/if}
-					<small>{lang}wcf.acp.menu.title.description{/lang}</small>
-					{include file='multipleLanguageInputJavascript' elementIdentifier='title' forceSelection=false}
-				</dd>
-			</dl>
-			
-			{event name='dataFields'}
-		</fieldset>
+		<dl{if $errorField == 'title'} class="formError"{/if}>
+			<dt><label for="title">{lang}wcf.global.title{/lang}</label></dt>
+			<dd>
+				<input type="text" id="title" name="title" value="{$i18nPlainValues['title']}" autofocus="autofocus" class="long" />
+				{if $errorField == 'title'}
+					<small class="innerError">
+						{if $errorType == 'title' || $errorType == 'multilingual'}
+							{lang}wcf.global.form.error.{@$errorType}{/lang}
+						{else}
+							{lang}wcf.acp.menu.title.error.{@$errorType}{/lang}
+						{/if}
+					</small>
+				{/if}
+				<small>{lang}wcf.acp.menu.title.description{/lang}</small>
+				{include file='multipleLanguageInputJavascript' elementIdentifier='title' forceSelection=false}
+			</dd>
+		</dl>
 		
-		{event name='fieldsets'}
-	</div>
+		{event name='dataFields'}
+	</section>
+	
+	{event name='sections'}
 	
 	<div class="formSubmit">
 		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
diff --git a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
index ba39e750c4..a27eb1e74d 100644
--- a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
@@ -45,132 +45,129 @@
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='MenuItemAdd'}{/link}{else}{link controller='MenuItemEdit' id=$itemID}{/link}{/if}">
-	<div class="container containerPadding marginTop">
-		<fieldset>
-			<legend>{lang}wcf.acp.pageMenu.data{/lang}</legend>
+	<section class="marginTop">
+		<h1>{lang}wcf.global.form.data{/lang}</h1>
 			
-			
-			<dl{if $errorField == 'parentItemID'} class="formError"{/if}>
-				<dt><label for="parentItemID">{lang}wcf.acp.menu.item.parentItem{/lang}</label></dt>
-				<dd>
-					<select name="parentItemID" id="parentItemID">
-						<option value="0">{lang}wcf.global.noSelection{/lang}</option>
-						
-						{foreach from=$menuItemNodeList item=menuItemNode}
-							<option value="{@$menuItemNode->getMenuItem()->itemID}"{if $menuItemNode->getMenuItem()->itemID == $parentItemID} selected="selected"{/if}>{if $menuItemNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($menuItemNode->getDepth() - 1)}{/if}{lang}{$menuItemNode->getMenuItem()->title}{/lang}</option>
-						{/foreach}
-					</select>
-					{if $errorField == 'parentItemID'}
-						<small class="innerError">
-							{if $errorType == 'empty'}
-								{lang}wcf.global.form.error.empty{/lang}
-							{else}
-								{lang}wcf.acp.menu.item.parentItemID.error.{$errorType}{/lang}
-							{/if}
-						</small>
-					{/if}
-				</dd>
-			</dl>
-			
-			<dl{if $errorField == 'title'} class="formError"{/if}>
-				<dt><label for="title">{lang}wcf.global.name{/lang}</label></dt>
-				<dd>
-					<input type="text" name="title" id="title" value="{$title}" class="long" required="required" />
-					{if $errorField == 'title'}
-						<small class="innerError">
-							{if $errorType == 'multilingual'}
-								{lang}wcf.global.form.error.multilingual{/lang}
-							{else}
-								{lang}wcf.acp.menu.item.title.error.{$errorType}{/lang}
-							{/if}
-						</small>
-					{/if}
+		<dl{if $errorField == 'parentItemID'} class="formError"{/if}>
+			<dt><label for="parentItemID">{lang}wcf.acp.menu.item.parentItem{/lang}</label></dt>
+			<dd>
+				<select name="parentItemID" id="parentItemID">
+					<option value="0">{lang}wcf.global.noSelection{/lang}</option>
 					
-					{include file='multipleLanguageInputJavascript' elementIdentifier='title' forceSelection=false}
-				</dd>
-			</dl>
-			
-			{event name='dataFields'}
-		</fieldset>
+					{foreach from=$menuItemNodeList item=menuItemNode}
+						<option value="{@$menuItemNode->getMenuItem()->itemID}"{if $menuItemNode->getMenuItem()->itemID == $parentItemID} selected="selected"{/if}>{if $menuItemNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($menuItemNode->getDepth() - 1)}{/if}{lang}{$menuItemNode->getMenuItem()->title}{/lang}</option>
+					{/foreach}
+				</select>
+				{if $errorField == 'parentItemID'}
+					<small class="innerError">
+						{if $errorType == 'empty'}
+							{lang}wcf.global.form.error.empty{/lang}
+						{else}
+							{lang}wcf.acp.menu.item.parentItemID.error.{$errorType}{/lang}
+						{/if}
+					</small>
+				{/if}
+			</dd>
+		</dl>
 		
-		<fieldset>
-			<legend>{lang}wcf.acp.menu.item.link{/lang}</legend>
-			
-			<dl>
-				<dt></dt>
-				<dd class="floated">
-					<label><input type="radio" name="isInternalLink" value="1"{if $isInternalLink} checked="checked"{/if} /> {lang}wcf.acp.menu.item.link.internal{/lang}</label>
-					<label><input type="radio" name="isInternalLink" value="0"{if !$isInternalLink} checked="checked"{/if} /> {lang}wcf.acp.menu.item.link.external{/lang}</label>
-				</dd>
-			</dl>
-			
-			<dl id="pageIDContainer"{if $errorField == 'pageID'} class="formError"{/if}>
-				<dt><label for="pageID">{lang}wcf.acp.page.parentPageID{/lang}</label></dt>
-				<dd>
-					<select name="pageID" id="pageID">
-						<option value="0">{lang}wcf.global.noSelection{/lang}</option>
-						
-						{foreach from=$pageNodeList item=pageNode}
-							<option value="{@$pageNode->getPage()->pageID}"{if $pageNode->getPage()->pageID == $pageID} selected="selected"{/if}>{if $pageNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($pageNode->getDepth() - 1)}{/if}{$pageNode->getPage()->displayName}</option>
-						{/foreach}
-					</select>
-					{if $errorField == 'pageID'}
-						<small class="innerError">
-							{if $errorType == 'empty'}
-								{lang}wcf.global.form.error.empty{/lang}
-							{else}
-								{lang}wcf.acp.menu.item.pageID.error.{@$errorType}{/lang}
-							{/if}
-						</small>
-					{/if}
-				</dd>
-			</dl>
-			
-			<dl id="externalURLContainer"{if $errorField == 'externalURL'} class="formError"{/if}>
-				<dt><label for="externalURL">{lang}wcf.acp.menu.item.externalURL{/lang}</label></dt>
-				<dd>
-					<input type="text" name="externalURL" id="externalURL" value="{$externalURL}" class="long" />
-					{if $errorField == 'externalURL'}
-						<small class="innerError">
-							{if $errorType == 'empty'}
-								{lang}wcf.global.form.error.empty{/lang}
-							{else}
-								{lang}wcf.acp.menu.item.externalURL.error.{$errorType}{/lang}
-							{/if}
-						</small>
-					{/if}
+		<dl{if $errorField == 'title'} class="formError"{/if}>
+			<dt><label for="title">{lang}wcf.global.name{/lang}</label></dt>
+			<dd>
+				<input type="text" name="title" id="title" value="{$title}" class="long" required="required" />
+				{if $errorField == 'title'}
+					<small class="innerError">
+						{if $errorType == 'multilingual'}
+							{lang}wcf.global.form.error.multilingual{/lang}
+						{else}
+							{lang}wcf.acp.menu.item.title.error.{$errorType}{/lang}
+						{/if}
+					</small>
+				{/if}
+				
+				{include file='multipleLanguageInputJavascript' elementIdentifier='title' forceSelection=false}
+			</dd>
+		</dl>
+		
+		{event name='dataFields'}
+	</section>
+	
+	<section>
+		<h1>{lang}wcf.acp.menu.item.link{/lang}</h1>
+	
+		<dl>
+			<dt></dt>
+			<dd class="floated">
+				<label><input type="radio" name="isInternalLink" value="1"{if $isInternalLink} checked="checked"{/if} /> {lang}wcf.acp.menu.item.link.internal{/lang}</label>
+				<label><input type="radio" name="isInternalLink" value="0"{if !$isInternalLink} checked="checked"{/if} /> {lang}wcf.acp.menu.item.link.external{/lang}</label>
+			</dd>
+		</dl>
+		
+		<dl id="pageIDContainer"{if $errorField == 'pageID'} class="formError"{/if}>
+			<dt><label for="pageID">{lang}wcf.acp.page.parentPageID{/lang}</label></dt>
+			<dd>
+				<select name="pageID" id="pageID">
+					<option value="0">{lang}wcf.global.noSelection{/lang}</option>
 					
-					{include file='multipleLanguageInputJavascript' elementIdentifier='externalURL' forceSelection=false}
-				</dd>
-			</dl>
-			
-			{event name='linkFields'}
-		</fieldset>
+					{foreach from=$pageNodeList item=pageNode}
+						<option value="{@$pageNode->getPage()->pageID}"{if $pageNode->getPage()->pageID == $pageID} selected="selected"{/if}>{if $pageNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($pageNode->getDepth() - 1)}{/if}{$pageNode->getPage()->displayName}</option>
+					{/foreach}
+				</select>
+				{if $errorField == 'pageID'}
+					<small class="innerError">
+						{if $errorType == 'empty'}
+							{lang}wcf.global.form.error.empty{/lang}
+						{else}
+							{lang}wcf.acp.menu.item.pageID.error.{@$errorType}{/lang}
+						{/if}
+					</small>
+				{/if}
+			</dd>
+		</dl>
 		
-		<fieldset>
-			<legend>{lang}wcf.acp.menu.item.advanced{/lang}</legend>
-			
+		<dl id="externalURLContainer"{if $errorField == 'externalURL'} class="formError"{/if}>
+			<dt><label for="externalURL">{lang}wcf.acp.menu.item.externalURL{/lang}</label></dt>
+			<dd>
+				<input type="text" name="externalURL" id="externalURL" value="{$externalURL}" class="long" />
+				{if $errorField == 'externalURL'}
+					<small class="innerError">
+						{if $errorType == 'empty'}
+							{lang}wcf.global.form.error.empty{/lang}
+						{else}
+							{lang}wcf.acp.menu.item.externalURL.error.{$errorType}{/lang}
+						{/if}
+					</small>
+				{/if}
+				
+				{include file='multipleLanguageInputJavascript' elementIdentifier='externalURL' forceSelection=false}
+			</dd>
+		</dl>
+		
+		{event name='linkFields'}
+	</section>
+	
+	<section>
+		<h1>{lang}wcf.acp.menu.item.advanced{/lang}</h1>
+		
+		<dl>
+			<dt><label for="showOrder">{lang}wcf.acp.menu.item.showOrder{/lang}</label></dt>
+			<dd>
+				<input type="number" name="showOrder" id="showOrder" value="{@$showOrder}" class="tiny" min="0" />
+			</dd>
+		</dl>
+		
+		{if $action == 'add' || !$menuItem->isLandingPage}
 			<dl>
-				<dt><label for="showOrder">{lang}wcf.acp.menu.item.showOrder{/lang}</label></dt>
+				<dt></dt>
 				<dd>
-					<input type="number" name="showOrder" id="showOrder" value="{@$showOrder}" class="tiny" min="0" />
+					<label><input type="checkbox" name="isDisabled" id="isDisabled" value="1"{if $isDisabled} checked="checked"{/if} /> <span>{lang}wcf.acp.menu.item.isDisabled{/lang}</span></label>
 				</dd>
 			</dl>
-			
-			{if $action == 'add' || !$menuItem->isLandingPage}
-				<dl>
-					<dt></dt>
-					<dd>
-						<label><input type="checkbox" name="isDisabled" id="isDisabled" value="1"{if $isDisabled} checked="checked"{/if} /> <span>{lang}wcf.acp.menu.item.isDisabled{/lang}</span></label>
-					</dd>
-				</dl>
-			{/if}
-			
-			{event name='advancedFields'}
-		</fieldset>
+		{/if}
 		
-		{event name='fields'}
-	</div>
+		{event name='advancedFields'}
+	</section>
+		
+	{event name='sections'}
 	
 	<div class="formSubmit">
 		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" />
diff --git a/wcfsetup/install/files/acp/templates/menuList.tpl b/wcfsetup/install/files/acp/templates/menuList.tpl
index 956f9b1367..0d10d437b5 100644
--- a/wcfsetup/install/files/acp/templates/menuList.tpl
+++ b/wcfsetup/install/files/acp/templates/menuList.tpl
@@ -17,7 +17,7 @@
 	
 	<nav>
 		<ul>
-			<li><a href="{link controller='MenuAdd'}{/link}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.menu.add{/lang}</span></a></li>
+			<li><a href="{link controller='MenuAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.add{/lang}</span></a></li>
 			
 			{event name='contentNavigationButtonsTop'}
 		</ul>
@@ -45,12 +45,12 @@
 				{foreach from=$objects item=menu}
 					<tr class="jsMenuRow">
 						<td class="columnIcon">
-							<a href="{link controller='MenuEdit' id=$menu->menuID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 icon-pencil"></span></a>
-							<a href="{link controller='MenuItemList' id=$menu->menuID}{/link}" title="{lang}wcf.acp.menu.item.list{/lang}" class="jsTooltip"><span class="icon icon16 icon-list"></span></a>
+							<a href="{link controller='MenuEdit' id=$menu->menuID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
+							<a href="{link controller='MenuItemList' id=$menu->menuID}{/link}" title="{lang}wcf.acp.menu.item.list{/lang}" class="jsTooltip"><span class="icon icon16 fa-list"></span></a>
 							{if $menu->canDelete()}
-								<span class="icon icon16 icon-remove jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$menu->menuID}" data-confirm-message="{lang}wcf.acp.menu.delete.confirmMessage{/lang}"></span>
+								<span class="icon icon16 fa-remove jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$menu->menuID}" data-confirm-message="{lang}wcf.acp.menu.delete.confirmMessage{/lang}"></span>
 							{else}
-								<span class="icon icon16 icon-remove disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
+								<span class="icon icon16 fa-remove disabled" title="{lang}wcf.global.button.delete{/lang}"></span>
 							{/if}
 							
 							{event name='rowButtons'}
@@ -69,15 +69,16 @@
 	<div class="contentNavigation">
 		{@$pagesLinks}
 		
-		
 		<nav>
 			<ul>
-				<li><a href="{link controller='MenuAdd'}{/link}" class="button"><span class="icon icon16 icon-plus"></span> <span>{lang}wcf.acp.menu.add{/lang}</span></a></li>
+				<li><a href="{link controller='MenuAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.add{/lang}</span></a></li>
 			
 				{event name='contentNavigationButtonsBottom'}
 			</ul>
 		</nav>
 	</div>
+{else}
+	<p class="info">{lang}wcf.global.noItems{/lang}</p>
 {/if}
 
 {include file='footer'}
diff --git a/wcfsetup/install/files/lib/acp/form/MenuAddForm.class.php b/wcfsetup/install/files/lib/acp/form/MenuAddForm.class.php
index 42f0364355..28904ce6ff 100644
--- a/wcfsetup/install/files/lib/acp/form/MenuAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/MenuAddForm.class.php
@@ -19,14 +19,14 @@ use wcf\system\WCF;
  */
 class MenuAddForm extends AbstractForm {
 	/**
-	 * @see	\wcf\page\AbstractPage::$activeMenuItem
+	 * @inheritDoc
 	 */
-	public $activeMenuItem = 'wcf.acp.menu.link.cms.menu.list';
+	public $activeMenuItem = 'wcf.acp.menu.link.cms.menu.add';
 	
 	/**
-	 * @see	\wcf\page\AbstractPage::$neededPermissions
+	 * @inheritDoc
 	 */
-	public $neededPermissions = array('admin.content.cms.canManageMenu');
+	public $neededPermissions = ['admin.content.cms.canManageMenu'];
 	
 	/**
 	 * menu title
@@ -35,7 +35,7 @@ class MenuAddForm extends AbstractForm {
 	public $title = '';
 	
 	/**
-	 * @see	\wcf\page\IPage::readParameters()
+	 * @inheritDoc
 	 */
 	public function readParameters() {
 		parent::readParameters();
@@ -44,7 +44,7 @@ class MenuAddForm extends AbstractForm {
 	}
 	
 	/**
-	 * @see	\wcf\form\IForm::readFormParameters()
+	 * @inheritDoc
 	 */
 	public function readFormParameters() {
 		parent::readFormParameters();
@@ -55,7 +55,7 @@ class MenuAddForm extends AbstractForm {
 	}
 	
 	/**
-	 * @see	\wcf\form\IForm::validate()
+	 * @inheritDoc
 	 */
 	public function validate() {
 		parent::validate();
@@ -72,7 +72,7 @@ class MenuAddForm extends AbstractForm {
 	}
 	
 	/**
-	 * @see	\wcf\form\IForm::save()
+	 * @inheritDoc
 	 */
 	public function save() {
 		parent::save();
@@ -112,7 +112,7 @@ class MenuAddForm extends AbstractForm {
 	}
 	
 	/**
-	 * @see	\wcf\page\IPage::assignVariables()
+	 * @inheritDoc
 	 */
 	public function assignVariables() {
 		parent::assignVariables();
diff --git a/wcfsetup/install/files/lib/acp/form/MenuEditForm.class.php b/wcfsetup/install/files/lib/acp/form/MenuEditForm.class.php
index 30f2c36438..447fd8ffc5 100644
--- a/wcfsetup/install/files/lib/acp/form/MenuEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/MenuEditForm.class.php
@@ -18,6 +18,11 @@ use wcf\system\WCF;
  * @category	Community Framework
  */
 class MenuEditForm extends MenuAddForm {
+	/**
+	 * @inheritDoc
+	 */
+	public $activeMenuItem = 'wcf.acp.menu.link.cms.menu.list';
+	
 	/**
 	 * menu id
 	 * @var	integer
@@ -26,12 +31,12 @@ class MenuEditForm extends MenuAddForm {
 	
 	/**
 	 * menu object
-	 * @var	\wcf\data\menu\Menu
+	 * @var	Menu
 	 */
 	public $menu = null;
 	
 	/**
-	 * @see	\wcf\page\IPage::readParameters()
+	 * @inheritDoc
 	 */
 	public function readParameters() {
 		parent::readParameters();
@@ -44,7 +49,7 @@ class MenuEditForm extends MenuAddForm {
 	}
 	
 	/**
-	 * @see	\wcf\form\IForm::save()
+	 * @inheritDoc
 	 */
 	public function save() {
 		AbstractForm::save();
@@ -72,7 +77,7 @@ class MenuEditForm extends MenuAddForm {
 	}
 	
 	/**
-	 * @see	\wcf\page\IPage::readData()
+	 * @inheritDoc
 	 */
 	public function readData() {
 		parent::readData();
@@ -85,7 +90,7 @@ class MenuEditForm extends MenuAddForm {
 	}
 	
 	/**
-	 * @see	\wcf\page\IPage::assignVariables()
+	 * @inheritDoc
 	 */
 	public function assignVariables() {
 		parent::assignVariables();
diff --git a/wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php b/wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php
index 112709a532..63ddc54295 100644
--- a/wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php
@@ -26,14 +26,14 @@ use wcf\util\StringUtil;
  */
 class MenuItemAddForm extends AbstractForm {
 	/**
-	 * @see	\wcf\page\AbstractPage::$activeMenuItem
+	 * @inheritDoc
 	 */
 	public $activeMenuItem = 'wcf.acp.menu.link.cms.menu.list';
 	
 	/**
-	 * @see	\wcf\page\AbstractPage::$neededPermissions
+	 * @inheritDoc
 	 */
-	public $neededPermissions = array('admin.content.cms.canManageMenu');
+	public $neededPermissions = ['admin.content.cms.canManageMenu'];
 	
 	/**
 	 * menu id
@@ -43,7 +43,7 @@ class MenuItemAddForm extends AbstractForm {
 	
 	/**
 	 * menu object
-	 * @var	\wcf\data\menu\Menu
+	 * @var	Menu
 	 */
 	public $menu = null;
 	
@@ -96,7 +96,7 @@ class MenuItemAddForm extends AbstractForm {
 	public $menuItems = null;
 	
 	/**
-	 * @see	\wcf\page\IPage::readParameters()
+	 * @inheritDoc
 	 */
 	public function readParameters() {
 		parent::readParameters();
@@ -112,7 +112,7 @@ class MenuItemAddForm extends AbstractForm {
 	}
 	
 	/**
-	 * @see	\wcf\form\IForm::readFormParameters()
+	 * @inheritDoc
 	 */
 	public function readFormParameters() {
 		parent::readFormParameters();
@@ -130,7 +130,7 @@ class MenuItemAddForm extends AbstractForm {
 	}
 	
 	/**
-	 * @see	\wcf\form\IForm::validate()
+	 * @inheritDoc
 	 */
 	public function validate() {
 		parent::validate();
@@ -171,7 +171,7 @@ class MenuItemAddForm extends AbstractForm {
 	}
 	
 	/**
-	 * @see	\wcf\form\IForm::save()
+	 * @inheritDoc
 	 */
 	public function save() {
 		parent::save();
@@ -224,7 +224,7 @@ class MenuItemAddForm extends AbstractForm {
 	}
 	
 	/**
-	 * @see	\wcf\page\IPage::readData()
+	 * @inheritDoc
 	 */
 	public function readData() {
 		parent::readData();
@@ -233,7 +233,7 @@ class MenuItemAddForm extends AbstractForm {
 	}
 	
 	/**
-	 * @see	\wcf\page\IPage::assignVariables()
+	 * @inheritDoc
 	 */
 	public function assignVariables() {
 		parent::assignVariables();
diff --git a/wcfsetup/install/files/lib/acp/form/MenuItemEditForm.class.php b/wcfsetup/install/files/lib/acp/form/MenuItemEditForm.class.php
index abd683ad4f..a98fe81464 100644
--- a/wcfsetup/install/files/lib/acp/form/MenuItemEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/MenuItemEditForm.class.php
@@ -27,12 +27,12 @@ class MenuItemEditForm extends MenuItemAddForm {
 	
 	/**
 	 * menu object
-	 * @var	\wcf\data\menu\Menu
+	 * @var	Menu
 	 */
 	public $menuItem = null;
 	
 	/**
-	 * @see	\wcf\page\IPage::readParameters()
+	 * @inheritDoc
 	 */
 	public function readParameters() {
 		AbstractForm::readParameters();
@@ -51,7 +51,7 @@ class MenuItemEditForm extends MenuItemAddForm {
 	}
 	
 	/**
-	 * @see	\wcf\form\IForm::save()
+	 * @inheritDoc
 	 */
 	public function save() {
 		AbstractForm::save();
@@ -92,7 +92,7 @@ class MenuItemEditForm extends MenuItemAddForm {
 	}
 	
 	/**
-	 * @see	\wcf\page\IPage::readData()
+	 * @inheritDoc
 	 */
 	public function readData() {
 		parent::readData();
@@ -114,7 +114,7 @@ class MenuItemEditForm extends MenuItemAddForm {
 	}
 	
 	/**
-	 * @see	\wcf\page\IPage::assignVariables()
+	 * @inheritDoc
 	 */
 	public function assignVariables() {
 		parent::assignVariables();
diff --git a/wcfsetup/install/files/lib/acp/form/PageAddForm.class.php b/wcfsetup/install/files/lib/acp/form/PageAddForm.class.php
index c90d5d66a0..ac1fbeaf98 100644
--- a/wcfsetup/install/files/lib/acp/form/PageAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PageAddForm.class.php
@@ -1,6 +1,5 @@
 <?php
 namespace wcf\acp\form;
-use wcf\data\application\Application;
 use wcf\data\application\ApplicationList;
 use wcf\data\page\Page;
 use wcf\data\page\PageAction;
@@ -26,12 +25,12 @@ use wcf\util\StringUtil;
  */
 class PageAddForm extends AbstractForm {
 	/**
-	 * @see	\wcf\page\AbstractPage::$activeMenuItem
+	 * @inheritDoc
 	 */
-	public $activeMenuItem = 'wcf.acp.menu.link.cms.page.list';
+	public $activeMenuItem = 'wcf.acp.menu.link.cms.page.add';
 	
 	/**
-	 * @see	\wcf\page\AbstractPage::$neededPermissions
+	 * @inheritDoc
 	 */
 	public $neededPermissions = ['admin.content.cms.canManagePage'];
 	
@@ -108,7 +107,7 @@ class PageAddForm extends AbstractForm {
 	public $metaKeywords = [];
 	
 	/**
-	 * @see	\wcf\page\IPage::readParameters()
+	 * @inheritDoc
 	 */
 	public function readParameters() {
 		parent::readParameters();
@@ -122,7 +121,7 @@ class PageAddForm extends AbstractForm {
 	}
 	
 	/**
-	 * @see	\wcf\form\IForm::readFormParameters()
+	 * @inheritDoc
 	 */
 	public function readFormParameters() {
 		parent::readFormParameters();
@@ -141,7 +140,7 @@ class PageAddForm extends AbstractForm {
 	}
 	
 	/**
-	 * @see	\wcf\form\IForm::validate()
+	 * @inheritDoc
 	 */
 	public function validate() {
 		parent::validate();
@@ -188,7 +187,7 @@ class PageAddForm extends AbstractForm {
 	}
 	
 	/**
-	 * @see	\wcf\form\IForm::save()
+	 * @inheritDoc
 	 */
 	public function save() {
 		parent::save();
@@ -246,7 +245,7 @@ class PageAddForm extends AbstractForm {
 	}
 	
 	/**
-	 * @see	\wcf\page\IPage::assignVariables()
+	 * @inheritDoc
 	 */
 	public function assignVariables() {
 		parent::assignVariables();
diff --git a/wcfsetup/install/files/lib/acp/form/PageEditForm.class.php b/wcfsetup/install/files/lib/acp/form/PageEditForm.class.php
index 79edccb932..ada7d58624 100644
--- a/wcfsetup/install/files/lib/acp/form/PageEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PageEditForm.class.php
@@ -19,6 +19,11 @@ use wcf\system\WCF;
  * @category	Community Framework
  */
 class PageEditForm extends PageAddForm {
+	/**
+	 * @inheritDoc
+	 */
+	public $activeMenuItem = 'wcf.acp.menu.link.cms.page.list';
+	
 	/**
 	 * page id
 	 * @var integer
@@ -27,12 +32,12 @@ class PageEditForm extends PageAddForm {
 	
 	/**
 	 * page object
-	 * @var \wcf\data\page\Page
+	 * @var Page
 	 */
 	public $page = null;
 	
 	/**
-	 * @see	\wcf\page\IPage::readParameters()
+	 * @inheritDoc
 	 */
 	public function readParameters() {
 		parent::readParameters();
@@ -46,7 +51,7 @@ class PageEditForm extends PageAddForm {
 	}
 	
 	/**
-	 * @see	\wcf\acp\form\PageAddForm::validateDisplayName()
+	 * @inheritDoc
 	 */
 	protected function validateDisplayName() {
 		if ($this->displayName != $this->page->displayName) {
@@ -55,7 +60,7 @@ class PageEditForm extends PageAddForm {
 	}
 	
 	/**
-	 * @see	\wcf\acp\form\PageAddForm::validateParentPageID()
+	 * @inheritDoc
 	 */
 	protected function validateParentPageID() {
 		if (!$this->page->controller && $this->parentPageID) {
@@ -67,7 +72,7 @@ class PageEditForm extends PageAddForm {
 	}
 	
 	/**
-	 * @see	\wcf\acp\form\PageAddForm::validatePackageID()
+	 * @inheritDoc
 	 */
 	protected function validatePackageID() {
 		if (!$this->page->controller) {
@@ -76,7 +81,7 @@ class PageEditForm extends PageAddForm {
 	}
 	
 	/**
-	 * @see	\wcf\form\IForm::save()
+	 * @inheritDoc
 	 */
 	public function save() {
 		AbstractForm::save();
@@ -134,7 +139,7 @@ class PageEditForm extends PageAddForm {
 	}
 	
 	/**
-	 * @see	\wcf\page\IPage::readData()
+	 * @inheritDoc
 	 */
 	public function readData() {
 		parent::readData();
diff --git a/wcfsetup/install/files/lib/data/menu/Menu.class.php b/wcfsetup/install/files/lib/data/menu/Menu.class.php
index 16287cefa3..843adf481e 100644
--- a/wcfsetup/install/files/lib/data/menu/Menu.class.php
+++ b/wcfsetup/install/files/lib/data/menu/Menu.class.php
@@ -15,12 +15,12 @@ use wcf\system\WCF;
  */
 class Menu extends DatabaseObject {
 	/**
-	 * @see	\wcf\data\DatabaseObject::$databaseTableName
+	 * @inheritDoc
 	 */
 	protected static $databaseTableName = 'menu';
 	
 	/**
-	 * @see	\wcf\data\DatabaseObject::$databaseTableIndexName
+	 * @inheritDoc
 	 */
 	protected static $databaseTableIndexName = 'menuID';
 	
diff --git a/wcfsetup/install/files/lib/data/menu/MenuAction.class.php b/wcfsetup/install/files/lib/data/menu/MenuAction.class.php
index dd1ebbcf30..3c0b300e95 100644
--- a/wcfsetup/install/files/lib/data/menu/MenuAction.class.php
+++ b/wcfsetup/install/files/lib/data/menu/MenuAction.class.php
@@ -15,32 +15,32 @@ use wcf\system\exception\PermissionDeniedException;
  */
 class MenuAction extends AbstractDatabaseObjectAction {
 	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::$className
+	 * @inheritDoc
 	 */
 	protected $className = MenuEditor::class;
 	
 	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsCreate
+	 * @inheritDoc
 	 */
-	protected $permissionsCreate = array('admin.content.cms.canManageMenu');
+	protected $permissionsCreate = ['admin.content.cms.canManageMenu'];
 	
 	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
+	 * @inheritDoc
 	 */
-	protected $permissionsDelete = array('admin.content.cms.canManageMenu');
+	protected $permissionsDelete = ['admin.content.cms.canManageMenu'];
 	
 	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
+	 * @inheritDoc
 	 */
-	protected $permissionsUpdate = array('admin.content.cms.canManageMenu');
+	protected $permissionsUpdate = ['admin.content.cms.canManageMenu'];
 	
 	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::$requireACP
+	 * @inheritDoc
 	 */
-	protected $requireACP = array('create', 'delete', 'update');
+	protected $requireACP = ['create', 'delete', 'update'];
 	
 	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::validateDelete()
+	 * @inheritDoc
 	 */
 	public function validateDelete() {
 		parent::validateDelete();
diff --git a/wcfsetup/install/files/lib/data/menu/MenuEditor.class.php b/wcfsetup/install/files/lib/data/menu/MenuEditor.class.php
index ec2d8f1c9d..a5dc047f9d 100644
--- a/wcfsetup/install/files/lib/data/menu/MenuEditor.class.php
+++ b/wcfsetup/install/files/lib/data/menu/MenuEditor.class.php
@@ -14,7 +14,7 @@ use wcf\data\DatabaseObjectEditor;
  */
 class MenuEditor extends DatabaseObjectEditor {
 	/**
-	 * @see	\wcf\data\DatabaseObjectDecorator::$baseClass
+	 * @inheritDoc
 	 */
-	protected static $baseClass = 'wcf\data\menu\Menu';
+	protected static $baseClass = Menu::class;
 }
diff --git a/wcfsetup/install/files/lib/data/menu/MenuList.class.php b/wcfsetup/install/files/lib/data/menu/MenuList.class.php
index e258bd6ef8..373ac440d7 100644
--- a/wcfsetup/install/files/lib/data/menu/MenuList.class.php
+++ b/wcfsetup/install/files/lib/data/menu/MenuList.class.php
@@ -14,7 +14,7 @@ use wcf\data\DatabaseObjectList;
  */
 class MenuList extends DatabaseObjectList {
 	/**
-	 * @see	\wcf\data\DatabaseObjectList::$className
+	 * @inheritDoc
 	 */
-	public $className = 'wcf\data\menu\Menu';
+	public $className = Menu::class;
 }
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 ed6e8e15d8..bb2efb4ad1 100644
--- a/wcfsetup/install/files/lib/data/menu/item/MenuItem.class.php
+++ b/wcfsetup/install/files/lib/data/menu/item/MenuItem.class.php
@@ -15,12 +15,12 @@ use wcf\system\WCF;
  */
 class MenuItem extends DatabaseObject {
 	/**
-	 * @see	\wcf\data\DatabaseObject::$databaseTableName
+	 * @inheritDoc
 	 */
 	protected static $databaseTableName = 'menu_item';
 	
 	/**
-	 * @see	\wcf\data\DatabaseObject::$databaseTableIndexName
+	 * @inheritDoc
 	 */
 	protected static $databaseTableIndexName = 'itemID';
 	
diff --git a/wcfsetup/install/files/lib/data/menu/item/MenuItemAction.class.php b/wcfsetup/install/files/lib/data/menu/item/MenuItemAction.class.php
index dab0d40cfb..dfe886c71a 100644
--- a/wcfsetup/install/files/lib/data/menu/item/MenuItemAction.class.php
+++ b/wcfsetup/install/files/lib/data/menu/item/MenuItemAction.class.php
@@ -16,32 +16,32 @@ use wcf\system\exception\PermissionDeniedException;
  */
 class MenuItemAction extends AbstractDatabaseObjectAction implements IToggleAction {
 	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::$className
+	 * @inheritDoc
 	 */
 	protected $className = MenuItemEditor::class;
 	
 	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsCreate
+	 * @inheritDoc
 	 */
-	protected $permissionsCreate = array('admin.content.cms.canManageMenu');
+	protected $permissionsCreate = ['admin.content.cms.canManageMenu'];
 	
 	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
+	 * @inheritDoc
 	 */
-	protected $permissionsDelete = array('admin.content.cms.canManageMenu');
+	protected $permissionsDelete = ['admin.content.cms.canManageMenu'];
 	
 	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
+	 * @inheritDoc
 	 */
-	protected $permissionsUpdate = array('admin.content.cms.canManageMenu');
+	protected $permissionsUpdate = ['admin.content.cms.canManageMenu'];
 	
 	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::$requireACP
+	 * @inheritDoc
 	 */
-	protected $requireACP = array('create', 'delete', 'toggle', 'update');
+	protected $requireACP = ['create', 'delete', 'toggle', 'update'];
 	
 	/**
-	 * @see	\wcf\data\IToggleAction::validateToggle()
+	 * @inheritDoc
 	 */
 	public function validateToggle() {
 		parent::validateUpdate();
@@ -54,7 +54,7 @@ class MenuItemAction extends AbstractDatabaseObjectAction implements IToggleActi
 	}
 	
 	/**
-	 * @see	\wcf\data\IToggleAction::toggle()
+	 * @inheritDoc
 	 */
 	public function toggle() {
 		foreach ($this->objects as $object) {
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 5e37002e0e..75106736c2 100644
--- a/wcfsetup/install/files/lib/data/menu/item/MenuItemEditor.class.php
+++ b/wcfsetup/install/files/lib/data/menu/item/MenuItemEditor.class.php
@@ -14,7 +14,7 @@ use wcf\data\DatabaseObjectEditor;
  */
 class MenuItemEditor extends DatabaseObjectEditor {
 	/**
-	 * @see	\wcf\data\DatabaseObjectDecorator::$baseClass
+	 * @inheritDoc
 	 */
-	protected static $baseClass = 'wcf\data\menu\item\MenuItem';
+	protected static $baseClass = MenuItem::class;
 }
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 3d960de7af..e9283238e0 100644
--- a/wcfsetup/install/files/lib/data/menu/item/MenuItemList.class.php
+++ b/wcfsetup/install/files/lib/data/menu/item/MenuItemList.class.php
@@ -14,7 +14,7 @@ use wcf\data\DatabaseObjectList;
  */
 class MenuItemList extends DatabaseObjectList {
 	/**
-	 * @see	\wcf\data\DatabaseObjectList::$className
+	 * @inheritDoc
 	 */
-	public $className = 'wcf\data\menu\item\MenuItem';
+	public $className = MenuItem::class;
 }
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 6907b79c7c..1179ab679f 100644
--- a/wcfsetup/install/files/lib/data/menu/item/MenuItemNode.class.php
+++ b/wcfsetup/install/files/lib/data/menu/item/MenuItemNode.class.php
@@ -14,19 +14,19 @@ namespace wcf\data\menu\item;
 class MenuItemNode implements \Countable, \RecursiveIterator {
 	/**
 	 * parent node
-	 * @var	\wcf\data\menu\item\MenuItemNode
+	 * @var	MenuItemNode
 	 */
 	protected $parentNode = null;
 	
 	/**
 	 * children of this node
-	 * @var	array<\wcf\data\menu\item\MenuItemNode>
+	 * @var	MenuItemNode[]
 	 */
 	protected $children = array();
 	
 	/**
 	 * menu item object
-	 * @var	\wcf\data\menu\item\MenuItem
+	 * @var	MenuItem
 	 */
 	protected $menuItem = null;
 	
@@ -45,9 +45,9 @@ class MenuItemNode implements \Countable, \RecursiveIterator {
 	/**
 	 * Creates a new MenuItemNode object.
 	 * 
-	 * @param	\wcf\data\menu\item\MenuItemNode	$parentNode
-	 * @param	\wcf\data\menu\item\MenuItem		$menuItem
-	 * @param	integer					$depth
+	 * @param	MenuItemNode		$parentNode
+	 * @param	MenuItem		$menuItem
+	 * @param	integer			$depth
 	 */
 	public function __construct($parentNode = null, MenuItem $menuItem = null, $depth = 0) {
 		$this->parentNode = $parentNode;
@@ -58,7 +58,7 @@ class MenuItemNode implements \Countable, \RecursiveIterator {
 	/**
 	 * Sets the children of this node.
 	 * 
-	 * @param	array<\wcf\data\menu\item\MenuItemNode>		$children
+	 * @param	MenuItemNode[]		$children
 	 */
 	public function setChildren(array $children) {
 		$this->children = $children;
@@ -67,7 +67,7 @@ class MenuItemNode implements \Countable, \RecursiveIterator {
 	/**
 	 * Returns the parent node
 	 * 
-	 * @return	\wcf\data\menu\item\MenuItemNode
+	 * @return	MenuItemNode
 	 */
 	public function getParentNode() {
 		return $this->parentNode;
@@ -76,7 +76,7 @@ class MenuItemNode implements \Countable, \RecursiveIterator {
 	/**
 	 * Returns the menu item object of this node.
 	 * 
-	 * @return	\wcf\data\menu\item\MenuItem
+	 * @return	MenuItem
 	 */
 	public function getMenuItem() {
 		return $this->menuItem;
@@ -123,49 +123,49 @@ class MenuItemNode implements \Countable, \RecursiveIterator {
 	}
 	
 	/**
-	 * @see	\Iterator::rewind()
+	 * @inheritDoc
 	 */
 	public function rewind() {
 		$this->position = 0;
 	}
 	
 	/**
-	 * @see	\Iterator::valid()
+	 * @inheritDoc
 	 */
 	public function valid() {
 		return isset($this->children[$this->position]);
 	}
 	
 	/**
-	 * @see	\Iterator::next()
+	 * @inheritDoc
 	 */
 	public function next() {
 		$this->position++;
 	}
 	
 	/**
-	 * @see	\Iterator::current()
+	 * @inheritDoc
 	 */
 	public function current() {
 		return $this->children[$this->position];
 	}
 	
 	/**
-	 * @see	\Iterator::key()
+	 * @inheritDoc
 	 */
 	public function key() {
 		return $this->position;
 	}
 	
 	/**
-	 * @see	\RecursiveIterator::getChildren()
+	 * @inheritDoc
 	 */
 	public function getChildren() {
 		return $this->children[$this->position];
 	}
 	
 	/**
-	 * @see	\RecursiveIterator::hasChildren()
+	 * @inheritDoc
 	 */
 	public function hasChildren() {
 		return count($this->children) > 0;
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 3689193111..ab4aee7458 100644
--- a/wcfsetup/install/files/lib/data/menu/item/MenuItemNodeTree.class.php
+++ b/wcfsetup/install/files/lib/data/menu/item/MenuItemNodeTree.class.php
@@ -20,26 +20,26 @@ class MenuItemNodeTree {
 	
 	/**
 	 * list of menu items
-	 * @var	array<\wcf\data\menu\item\MenuItem>
+	 * @var	MenuItem[]
 	 */
 	public $menuItems = array();
 	
 	/**
 	 * menu item structure
-	 * @var	array<array>
+	 * @var	mixed[]
 	 */
 	public $menuItemStructure = array();
 	
 	/**
 	 * root node
-	 * @var	\wcf\data\menu\item\MenuItemNode
+	 * @var	MenuItemNode
 	 */
 	public $node = null;
 	
 	/**
 	 * Creates a new MenuItemNodeTree object.
 	 *
-	 * @param	integer			$menuID
+	 * @param	integer		$menuID
 	 */
 	public function __construct($menuID) {
 		$this->menuID = $menuID;
@@ -67,10 +67,10 @@ class MenuItemNodeTree {
 	/**
 	 * Generates the node tree recursively
 	 * 
-	 * @param	integer					$parentID
-	 * @param	\wcf\data\menu\item\MenuItemNode	$parentNode
-	 * @param	array<integer>				$filter
-	 * @return	array<\wcf\data\menu\item\MenuItemNode>
+	 * @param	integer			$parentID
+	 * @param	MenuItemNode		$parentNode
+	 * @param	int[]			$filter
+	 * @return	MenuItemNode[]
 	 */
 	protected function generateNodeTree($parentID = null, MenuItemNode $parentNode = null) {
 		$nodes = array();
@@ -91,7 +91,7 @@ class MenuItemNodeTree {
 	/**
 	 * Returns the menu item node tree.
 	 * 
-	 * @return	array<\wcf\data\menu\item\MenuItemNode>
+	 * @return	MenuItemNode[]
 	 */
 	public function getNodeTree() {
 		return $this->node->getChildren();
diff --git a/wcfsetup/install/files/lib/data/page/Page.class.php b/wcfsetup/install/files/lib/data/page/Page.class.php
index 3a05195a87..acb4cdb54e 100644
--- a/wcfsetup/install/files/lib/data/page/Page.class.php
+++ b/wcfsetup/install/files/lib/data/page/Page.class.php
@@ -15,12 +15,12 @@ use wcf\system\WCF;
  */
 class Page extends DatabaseObject {
 	/**
-	 * @see	\wcf\data\DatabaseObject::$databaseTableName
+	 * @inheritDoc
 	 */
 	protected static $databaseTableName = 'page';
 	
 	/**
-	 * @see	\wcf\data\DatabaseObject::$databaseTableIndexName
+	 * @inheritDoc
 	 */
 	protected static $databaseTableIndexName = 'pageID';
 	
@@ -79,7 +79,7 @@ class Page extends DatabaseObject {
 	 * Returns the page with the given display name.
 	 * 
 	 * @param	string		$name
-	 * @return	\wcf\data\page\Page
+	 * @return	Page
 	 */
 	public static function getPageByDisplayName($name) {
 		$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 d230366804..2d8c452410 100644
--- a/wcfsetup/install/files/lib/data/page/PageAction.class.php
+++ b/wcfsetup/install/files/lib/data/page/PageAction.class.php
@@ -17,32 +17,32 @@ use wcf\system\WCF;
  */
 class PageAction extends AbstractDatabaseObjectAction implements IToggleAction {
 	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::$className
+	 * @inheritDoc
 	 */
-	protected $className = 'wcf\data\page\PageEditor';
+	protected $className = PageEditor::class;
 	
 	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsCreate
+	 * @inheritDoc
 	 */
 	protected $permissionsCreate = array('admin.content.cms.canManagePage');
 	
 	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsDelete
+	 * @inheritDoc
 	 */
 	protected $permissionsDelete = array('admin.content.cms.canManagePage');
 	
 	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::$permissionsUpdate
+	 * @inheritDoc
 	 */
 	protected $permissionsUpdate = array('admin.content.cms.canManagePage');
 	
 	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::$requireACP
+	 * @inheritDoc
 	 */
 	protected $requireACP = array('create', 'delete', 'toggle', 'update');
 	
 	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::create()
+	 * @inheritDoc
 	 */
 	public function create() {
 		$page = parent::create();
@@ -71,7 +71,7 @@ class PageAction extends AbstractDatabaseObjectAction implements IToggleAction {
 	}
 	
 	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::update()
+	 * @inheritDoc
 	 */
 	public function update() {
 		parent::update();
@@ -108,7 +108,7 @@ class PageAction extends AbstractDatabaseObjectAction implements IToggleAction {
 	}
 	
 	/**
-	 * @see	\wcf\data\AbstractDatabaseObjectAction::validateDelete()
+	 * @inheritDoc
 	 */
 	public function validateDelete() {
 		parent::validateDelete();
@@ -121,7 +121,7 @@ class PageAction extends AbstractDatabaseObjectAction implements IToggleAction {
 	}
 	
 	/**
-	 * @see	\wcf\data\IToggleAction::validateToggle()
+	 * @inheritDoc
 	 */
 	public function validateToggle() {
 		parent::validateUpdate();
@@ -134,7 +134,7 @@ class PageAction extends AbstractDatabaseObjectAction implements IToggleAction {
 	}
 	
 	/**
-	 * @see	\wcf\data\IToggleAction::toggle()
+	 * @inheritDoc
 	 */
 	public function toggle() {
 		foreach ($this->objects as $object) {
diff --git a/wcfsetup/install/files/lib/data/page/PageEditor.class.php b/wcfsetup/install/files/lib/data/page/PageEditor.class.php
index c649c9a04d..999496b163 100644
--- a/wcfsetup/install/files/lib/data/page/PageEditor.class.php
+++ b/wcfsetup/install/files/lib/data/page/PageEditor.class.php
@@ -14,7 +14,7 @@ use wcf\data\DatabaseObjectEditor;
  */
 class PageEditor extends DatabaseObjectEditor {
 	/**
-	 * @see	\wcf\data\DatabaseObjectDecorator::$baseClass
+	 * @inheritDoc
 	 */
 	protected static $baseClass = 'wcf\data\page\Page';
 }
diff --git a/wcfsetup/install/files/lib/data/page/PageList.class.php b/wcfsetup/install/files/lib/data/page/PageList.class.php
index 01d9d87eb3..c64326bca4 100644
--- a/wcfsetup/install/files/lib/data/page/PageList.class.php
+++ b/wcfsetup/install/files/lib/data/page/PageList.class.php
@@ -14,7 +14,7 @@ use wcf\data\DatabaseObjectList;
  */
 class PageList extends DatabaseObjectList {
 	/**
-	 * @see	\wcf\data\DatabaseObjectList::$className
+	 * @inheritDoc
 	 */
 	public $className = 'wcf\data\page\Page';
 }
diff --git a/wcfsetup/install/files/lib/data/page/PageNode.class.php b/wcfsetup/install/files/lib/data/page/PageNode.class.php
index 57408e8c59..33017b298c 100644
--- a/wcfsetup/install/files/lib/data/page/PageNode.class.php
+++ b/wcfsetup/install/files/lib/data/page/PageNode.class.php
@@ -14,19 +14,19 @@ namespace wcf\data\page;
 class PageNode implements \Countable, \RecursiveIterator {
 	/**
 	 * parent node
-	 * @var	\wcf\data\page\PageNode
+	 * @var	PageNode
 	 */
 	protected $parentNode = null;
 	
 	/**
 	 * children of this node
-	 * @var	array<\wcf\data\page\PageNode>
+	 * @var	PageNode[]
 	 */
 	protected $children = array();
 	
 	/**
 	 * page object
-	 * @var	\wcf\data\page\Page
+	 * @var	Page
 	 */
 	protected $page = null;
 	
@@ -45,9 +45,9 @@ class PageNode implements \Countable, \RecursiveIterator {
 	/**
 	 * Creates a new PageNode object.
 	 * 
-	 * @param	\wcf\data\page\PageNode		$parentNode
-	 * @param	\wcf\data\page\Page		$page
-	 * @param	integer				$depth
+	 * @param	PageNode	$parentNode
+	 * @param	Page		$page
+	 * @param	integer		$depth
 	 */
 	public function __construct($parentNode = null, Page $page = null, $depth = 0) {
 		$this->parentNode = $parentNode;
@@ -58,7 +58,7 @@ class PageNode implements \Countable, \RecursiveIterator {
 	/**
 	 * Sets the children of this node.
 	 * 
-	 * @param	array<\wcf\data\page\PageNode>		$children
+	 * @param	PageNode[]	$children
 	 */
 	public function setChildren(array $children) {
 		$this->children = $children;
@@ -67,7 +67,7 @@ class PageNode implements \Countable, \RecursiveIterator {
 	/**
 	 * Returns the parent node
 	 * 
-	 * @return	\wcf\data\page\PageNode
+	 * @return	PageNode
 	 */
 	public function getParentNode() {
 		return $this->parentNode;
@@ -76,7 +76,7 @@ class PageNode implements \Countable, \RecursiveIterator {
 	/**
 	 * Returns the page object of this node
 	 * 
-	 * @return	\wcf\data\page\Page
+	 * @return	Page
 	 */
 	public function getPage() {
 		return $this->page;
@@ -92,49 +92,49 @@ class PageNode implements \Countable, \RecursiveIterator {
 	}
 	
 	/**
-	 * @see	\Iterator::rewind()
+	 * @inheritDoc
 	 */
 	public function rewind() {
 		$this->position = 0;
 	}
 	
 	/**
-	 * @see	\Iterator::valid()
+	 * @inheritDoc
 	 */
 	public function valid() {
 		return isset($this->children[$this->position]);
 	}
 	
 	/**
-	 * @see	\Iterator::next()
+	 * @inheritDoc
 	 */
 	public function next() {
 		$this->position++;
 	}
 	
 	/**
-	 * @see	\Iterator::current()
+	 * @inheritDoc
 	 */
 	public function current() {
 		return $this->children[$this->position];
 	}
 	
 	/**
-	 * @see	\Iterator::key()
+	 * @inheritDoc
 	 */
 	public function key() {
 		return $this->position;
 	}
 	
 	/**
-	 * @see	\RecursiveIterator::getChildren()
+	 * @inheritDoc
 	 */
 	public function getChildren() {
 		return $this->children[$this->position];
 	}
 	
 	/**
-	 * @see	\RecursiveIterator::hasChildren()
+	 * @inheritDoc
 	 */
 	public function hasChildren() {
 		return count($this->children) > 0;
diff --git a/wcfsetup/install/files/lib/data/page/PageNodeTree.class.php b/wcfsetup/install/files/lib/data/page/PageNodeTree.class.php
index b817852d36..b45ed804c2 100644
--- a/wcfsetup/install/files/lib/data/page/PageNodeTree.class.php
+++ b/wcfsetup/install/files/lib/data/page/PageNodeTree.class.php
@@ -26,19 +26,19 @@ class PageNodeTree {
 	
 	/**
 	 * list of pages
-	 * @var	array<\wcf\data\page\Page>
+	 * @var	Page[]
 	 */
-	public $pages = array();
+	public $pages = [];
 	
 	/**
 	 * page structure
-	 * @var	array<array>
+	 * @var	mixed[]
 	 */
-	public $pageStructure = array();
+	public $pageStructure = [];
 	
 	/**
 	 * root node
-	 * @var	\wcf\data\page\PageNode
+	 * @var	PageNode
 	 */
 	public $node = null;
 	
@@ -61,7 +61,7 @@ class PageNodeTree {
 			$this->pages[$page->pageID] = $page;
 				
 			if (!isset($this->pageStructure[$page->parentPageID])) {
-				$this->pageStructure[$page->parentPageID] = array();
+				$this->pageStructure[$page->parentPageID] = [];
 			}
 			$this->pageStructure[$page->parentPageID][] = $page->pageID;
 		}
@@ -72,17 +72,17 @@ class PageNodeTree {
 	}
 	
 	/**
-	 * Generates the node tree recursively
+	 * Generates the node tree recursively.
 	 * 
-	 * @param	integer				$parentID
-	 * @param	\wcf\data\page\PageNode		$parentNode
-	 * @param	array<integer>			$filter
-	 * @return	array<\wcf\data\page\PageNode>
+	 * @param	integer			$parentID
+	 * @param	PageNode		$parentNode
+	 * @param	int[]			$filter
+	 * @return	PageNode[]
 	 */
 	protected function generateNodeTree($parentID, PageNode $parentNode = null) {
-		$nodes = array();
+		$nodes = [];
 		
-		$pageIDs = (isset($this->pageStructure[$parentID]) ? $this->pageStructure[$parentID] : array());
+		$pageIDs = (isset($this->pageStructure[$parentID]) ? $this->pageStructure[$parentID] : []);
 		foreach ($pageIDs as $pageID) {
 			$page = $this->pages[$pageID];
 			$node = new PageNode($parentNode, $page, ($parentNode !== null ? ($parentNode->getDepth() + 1) : 0));
@@ -98,14 +98,14 @@ class PageNodeTree {
 	/**
 	 * Returns the page node tree.
 	 * 
-	 * @return	array<\wcf\data\page\PageNode>
+	 * @return	PageNode[]
 	 */
 	public function getNodeTree() {
 		return $this->node->getChildren();
 	}
 	
 	/**
-	 * Returns the iteratable node list
+	 * Returns the iteratable node list.
 	 *
 	 * @return	\RecursiveIteratorIterator
 	 */
-- 
2.20.1