Fix undefined class (documentation) issues
authorMatthias Schmidt <gravatronics@live.com>
Fri, 25 Mar 2016 16:45:10 +0000 (17:45 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 25 Mar 2016 16:45:10 +0000 (17:45 +0100)
32 files changed:
wcfsetup/install/files/lib/acp/action/ClipboardAction.class.php [deleted file]
wcfsetup/install/files/lib/acp/action/ClipboardLoadMarkedItemsAction.class.php [deleted file]
wcfsetup/install/files/lib/acp/action/ClipboardProxyAction.class.php [deleted file]
wcfsetup/install/files/lib/acp/form/AbstractCategoryAddForm.class.php
wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php
wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php
wcfsetup/install/files/lib/acp/page/AbstractCategoryListPage.class.php
wcfsetup/install/files/lib/acp/page/CacheListPage.class.php
wcfsetup/install/files/lib/acp/page/MenuItemListPage.class.php
wcfsetup/install/files/lib/data/IThumbnailFile.class.php
wcfsetup/install/files/lib/data/box/Box.class.php
wcfsetup/install/files/lib/data/like/object/ILikeObject.class.php
wcfsetup/install/files/lib/data/media/Media.class.php
wcfsetup/install/files/lib/data/user/User.class.php
wcfsetup/install/files/lib/data/user/profile/menu/item/UserProfileMenuItem.class.php
wcfsetup/install/files/lib/form/UserSearchForm.class.php
wcfsetup/install/files/lib/system/bbcode/BBCodeParser.class.php
wcfsetup/install/files/lib/system/dashboard/box/TodaysFollowingBirthdaysDashboardBox.class.php
wcfsetup/install/files/lib/system/email/mime/AbstractMimePart.class.php
wcfsetup/install/files/lib/system/email/mime/AttachmentMimePart.class.php
wcfsetup/install/files/lib/system/exporter/IExporter.class.php
wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php
wcfsetup/install/files/lib/system/message/quote/MessageQuoteManager.class.php
wcfsetup/install/files/lib/system/message/quote/QuotedMessage.class.php
wcfsetup/install/files/lib/system/option/RadioButtonOptionType.class.php
wcfsetup/install/files/lib/system/option/UrlControllerReplacementOptionType.class.php [deleted file]
wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
wcfsetup/install/files/lib/system/package/validation/PackageValidationManager.class.php
wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php
wcfsetup/install/files/lib/system/upload/DefaultUploadFileSaveStrategy.class.php
wcfsetup/install/files/lib/system/user/notification/event/ModerationQueueCommentResponseUserNotificationEvent.class.php
wcfsetup/install/files/lib/system/user/object/watch/IUserObjectWatch.class.php

diff --git a/wcfsetup/install/files/lib/acp/action/ClipboardAction.class.php b/wcfsetup/install/files/lib/acp/action/ClipboardAction.class.php
deleted file mode 100644 (file)
index 64bf77e..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-namespace wcf\acp\action;
-
-/**
- * Copy of the default implementation for the clipboard-API.
- * 
- * @author     Alexander Ebert
- * @copyright  2001-2015 WoltLab GmbH
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package    com.woltlab.wcf
- * @subpackage acp.action
- * @category   Community Framework
- */
-class ClipboardAction extends \wcf\action\ClipboardAction { }
diff --git a/wcfsetup/install/files/lib/acp/action/ClipboardLoadMarkedItemsAction.class.php b/wcfsetup/install/files/lib/acp/action/ClipboardLoadMarkedItemsAction.class.php
deleted file mode 100644 (file)
index ff27e17..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-namespace wcf\acp\action;
-
-/**
- * Copy of the default implementation for loading marked items from clipboard API.
- * 
- * @author     Alexander Ebert
- * @copyright  2001-2015 WoltLab GmbH
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package    com.woltlab.wcf
- * @subpackage acp.action
- * @category   Community Framework
- */
-class ClipboardLoadMarkedItemsAction extends \wcf\action\ClipboardLoadMarkedItemsAction { }
diff --git a/wcfsetup/install/files/lib/acp/action/ClipboardProxyAction.class.php b/wcfsetup/install/files/lib/acp/action/ClipboardProxyAction.class.php
deleted file mode 100644 (file)
index 97f8eb4..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-namespace wcf\acp\action;
-
-/**
- * Copy of the default implementation for the clipboard proxy API.
- * 
- * @author     Alexander Ebert
- * @copyright  2001-2015 WoltLab GmbH
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package    com.woltlab.wcf
- * @subpackage acp.action
- * @category   Community Framework
- */
-class ClipboardProxyAction extends \wcf\action\ClipboardProxyAction { }
index 7e0a0c440efa44ee3c3111cccc82f44c5ae2c3ed..6188a45b76bb64a780e4890d9be218a9cc243815 100644 (file)
@@ -3,6 +3,7 @@ namespace wcf\acp\form;
 use wcf\data\category\CategoryAction;
 use wcf\data\category\CategoryEditor;
 use wcf\data\category\UncachedCategoryNodeTree;
+use wcf\data\object\type\ObjectType;
 use wcf\form\AbstractForm;
 use wcf\system\acl\ACLHandler;
 use wcf\system\category\CategoryHandler;
index 2e96317adb021af4ed75cebaa62e3bc92987bf1e..0a5506d8e82f77cb88e8ab359391a7225aa3ddb4 100755 (executable)
@@ -30,7 +30,7 @@ class PackageStartInstallForm extends AbstractForm {
        
        /**
         * updated package object
-        * @var \wcf\system\package\Package
+        * @var \wcf\data\package\Package
         */
        public $package = null;
        
index bd2be4e8769a71a6ed7117d2c83cc8918ecc0908..018467dc56bf889bce6dcf7f3802cba4c21c066a 100644 (file)
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\acp\form;
+use wcf\data\user\option\category\UserOptionCategory;
 use wcf\data\user\option\category\UserOptionCategoryList;
 use wcf\data\user\option\UserOption;
 use wcf\data\user\option\UserOptionAction;
@@ -117,7 +118,7 @@ class UserOptionAddForm extends AbstractForm {
        
        /**
         * available option categories
-        * @var \wcf\data\user\option\UserOptionCategory[]
+        * @var UserOptionCategory[]
         */
        public $availableCategories = [];
 
index c31e14c95d3d15f6a083fb6625ab3d43aed12822..4da4b69fe668df80516c4c472d01a24c7ffa4622 100644 (file)
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\acp\page;
 use wcf\data\category\CategoryNodeTree;
+use wcf\data\object\type\ObjectType;
 use wcf\page\AbstractPage;
 use wcf\system\category\CategoryHandler;
 use wcf\system\exception\PermissionDeniedException;
index a09c6245388fe6f98ef0160383ab7fcd98702d13..bc9e6be2c8072d1e3b95e9383cb0958ab7a21c1b 100755 (executable)
@@ -100,7 +100,7 @@ class CacheListPage extends AbstractPage {
         * Reads the information of cached files
         * 
         * @param       string                  $cacheType
-        * @param       strign                  $cacheDir
+        * @param       string                  $cacheDir
         * @param       \wcf\system\Regex       $ignore
         */
        protected function readCacheFiles($cacheType, $cacheDir, Regex $ignore = null, $extension = 'php') {
index dcef8d7f9a95ca144e2ecc97d460e43109b1bf24..8b97f4104c7d9c7a5546855fedcf523a227f06a2 100644 (file)
@@ -36,10 +36,10 @@ class MenuItemListPage extends AbstractPage {
        
        /**
         * menu item node tree
-        * @var wcf\data\menu\item\MenuItemNodeTree
+        * @var MenuItemNodeTree
         */
        public $menuItems = null;
-               
+       
        /**
         * menu id
         * @var integer
@@ -48,7 +48,7 @@ class MenuItemListPage extends AbstractPage {
        
        /**
         * menu object
-        * @var \wcf\data\menu\Menu
+        * @var Menu
         */
        public $menu = null;
        
index 0b4f27bbe104080397c5756a5b12df3c44bde968..b455a95983bdcb39a2fb2fd1348c1d1585531ca1 100644 (file)
@@ -18,7 +18,7 @@ interface IThumbnailFile extends IFile {
         * Returns the link to the thumbnail file with the given size.
         * 
         * @param       string          $size
-        * @return      sting
+        * @return      string
         */
        public function getThumbnailLink($size);
        
@@ -26,7 +26,7 @@ interface IThumbnailFile extends IFile {
         * Returns the physical location of the thumbnail file with the given size.
         * 
         * @param       string          $size
-        * @return      sting
+        * @return      string
         */
        public function getThumbnailLocation($size);
        
index 62a4f270a744e43b96100af50735e10ba2924f76..c04ac979452704a09fa07f0f6719702e29d15613 100644 (file)
@@ -27,7 +27,7 @@ class Box extends DatabaseObject {
        
        /**
         * image media object
-        * @var Media
+        * @var ViewableMedia
         */
        protected $image = null;
        
index 574f33870a77516a113c17a8460d498fb276a8f2..56e0e800badae7f90acb1dc4a003230d8129f581 100644 (file)
@@ -38,9 +38,9 @@ interface ILikeObject extends IDatabaseObjectProcessor, ITitledObject {
        public function getObjectID();
        
        /**
-        * Gets the object type.
+        * Returns the object type.
         * 
-        * @return      \wcf\data\like\object\type\LikeObjectType
+        * @return      ObjectType
         */
        public function getObjectType();
        
@@ -54,14 +54,14 @@ interface ILikeObject extends IDatabaseObjectProcessor, ITitledObject {
        /**
         * Sets the object type.
         * 
-        * @param       \wcf\data\object\type\ObjectType
+        * @param       ObjectType
         */
        public function setObjectType(ObjectType $objectType);
        
        /**
         * Sends a notification for this like.
         * 
-        * @param       \wcf\data\like\Like     $like
+        * @param       Like    $like
         */
        public function sendNotification(Like $like);
        
index f96973076a7a243d4b7e155f2e9df9db48e8d06c..51e20e173d6f62029f98cf21baa9edc8e7a0419b 100644 (file)
@@ -3,6 +3,7 @@ namespace wcf\data\media;
 use wcf\data\DatabaseObject;
 use wcf\data\ILinkableObject;
 use wcf\data\IThumbnailFile;
+use wcf\system\exception\SystemException;
 use wcf\system\request\IRouteController;
 use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
index 2c59dd8df497261206355e5f9b49ba064a438e8e..b7fc0b767941f0cbe907bcbf1e69afce9f9d2fe4 100644 (file)
@@ -52,7 +52,7 @@ final class User extends DatabaseObject implements IRouteController, IUserConten
        
        /**
         * date time zone object
-        * @var DateTimeZone
+        * @var \DateTimeZone
         */
        protected $timezoneObj = null;
        
@@ -351,7 +351,7 @@ final class User extends DatabaseObject implements IRouteController, IUserConten
        /**
         * Returns the time zone of this user.
         * 
-        * @return      DateTimeZone
+        * @return      \DateTimeZone
         */
        public function getTimeZone() {
                if ($this->timezoneObj === null) {
index ab0c1a4563604779fdb7024364ae3b758502a8fd..a570aeef640ea1dd77c8c672994b98e62d16bfd7 100644 (file)
@@ -1,9 +1,11 @@
 <?php
 namespace wcf\data\user\profile\menu\item;
+use wcf\system\menu\user\profile\content\IUserProfileMenuContent;
 use wcf\data\DatabaseObject;
 use wcf\data\TDatabaseObjectOptions;
 use wcf\data\TDatabaseObjectPermissions;
 use wcf\system\exception\SystemException;
+use wcf\system\SingletonFactory;
 
 /**
  * Represents an user profile menu item.
@@ -21,17 +23,17 @@ class UserProfileMenuItem extends DatabaseObject {
        
        /**
         * content manager
-        * @var \wcf\system\menu\user\profile\content\IUserProfileContent
+        * @var IUserProfileMenuContent
         */
        protected $contentManager = null;
        
        /**
-        * @see \wcf\data\DatabaseObject::$databaseTableName
+        * @inheritDoc
         */
        protected static $databaseTableName = 'user_profile_menu_item';
        
        /**
-        * @see \wcf\data\DatabaseObject::$databaseTableIndexName
+        * @inheritDoc
         */
        protected static $databaseTableIndexName = 'menuItemID';
        
@@ -47,7 +49,7 @@ class UserProfileMenuItem extends DatabaseObject {
        /**
         * Returns the content manager for this menu item.
         * 
-        * @return      \wcf\system\menu\user\profile\content\IUserProfileMenuContent
+        * @return      IUserProfileMenuContent
         */
        public function getContentManager() {
                if ($this->contentManager === null) {
@@ -55,11 +57,11 @@ class UserProfileMenuItem extends DatabaseObject {
                                throw new SystemException("Unable to find class '".$this->className."'");
                        }
                        
-                       if (!is_subclass_of($this->className, 'wcf\system\SingletonFactory')) {
+                       if (!is_subclass_of($this->className, SingletonFactory::class)) {
                                throw new SystemException("'".$this->className."' does not extend 'wcf\system\SingletonFactory'");
                        }
                        
-                       if (!is_subclass_of($this->className, 'wcf\system\menu\user\profile\content\IUserProfileMenuContent')) {
+                       if (!is_subclass_of($this->className, IUserProfileMenuContent::class)) {
                                throw new SystemException("'".$this->className."' does not implement 'wcf\system\menu\user\profile\content\IUserProfileMenuContent'");
                        }
                        
index 432b75e25e50775dc80949280bd1d9470fab5b52..7f72f72716488fed2ffb8327973aec4fd0a2df00 100644 (file)
@@ -46,8 +46,8 @@ class UserSearchForm extends UserOptionListForm {
        public $matches = array();
        
        /**
-        * condtion builder object
-        * @var \wcf\system\database\condition\PreparedStatementConditionBuilder
+        * condition builder object
+        * @var PreparedStatementConditionBuilder
         */
        public $conditions = null;
        
index b187c82cd470a09809358c023b3bf6072e5061d6..cec9aafa77dd15dedf5a68c936b52ff06b940408 100644 (file)
@@ -228,8 +228,8 @@ class BBCodeParser extends SingletonFactory {
        /**
         * Validates an attributes of a tag.
         * 
-        * @param       array                                   $tagAttributes
-        * @param       \wcf\data\bbcode\BBCodeAttribute                $definedTagAttribute
+        * @param       array                   $tagAttributes
+        * @param       BBCodeAttribute         $definedTagAttribute
         * @return      boolean
         */
        protected function isValidTagAttribute(array $tagAttributes, BBCodeAttribute $definedTagAttribute) {
index 8f3640f1bd1432f90f7b82b25de90b86d7c22333..f9867464ef983fb1c6c73a6feb1e66f7e4fb55fe 100644 (file)
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\system\dashboard\box;
 use wcf\data\dashboard\box\DashboardBox;
+use wcf\data\user\UserProfile;
 use wcf\data\user\UserProfileCache;
 use wcf\page\IPage;
 use wcf\system\user\UserBirthdayCache;
@@ -20,12 +21,12 @@ use wcf\util\DateUtil;
 class TodaysFollowingBirthdaysDashboardBox extends AbstractSidebarDashboardBox {
        /**
         * user profiles
-        * @var arra<\wcf\data\user\UserProfile>
+        * @var UserProfile[]
         */
-       public $userProfiles = array();
+       public $userProfiles = [];
        
        /**
-        * @see \wcf\system\dashboard\box\IDashboardBox::init()
+        * @inheritDoc
         */
        public function init(DashboardBox $box, IPage $page) {
                parent::init($box, $page);
@@ -56,16 +57,16 @@ class TodaysFollowingBirthdaysDashboardBox extends AbstractSidebarDashboardBox {
        }
        
        /**
-        * @see \wcf\system\dashboard\box\AbstractContentDashboardBox::render()
+        * @inheritDoc
         */
        protected function render() {
                if (empty($this->userProfiles)) {
                        return '';
                }
                
-               WCF::getTPL()->assign(array(
+               WCF::getTPL()->assign([
                        'birthdayUserProfiles' => $this->userProfiles
-               ));
+               ]);
                return WCF::getTPL()->fetch('dashboardBoxTodaysFollowingBirthdays');
        }
 }
index e68bfac6860a2d7a74ff65bbbf7d44036655f192..e91c7323775ee8c587364557d33f1039ab77bb67 100644 (file)
@@ -24,7 +24,7 @@ abstract class AbstractMimePart {
         * Returns the transfer encoding to use. Must either be
         * 'quoted-printable' or 'base64'.
         * 
-        * @return      Either 'quoted-printable' or 'base64'
+        * @return      string          either 'quoted-printable' or 'base64'
         */
        abstract public function getContentTransferEncoding();
        
index b9afe58061c72bdb563cd8dbcea214b164aec685..7f65c95a7183dba3e706c74f19e3fd3b10409f0f 100644 (file)
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\system\email\mime;
 use wcf\system\email\EmailGrammar;
+use wcf\system\exception\SystemException;
 use wcf\util\FileUtil;
 
 /**
index ec7162bdf8e144601b285d28f9f5ec11e34fbce4..7e6ebcfc05596e8e6a9a52b7f2fe86eedb7b7422 100644 (file)
@@ -49,7 +49,7 @@ interface IExporter {
        /**
         * Validates database access.
         * 
-        * @throws      wcf\system\database\DatabaseException
+        * @throws      \wcf\system\database\exception\DatabaseException
         */
        public function validateDatabaseAccess();
        
index b8111f510ba2b436c2e013ecdc67a700322b4e97..242f249b4263681ea183e2901200959a899103b5 100644 (file)
@@ -100,10 +100,10 @@ class QuickReplyManager extends SingletonFactory {
        /**
         * Validates parameters for current request.
         * 
-        * @param       \wcf\system\message\IMessageQuickReplyAction    $object
-        * @param       array<array>                                    $parameters
-        * @param       string                                          $containerClassName
-        * @param       string                                          $containerDecoratorClassName
+        * @param       IMessageQuickReplyAction        $object
+        * @param       array<array>                    $parameters
+        * @param       string                          $containerClassName
+        * @param       string                          $containerDecoratorClassName
         */
        public function validateParameters(IMessageQuickReplyAction $object, array &$parameters, $containerClassName, $containerDecoratorClassName = '') {
                if (!isset($parameters['data']['message'])) {
index d50b644f1c02f4748797746c62bbb4951be9ac39..f4b38391a3b1981edf80c82ed141c869d79c8802 100644 (file)
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\system\message\quote;
+use wcf\data\object\type\ObjectType;
 use wcf\data\object\type\ObjectTypeCache;
 use wcf\data\IMessage;
 use wcf\system\application\ApplicationHandler;
@@ -262,7 +263,7 @@ class MessageQuoteManager extends SingletonFactory {
        /**
         * Returns a list of quotes.
         * 
-        * @param       boolean         supportPaste
+        * @param       boolean         $supportPaste
         */
        public function getQuotes($supportPaste = false) {
                $template = '';
index 630014244c5d6998188f3678ec00582c62d43187..2b5ded43bba109db77e655b17350b1d009ac44b9 100644 (file)
@@ -15,19 +15,19 @@ use wcf\data\IMessage;
 class QuotedMessage implements \Countable, \Iterator {
        /**
         * list of full quotes for insertation
-        * @var array<string>
+        * @var string[]
         */
        public $fullQuotes = array();
        
        /**
         * quotable database object
-        * @var \wcf\data\IQuotableDatabaseObject
+        * @var IMessage
         */
        public $object = null;
        
        /**
-        * list of quotes (shortend)
-        * @var array<string>
+        * list of quotes (shortened)
+        * @var string[]
         */
        public $quotes = array();
        
@@ -39,14 +39,14 @@ class QuotedMessage implements \Countable, \Iterator {
        
        /**
         * list of index to object relation
-        * @var array<integer>
+        * @var integer[]
         */
        protected $indexToObject = null;
        
        /**
         * Creates a new QuotedMessage object.
         * 
-        * @param       \wcf\data\IMessage      $object
+        * @param       IMessage        $object
         */
        public function __construct(IMessage $object) {
                $this->object = $object;
@@ -66,7 +66,7 @@ class QuotedMessage implements \Countable, \Iterator {
        }
        
        /**
-        * @see \wcf\data\ITitledObject::getTitle()
+        * @see ITitledObject::getTitle()
         */
        public function __toString() {
                return $this->object->getTitle();
index 258bedede6cc2d45e7aec4a9194cdf73df13f8d0..1e22d16ed68dc32c617d0eb1274b1643450e822b 100644 (file)
@@ -12,7 +12,7 @@ use wcf\util\StringUtil;
  * Option type implementation for radio buttons.
  * 
  * @author     Marcel Werk
- * @copyright  2001-2015 WoltLab GmbH
+ * @copyright  2001-2016 WoltLab GmbH
  * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package    com.woltlab.wcf
  * @subpackage system.option
@@ -26,7 +26,7 @@ class RadioButtonOptionType extends AbstractOptionType implements ISearchableCon
        public $templateName = 'radioButtonOptionType';
        
        /**
-        * @see \wcf\system\option\IOptionType::getFormElement()
+        * @inheritDoc
         */
        public function getFormElement(Option $option, $value) {
                $availableOptions = $option->parseMultipleEnableOptions();
@@ -53,7 +53,7 @@ class RadioButtonOptionType extends AbstractOptionType implements ISearchableCon
        }
        
        /**
-        * @see \wcf\system\option\IOptionType::validate()
+        * @inheritDoc
         */
        public function validate(Option $option, $newValue) {
                if (!empty($newValue)) {
@@ -65,7 +65,7 @@ class RadioButtonOptionType extends AbstractOptionType implements ISearchableCon
        }
        
        /**
-        * @see \wcf\system\option\ISearchableUserOption::getSearchFormElement()
+        * @inheritDoc
         */
        public function getSearchFormElement(Option $option, $value) {
                $this->templateName = 'radioButtonSearchableOptionType';
@@ -75,7 +75,7 @@ class RadioButtonOptionType extends AbstractOptionType implements ISearchableCon
        }
        
        /**
-        * @see \wcf\system\option\ISearchableUserOption::getCondition()
+        * @inheritDoc
         */
        public function getCondition(PreparedStatementConditionBuilder &$conditions, Option $option, $value) {
                if (!isset($_POST['searchOptions'][$option->optionName])) return false;
@@ -85,21 +85,21 @@ class RadioButtonOptionType extends AbstractOptionType implements ISearchableCon
        }
        
        /**
-        * @see \wcf\system\option\ISearchableConditionUserOption::addCondition()
+        * @inheritDoc
         */
        public function addCondition(UserList $userList, Option $option, $value) {
                $userList->getConditionBuilder()->add('user_option_value.userOption'.$option->optionID.' = ?', array(StringUtil::trim($value)));
        }
        
        /**
-        * @see \wcf\system\option\ISearchableConditionUserOption::checkUser()
+        * @inheritDoc
         */
        public function checkUser(User $user, Option $option, $value) {
                return mb_strtolower($user->getUserOption($option->optionName)) == mb_strtolower(StringUtil::trim($value));
        }
        
        /**
-        * @see \wcf\system\option\ISearchableConditionUserOption::getConditionData()
+        * @inheritDoc
         */
        public function getConditionData(Option $option, $newValue) {
                return $newValue;
@@ -108,8 +108,8 @@ class RadioButtonOptionType extends AbstractOptionType implements ISearchableCon
        /**
         * Returns the select options for the given option.
         * 
-        * @param       \wcf\dat\option\Option          $option
-        * @return      array<string>
+        * @param       Option          $option
+        * @return      string[]
         */
        protected function getSelectOptions(Option $option) {
                return $option->parseSelectOptions();
diff --git a/wcfsetup/install/files/lib/system/option/UrlControllerReplacementOptionType.class.php b/wcfsetup/install/files/lib/system/option/UrlControllerReplacementOptionType.class.php
deleted file mode 100644 (file)
index 30e5986..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-namespace wcf\system\option;
-use wcf\data\option\Option;
-use wcf\system\cache\builder\ControllerCacheBuilder;
-use wcf\system\exception\UserInputException;
-use wcf\system\WCF;
-use wcf\util\StringUtil;
-
-/**
- * Option type implementation for URL controller replacements.
- * 
- * @author     Alexander Ebert
- * @copyright  2001-2015 WoltLab GmbH
- * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package    com.woltlab.wcf
- * @subpackage system.option
- * @category   Community Framework
- */
-class UrlControllerReplacementOptionType extends TextareaOptionType {
-       /**
-        * list of known controllers grouped by application
-        * @var array<array>
-        */
-       protected $controllers = null;
-       
-       /**
-        * @see \wcf\system\option\IOptionType::getData()
-        */
-       public function getData(Option $option, $newValue) {
-               return $this->cleanup($newValue);
-       }
-       
-       /**
-        * @see \wcf\system\option\IOptionType::validate()
-        */
-       public function validate(Option $option, $newValue) {
-               $newValue = $this->cleanup($newValue);
-               if (!empty($newValue)) {
-                       $lines = explode("\n", $newValue);
-                       
-                       $aliases = array();
-                       $controllers = array();
-                       for ($i = 0, $length = count($lines); $i < $length; $i++) {
-                               $line = $lines[$i];
-                               if (preg_match('~^(?P<controller>[a-z][a-z0-9\-]+)=(?P<alias>[a-z][a-z0-9\-]+)$~', $line, $matches)) {
-                                       // check if there is already a replacement for given controller
-                                       if (in_array($matches['controller'], $controllers)) {
-                                               WCF::getTPL()->assign('urlControllerReplacementError', $matches['controller']);
-                                               throw new UserInputException($option->optionName, 'controllerReplacementDuplicateController', array('controller' => $matches['controller']));
-                                       }
-                                       
-                                       // check if there is already the same alias for a different controller
-                                       if (in_array($matches['alias'], $aliases)) {
-                                               WCF::getTPL()->assign('urlControllerReplacementError', $matches['alias']);
-                                               throw new UserInputException($option->optionName, 'controllerReplacementDuplicateAlias', array('alias' => $matches['alias']));
-                                       }
-                                       
-                                       $aliases[] = $matches['alias'];
-                                       $controllers[] = $matches['controller'];
-                                       
-                                       // check if controller exists
-                                       if (!$this->isKnownController($matches['controller'])) {
-                                               WCF::getTPL()->assign('urlControllerReplacementError', $matches['controller']);
-                                               throw new UserInputException($option->optionName, 'controllerReplacementUnknown', array('controller' => $matches['controller']));
-                                       }
-                                       
-                                       // check if alias collides with an existing controller name
-                                       if ($this->isKnownController($matches['alias'])) {
-                                               WCF::getTPL()->assign('urlControllerReplacementError', $matches['alias']);
-                                               throw new UserInputException($option->optionName, 'controllerReplacementCollision', array('alias' => $matches['alias']));
-                                       }
-                               }
-                               else {
-                                       WCF::getTPL()->assign('urlControllerReplacementError', $line);
-                                       throw new UserInputException($option->optionName, 'controllerReplacementInvalidFormat', array('line' => $line));
-                               }
-                       }
-               }
-       }
-       
-       /**
-        * Cleans up newlines and converts input to lower-case.
-        * 
-        * @param       string          $newValue
-        * @return      string
-        */
-       protected function cleanup($newValue) {
-               $newValue = StringUtil::unifyNewlines($newValue);
-               $newValue = trim($newValue);
-               $newValue = preg_replace('~\n+~', "\n", $newValue);
-               $newValue = mb_strtolower($newValue);
-               
-               return $newValue;
-       }
-       
-       /**
-        * Returns true if given controller name is known to the system, used to
-        * prevent aliases colliding with existing ones.
-        * 
-        * @param       string          $controller
-        * @return      boolean
-        */
-       protected function isKnownController($controller) {
-               if ($this->controllers === null) {
-                       $this->controllers = ControllerCacheBuilder::getInstance()->getData(array(
-                               'environment' => 'user'
-                       ));
-               }
-               
-               $controller = str_replace('-', '', $controller);
-               foreach ($this->controllers as $types) {
-                       foreach ($types as $controllers) {
-                               if (isset($controllers[$controller])) {
-                                       return true;
-                               }
-                       }
-               }
-               
-               return false;
-       }
-}
index 287d1b5db43f2b646927ef0a9783bb35aa94ba2a..fbce7a40e9e5948906452db7bfffe24c2881afb9 100644 (file)
@@ -656,9 +656,9 @@ class PackageInstallationDispatcher {
        /**
         * Extracts files from .tar(.gz) archive and installs them
         * 
-        * @param       string                  $targetDir
-        * @param       string                  $sourceArchive
-        * @param       FileHandler             $fileHandler
+        * @param       string                                  $targetDir
+        * @param       string                                  $sourceArchive
+        * @param       \wcf\system\setup\IFileHandler          $fileHandler
         * @return      \wcf\system\setup\Installer
         */
        public function extractFiles($targetDir, $sourceArchive, $fileHandler = null) {
index 274cc9e20735df7dcf24574ec0f4bd6f9af86f58..0f19fc0a7392536c15b805dec9d946e3266200a9 100644 (file)
@@ -178,9 +178,9 @@ class PackageValidationManager extends SingletonFactory {
         * 
         * Please be aware that unknown PIPs will silently ignored and cause no error.
         * 
-        * @param       \wcf\data\package\PackageArchive        $archive
-        * @param       string                                  $pip
-        * @param       string                                  $instruction
+        * @param       PackageArchive          $archive
+        * @param       string                  $pip
+        * @param       string                  $instruction
         * @return      boolean
         */
        public function validatePackageInstallationPluginInstruction(PackageArchive $archive, $pip, $instruction) {
index df9bd20d54dc5f493d43b4f3ca1d9d87acf2ad3a..731c24bda2edf9f118efc0fdd8bd892674669db3 100644 (file)
@@ -19,7 +19,7 @@ use wcf\util\StringUtil;
 class TemplateScriptingCompiler {
        /**
         * template engine object
-        * @var \wcf\system\template\TemplateEngine
+        * @var TemplateEngine
         */
        protected $template;
        
@@ -175,7 +175,7 @@ class TemplateScriptingCompiler {
        /**
         * Creates a new TemplateScriptingCompiler object.
         * 
-        * @param       \wcf\system\templateTemplateEngine      $template
+        * @param       TemplateEngine          $template
         */
        public function __construct(TemplateEngine $template) {
                $this->template = $template;
@@ -1413,7 +1413,7 @@ class TemplateScriptingCompiler {
        /**
         * Returns the instance of the template engine class.
         * 
-        * @return      \wcf\system\templateTemplateEngine
+        * @return      TemplateEngine
         */
        public function getTemplate() {
                return $this->template;
index af17f4b137a92c58f4a514f3985b9f36da6792c6..5e76a2336773934d94bae460cbc46f7d276205c0 100644 (file)
@@ -3,6 +3,7 @@ namespace wcf\system\upload;
 use wcf\data\AbstractDatabaseObjectAction;
 use wcf\data\IFile;
 use wcf\data\IThumbnailFile;
+use wcf\system\exception\SystemException;
 use wcf\system\image\ImageHandler;
 use wcf\system\WCF;
 use wcf\util\ExifUtil;
index 78e47f1165e371728584c95ae9259e7c0a6f1319..d93b5c45e4250c46a2d0f4f90cd542d4b128244b 100644 (file)
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\system\user\notification\event;
+use wcf\data\user\User;
 use wcf\data\moderation\queue\ViewableModerationQueue;
 use wcf\data\object\type\ObjectTypeCache;
 use wcf\system\comment\CommentDataHandler;
index 05c578448473902f2aa5f9b19a786ec9495cb4ca..c3cff942b27d5179e129348df04312fc8df40326 100644 (file)
@@ -16,7 +16,7 @@ interface IUserObjectWatch {
         * Validates the given object id. Throws an exception on error.
         * 
         * @param       integer         $objectID
-        * @throws      wcf\system\exception\UserException
+        * @throws      \wcf\system\exception\UserException
         */
        public function validateObjectID($objectID);