Fixed coding style/documentation issue
authorMarcel Werk <burntime@woltlab.com>
Sun, 29 Nov 2015 17:21:09 +0000 (18:21 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sun, 29 Nov 2015 17:21:09 +0000 (18:21 +0100)
26 files changed:
com.woltlab.wcf/acpMenu.xml
wcfsetup/install/files/acp/templates/menuAdd.tpl
wcfsetup/install/files/acp/templates/menuItemAdd.tpl
wcfsetup/install/files/acp/templates/menuList.tpl
wcfsetup/install/files/lib/acp/form/MenuAddForm.class.php
wcfsetup/install/files/lib/acp/form/MenuEditForm.class.php
wcfsetup/install/files/lib/acp/form/MenuItemAddForm.class.php
wcfsetup/install/files/lib/acp/form/MenuItemEditForm.class.php
wcfsetup/install/files/lib/acp/form/PageAddForm.class.php
wcfsetup/install/files/lib/acp/form/PageEditForm.class.php
wcfsetup/install/files/lib/data/menu/Menu.class.php
wcfsetup/install/files/lib/data/menu/MenuAction.class.php
wcfsetup/install/files/lib/data/menu/MenuEditor.class.php
wcfsetup/install/files/lib/data/menu/MenuList.class.php
wcfsetup/install/files/lib/data/menu/item/MenuItem.class.php
wcfsetup/install/files/lib/data/menu/item/MenuItemAction.class.php
wcfsetup/install/files/lib/data/menu/item/MenuItemEditor.class.php
wcfsetup/install/files/lib/data/menu/item/MenuItemList.class.php
wcfsetup/install/files/lib/data/menu/item/MenuItemNode.class.php
wcfsetup/install/files/lib/data/menu/item/MenuItemNodeTree.class.php
wcfsetup/install/files/lib/data/page/Page.class.php
wcfsetup/install/files/lib/data/page/PageAction.class.php
wcfsetup/install/files/lib/data/page/PageEditor.class.php
wcfsetup/install/files/lib/data/page/PageList.class.php
wcfsetup/install/files/lib/data/page/PageNode.class.php
wcfsetup/install/files/lib/data/page/PageNodeTree.class.php

index 9aa827115a82efaabaabd431e7c41e9e084bbc6b..14da8edbfbbf0127e75b4ce511f0da0e9feb8ac6 100644 (file)
                        <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>
index 9178caf12fd2321cddd42f387d9c2f650500d86c..82677d9ce2ec519136dc2d2ca63cf93b2556b62d 100644 (file)
 </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" />
index ba39e750c4dbf93005cb7aeb03584db4363cec67..a27eb1e74da68a37072fe9b1a279359f895b64e9 100644 (file)
 </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}" />
index 956f9b136799f22c9e165360833579e538f6dd44..0d10d437b5f357fcbd7f7c5be3b5384a73124959 100644 (file)
@@ -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>
                                {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'}
        <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'}
index 42f036435551c34dd3959d97ed6a81f18ed0ae78..28904ce6ffd1da8e8acc2cea1d8a2cbd34768b46 100644 (file)
@@ -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();
index 30f2c36438984ecb5a6a843f94af69cde7f5fb31..447fd8ffc5fc467c843c08610df058e92b7ac816 100644 (file)
@@ -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();
index 112709a532014c7bf9447de3b554fb883bdfe338..63ddc54295a325a4eb770764da9800e84aade7bf 100644 (file)
@@ -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();
index abd683ad4ffc8b5e68492297185778a50a4479a1..a98fe8146497f250d8d50ce8cdf58e9e6016a9eb 100644 (file)
@@ -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();
index c90d5d66a00ece8f557327a782223dd9c1a0e049..ac1fbeaf98f14bf0389839ea7101e8fb4bfe0ab5 100644 (file)
@@ -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();
index 79edccb932634055f7552a65f15e655fbda552ee..ada7d58624e3a3d1825f3d2a8e3ea1586f66df08 100644 (file)
@@ -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();
index 16287cefa389cccd9114e6fcb57a39fd2ea7585c..843adf481ee4116fba6efd8875ed00b145551a2a 100644 (file)
@@ -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';
        
index dd1ebbcf3094d0ff28b0c50d3903385c60c2b7f4..3c0b300e95792c35b585ad15322f0b59ebbdfd3b 100644 (file)
@@ -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();
index ec2d8f1c9da9d690548fea6cdd913089291d0e86..a5dc047f9d1aa596ee4b7d0dc29a23ffe6027fae 100644 (file)
@@ -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;
 }
index e258bd6ef87fff1050bdb5f693cec46b821b5e99..373ac440d7638f0ff801069a7a7860da94cdc366 100644 (file)
@@ -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;
 }
index ed6e8e15d89e1ce86af98f89757090e716c2fbd3..bb2efb4ad1a6ccdbdc29b123e3e2de8d7d2bb5a5 100644 (file)
@@ -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';
        
index dab0d40cfb4a35e6163b99fc2dbdafcfbc24e648..dfe886c71a687e3b13be41f0a11df511c2518f44 100644 (file)
@@ -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) {
index 5e37002e0e4620946e13c459376e90dc8f061295..75106736c21cdbe549808c5a48b4f3607148b64f 100644 (file)
@@ -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;
 }
index 3d960de7af076243c590ff46581530456ca0961a..e9283238e009924ad238b2398cd585a4d3dc9efe 100644 (file)
@@ -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;
 }
index 6907b79c7cc13fdf772ec66bd2ca675fad9b5006..1179ab679fc4d2c18660fa1c833befdb81cd3734 100644 (file)
@@ -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;
index 3689193111d83e76dfa80b79d6fa9886d6d287be..ab4aee74586e4028a5fa0418d7af7f3fa89239f5 100644 (file)
@@ -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();
index 3a05195a8719cef2dd741b13bf88b04dd91b243c..acb4cdb54ede532ec605cab733f38880efe75e60 100644 (file)
@@ -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  *
index d2303668047cbbb204f4d9ffbc08daf3de9058bb..2d8c452410c3b9f5522cbd10ed72e341be865267 100644 (file)
@@ -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) {
index c649c9a04dec0bcf11a93f005cddbb99d5e66ad9..999496b163fce4f02669cd333201f88085e1dc7d 100644 (file)
@@ -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';
 }
index 01d9d87eb34834fd32591e2646a890f71113886e..c64326bca4558066540e6a0a2a083ad3c9ab531c 100644 (file)
@@ -14,7 +14,7 @@ use wcf\data\DatabaseObjectList;
  */
 class PageList extends DatabaseObjectList {
        /**
-        * @see \wcf\data\DatabaseObjectList::$className
+        * @inheritDoc
         */
        public $className = 'wcf\data\page\Page';
 }
index 57408e8c5918e36ec1eb29fbf9d9ca12953b9dda..33017b298c53f167475762e39c11125f7a7395c9 100644 (file)
@@ -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;
index b817852d36d5316e13430a464a5f58b523600987..b45ed804c26bba0c4a848f3a97200e211bcf39be 100644 (file)
@@ -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
         */