From b4207e7172d936edc12bef7dd07a81dd1023e4eb Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Thu, 4 Aug 2016 18:09:31 +0200 Subject: [PATCH] Automatically guess DBO database table name and index name See #1804 --- .../files/lib/data/DatabaseObject.class.php | 40 +++++++++++++++++-- .../lib/data/acl/option/ACLOption.class.php | 10 ----- .../category/ACLOptionCategory.class.php | 12 +----- .../provider/ACPSearchProvider.class.php | 5 --- .../lib/data/acp/session/ACPSession.class.php | 10 ----- .../access/log/ACPSessionAccessLog.class.php | 5 --- .../acp/session/log/ACPSessionLog.class.php | 5 --- .../virtual/ACPSessionVirtual.class.php | 5 --- .../data/acp/template/ACPTemplate.class.php | 5 --- .../install/files/lib/data/ad/Ad.class.php | 10 ----- .../data/application/Application.class.php | 5 --- .../files/lib/data/article/Article.class.php | 10 ----- .../article/content/ArticleContent.class.php | 5 --- .../lib/data/attachment/Attachment.class.php | 10 ----- .../attribute/BBCodeAttribute.class.php | 5 --- .../provider/BBCodeMediaProvider.class.php | 5 --- .../install/files/lib/data/box/Box.class.php | 10 ----- .../question/CaptchaQuestion.class.php | 10 ----- .../lib/data/category/Category.class.php | 10 ----- .../action/ClipboardAction.class.php | 12 +----- .../files/lib/data/comment/Comment.class.php | 10 ----- .../response/CommentResponse.class.php | 10 ----- .../lib/data/condition/Condition.class.php | 10 ----- .../lib/data/core/object/CoreObject.class.php | 12 +----- .../files/lib/data/cronjob/Cronjob.class.php | 10 ----- .../lib/data/cronjob/log/CronjobLog.class.php | 12 +----- .../history/entry/EditHistoryEntry.class.php | 10 ----- .../event/listener/EventListener.class.php | 10 ----- .../files/lib/data/label/Label.class.php | 10 ----- .../lib/data/label/group/LabelGroup.class.php | 10 ----- .../lib/data/language/Language.class.php | 10 ----- .../category/LanguageCategory.class.php | 5 --- .../data/language/item/LanguageItem.class.php | 5 --- .../files/lib/data/like/Like.class.php | 10 ----- .../lib/data/like/object/LikeObject.class.php | 5 --- .../files/lib/data/media/Media.class.php | 10 ----- .../files/lib/data/menu/Menu.class.php | 10 ----- .../lib/data/menu/item/MenuItem.class.php | 10 ----- .../queue/ModerationQueue.class.php | 10 ----- .../log/ModificationLog.class.php | 10 ----- .../files/lib/data/notice/Notice.class.php | 10 ----- .../lib/data/object/type/ObjectType.class.php | 5 --- .../definition/ObjectTypeDefinition.class.php | 12 +----- .../files/lib/data/option/Option.class.php | 10 ----- .../option/category/OptionCategory.class.php | 10 ----- .../files/lib/data/package/Package.class.php | 10 ----- .../PackageInstallationPlugin.class.php | 5 --- .../queue/PackageInstallationQueue.class.php | 10 ----- .../package/update/PackageUpdate.class.php | 5 --- .../server/PackageUpdateServer.class.php | 5 --- .../version/PackageUpdateVersion.class.php | 5 --- .../files/lib/data/page/Page.class.php | 10 ----- .../subscription/PaidSubscription.class.php | 10 ----- .../PaidSubscriptionTransactionLog.class.php | 10 ----- .../user/PaidSubscriptionUser.class.php | 10 ----- .../files/lib/data/poll/Poll.class.php | 10 ----- .../lib/data/poll/option/PollOption.class.php | 10 ----- .../files/lib/data/search/Search.class.php | 12 +----- .../search/keyword/SearchKeyword.class.php | 12 +----- .../files/lib/data/session/Session.class.php | 10 ----- .../session/virtual/SessionVirtual.class.php | 12 +----- .../files/lib/data/smiley/Smiley.class.php | 10 ----- .../files/lib/data/spider/Spider.class.php | 12 +----- .../lib/data/stat/daily/StatDaily.class.php | 12 +----- .../files/lib/data/style/Style.class.php | 10 ----- .../style/variable/StyleVariable.class.php | 10 ----- .../install/files/lib/data/tag/Tag.class.php | 10 ----- .../lib/data/template/Template.class.php | 10 ----- .../template/group/TemplateGroup.class.php | 5 --- .../listener/TemplateListener.class.php | 12 +----- .../files/lib/data/user/User.class.php | 10 ----- .../event/UserActivityEvent.class.php | 10 ----- .../UserAuthenticationFailure.class.php | 10 ----- .../lib/data/user/avatar/UserAvatar.class.php | 10 ----- .../lib/data/user/follow/UserFollow.class.php | 10 ----- .../lib/data/user/group/UserGroup.class.php | 10 ----- .../assignment/UserGroupAssignment.class.php | 10 ----- .../group/option/UserGroupOption.class.php | 5 --- .../UserGroupOptionCategory.class.php | 10 ----- .../lib/data/user/ignore/UserIgnore.class.php | 10 ----- .../user/menu/item/UserMenuItem.class.php | 5 --- .../notification/UserNotification.class.php | 10 ----- .../event/UserNotificationEvent.class.php | 10 ----- .../object/watch/UserObjectWatch.class.php | 10 ----- .../lib/data/user/option/UserOption.class.php | 5 --- .../category/UserOptionCategory.class.php | 10 ----- .../menu/item/UserProfileMenuItem.class.php | 5 --- .../visitor/UserProfileVisitor.class.php | 10 ----- .../lib/data/user/rank/UserRank.class.php | 10 ----- 89 files changed, 47 insertions(+), 785 deletions(-) diff --git a/wcfsetup/install/files/lib/data/DatabaseObject.class.php b/wcfsetup/install/files/lib/data/DatabaseObject.class.php index d3137fabdb..04b015d575 100644 --- a/wcfsetup/install/files/lib/data/DatabaseObject.class.php +++ b/wcfsetup/install/files/lib/data/DatabaseObject.class.php @@ -127,15 +127,36 @@ abstract class DatabaseObject implements IStorableObject { * @inheritDoc */ public static function getDatabaseTableName() { - $classParts = explode('\\', get_called_class()); - return $classParts[0].WCF_N.'_'.static::$databaseTableName; + $className = get_called_class(); + $classParts = explode('\\', $className); + + if (static::$databaseTableName !== '') { + return $classParts[0].WCF_N.'_'.static::$databaseTableName; + } + + static $databaseTableName = null; + if ($databaseTableName === null) { + $databaseTableName = $classParts[0].WCF_N.'_'.strtolower(implode('_', preg_split('~(?=[A-Z](?=[a-z]))~', array_pop($classParts), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY))); + } + + return $databaseTableName; } /** * @inheritDoc */ public static function getDatabaseTableAlias() { - return static::$databaseTableName; + if (static::$databaseTableName !== '') { + return static::$databaseTableName; + } + + static $databaseTableNameAlias = null; + if ($databaseTableNameAlias === null) { + $classParts = explode('\\', get_called_class()); + $databaseTableNameAlias = strtolower(implode('_', preg_split('~(?=[A-Z](?=[a-z]))~', array_pop($classParts), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY))); + } + + return $databaseTableNameAlias; } /** @@ -149,7 +170,18 @@ abstract class DatabaseObject implements IStorableObject { * @inheritDoc */ public static function getDatabaseTableIndexName() { - return static::$databaseTableIndexName; + if (static::$databaseTableIndexName !== '') { + return static::$databaseTableIndexName; + } + + static $databaseTableIndexName = null; + if ($databaseTableIndexName === null) { + $className = explode('\\', get_called_class()); + $parts = preg_split('~(?=[A-Z](?=[a-z]))~', array_pop($className), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); + $databaseTableIndexName = strtolower(array_pop($parts)).'ID'; + } + + return $databaseTableIndexName; } /** diff --git a/wcfsetup/install/files/lib/data/acl/option/ACLOption.class.php b/wcfsetup/install/files/lib/data/acl/option/ACLOption.class.php index 77e0aca41b..f1ec43cc7d 100644 --- a/wcfsetup/install/files/lib/data/acl/option/ACLOption.class.php +++ b/wcfsetup/install/files/lib/data/acl/option/ACLOption.class.php @@ -17,16 +17,6 @@ use wcf\data\DatabaseObject; * @property-read string $categoryName */ class ACLOption extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'acl_option'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'optionID'; - /** * Returns a list of options by object type id. * diff --git a/wcfsetup/install/files/lib/data/acl/option/category/ACLOptionCategory.class.php b/wcfsetup/install/files/lib/data/acl/option/category/ACLOptionCategory.class.php index 135da77c5d..e553f81de0 100644 --- a/wcfsetup/install/files/lib/data/acl/option/category/ACLOptionCategory.class.php +++ b/wcfsetup/install/files/lib/data/acl/option/category/ACLOptionCategory.class.php @@ -15,14 +15,4 @@ use wcf\data\DatabaseObject; * @property-read integer $objectTypeID * @property-read string $categoryName */ -class ACLOptionCategory extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'acl_option_category'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'categoryID'; -} +class ACLOptionCategory extends DatabaseObject {} diff --git a/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProvider.class.php b/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProvider.class.php index eeb27f5afa..602ae454b9 100644 --- a/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProvider.class.php +++ b/wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProvider.class.php @@ -21,9 +21,4 @@ class ACPSearchProvider extends DatabaseObject { * @inheritDoc */ protected static $databaseTableName = 'acp_search_provider'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'providerID'; } diff --git a/wcfsetup/install/files/lib/data/acp/session/ACPSession.class.php b/wcfsetup/install/files/lib/data/acp/session/ACPSession.class.php index 1e6c0b35c7..1132f5f1b1 100644 --- a/wcfsetup/install/files/lib/data/acp/session/ACPSession.class.php +++ b/wcfsetup/install/files/lib/data/acp/session/ACPSession.class.php @@ -26,21 +26,11 @@ use wcf\system\WCF; * @property-read string $sessionVariables */ class ACPSession extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'acp_session'; - /** * @inheritDoc */ protected static $databaseTableIndexIsIdentity = false; - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'sessionID'; - /** * Returns true if this session type supports persistent logins. * diff --git a/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLog.class.php b/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLog.class.php index 71cefa4c84..d4e54987c8 100644 --- a/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLog.class.php +++ b/wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLog.class.php @@ -20,11 +20,6 @@ use wcf\util\UserUtil; * @property-read string $className */ class ACPSessionAccessLog extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'acp_session_access_log'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLog.class.php b/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLog.class.php index 62dae90078..1d816a6f40 100644 --- a/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLog.class.php +++ b/wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLog.class.php @@ -23,11 +23,6 @@ use wcf\util\UserUtil; * @property-read string|null $active */ class ACPSessionLog extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'acp_session_log'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/acp/session/virtual/ACPSessionVirtual.class.php b/wcfsetup/install/files/lib/data/acp/session/virtual/ACPSessionVirtual.class.php index 63327fc765..f639459175 100644 --- a/wcfsetup/install/files/lib/data/acp/session/virtual/ACPSessionVirtual.class.php +++ b/wcfsetup/install/files/lib/data/acp/session/virtual/ACPSessionVirtual.class.php @@ -26,11 +26,6 @@ use wcf\util\UserUtil; * @property-read string $sessionVariables */ class ACPSessionVirtual extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'acp_session_virtual'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/acp/template/ACPTemplate.class.php b/wcfsetup/install/files/lib/data/acp/template/ACPTemplate.class.php index 75527f72ea..e8b54916f8 100644 --- a/wcfsetup/install/files/lib/data/acp/template/ACPTemplate.class.php +++ b/wcfsetup/install/files/lib/data/acp/template/ACPTemplate.class.php @@ -16,11 +16,6 @@ use wcf\data\DatabaseObject; * @property-read string $application */ class ACPTemplate extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'acp_template'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/ad/Ad.class.php b/wcfsetup/install/files/lib/data/ad/Ad.class.php index 40622d0693..38e7c9d56d 100644 --- a/wcfsetup/install/files/lib/data/ad/Ad.class.php +++ b/wcfsetup/install/files/lib/data/ad/Ad.class.php @@ -23,16 +23,6 @@ use wcf\system\WCF; * @property-read integer $showOrder */ class Ad extends DatabaseObject implements IRouteController { - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'adID'; - - /** - * @inheritDoc - */ - protected static $databaseTableName = 'ad'; - /** * Returns the conditions of the ad. * diff --git a/wcfsetup/install/files/lib/data/application/Application.class.php b/wcfsetup/install/files/lib/data/application/Application.class.php index 5bf25e4bef..55d69309fa 100644 --- a/wcfsetup/install/files/lib/data/application/Application.class.php +++ b/wcfsetup/install/files/lib/data/application/Application.class.php @@ -37,11 +37,6 @@ class Application extends DatabaseObject { */ protected $pageURL = ''; - /** - * @inheritDoc - */ - protected static $databaseTableName = 'application'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/article/Article.class.php b/wcfsetup/install/files/lib/data/article/Article.class.php index b31b613c73..8680ead157 100644 --- a/wcfsetup/install/files/lib/data/article/Article.class.php +++ b/wcfsetup/install/files/lib/data/article/Article.class.php @@ -29,16 +29,6 @@ use wcf\system\WCF; * @property-read integer $cumulativeLikes */ class Article extends DatabaseObject implements ILinkableObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'article'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'articleID'; - /** * indicates that article is unpublished */ diff --git a/wcfsetup/install/files/lib/data/article/content/ArticleContent.class.php b/wcfsetup/install/files/lib/data/article/content/ArticleContent.class.php index 36aec40dbc..ad42f27935 100644 --- a/wcfsetup/install/files/lib/data/article/content/ArticleContent.class.php +++ b/wcfsetup/install/files/lib/data/article/content/ArticleContent.class.php @@ -31,11 +31,6 @@ use wcf\util\StringUtil; * @property-read integer $hasEmbeddedObjects */ class ArticleContent extends DatabaseObject implements ILinkableObject, IRouteController { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'article_content'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/attachment/Attachment.class.php b/wcfsetup/install/files/lib/data/attachment/Attachment.class.php index 09a7787b9f..b28db69dd0 100644 --- a/wcfsetup/install/files/lib/data/attachment/Attachment.class.php +++ b/wcfsetup/install/files/lib/data/attachment/Attachment.class.php @@ -42,16 +42,6 @@ use wcf\util\FileUtil; * @property-read integer $showOrder */ class Attachment extends DatabaseObject implements IRouteController, IThumbnailFile { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'attachment'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'attachmentID'; - /** * indicates if the attachment is embedded * @var boolean diff --git a/wcfsetup/install/files/lib/data/bbcode/attribute/BBCodeAttribute.class.php b/wcfsetup/install/files/lib/data/bbcode/attribute/BBCodeAttribute.class.php index bb857efd81..78dd4f1ee6 100644 --- a/wcfsetup/install/files/lib/data/bbcode/attribute/BBCodeAttribute.class.php +++ b/wcfsetup/install/files/lib/data/bbcode/attribute/BBCodeAttribute.class.php @@ -25,11 +25,6 @@ class BBCodeAttribute extends DatabaseObject { */ protected static $databaseTableName = 'bbcode_attribute'; - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'attributeID'; - /** * Reads attributes by assigned bbcode. * diff --git a/wcfsetup/install/files/lib/data/bbcode/media/provider/BBCodeMediaProvider.class.php b/wcfsetup/install/files/lib/data/bbcode/media/provider/BBCodeMediaProvider.class.php index 20c31044ae..53cae2eab9 100644 --- a/wcfsetup/install/files/lib/data/bbcode/media/provider/BBCodeMediaProvider.class.php +++ b/wcfsetup/install/files/lib/data/bbcode/media/provider/BBCodeMediaProvider.class.php @@ -25,11 +25,6 @@ class BBCodeMediaProvider extends DatabaseObject implements IRouteController { */ protected static $databaseTableName = 'bbcode_media_provider'; - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'providerID'; - /** * cached providers * @var BBCodeMediaProvider[] diff --git a/wcfsetup/install/files/lib/data/box/Box.class.php b/wcfsetup/install/files/lib/data/box/Box.class.php index 08d8967c11..a39857fb6f 100644 --- a/wcfsetup/install/files/lib/data/box/Box.class.php +++ b/wcfsetup/install/files/lib/data/box/Box.class.php @@ -54,16 +54,6 @@ class Box extends DatabaseObject { */ protected $image; - /** - * @inheritDoc - */ - protected static $databaseTableName = 'box'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'boxID'; - /** * available box types * @var string[] diff --git a/wcfsetup/install/files/lib/data/captcha/question/CaptchaQuestion.class.php b/wcfsetup/install/files/lib/data/captcha/question/CaptchaQuestion.class.php index 4afe9408f8..427296c04c 100644 --- a/wcfsetup/install/files/lib/data/captcha/question/CaptchaQuestion.class.php +++ b/wcfsetup/install/files/lib/data/captcha/question/CaptchaQuestion.class.php @@ -19,16 +19,6 @@ use wcf\util\StringUtil; * @property-read integer $isDisabled */ class CaptchaQuestion extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'captcha_question'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'questionID'; - /** * Returns true if the given user input is an answer to this question. * diff --git a/wcfsetup/install/files/lib/data/category/Category.class.php b/wcfsetup/install/files/lib/data/category/Category.class.php index 9069c5751f..0ae5a88c33 100644 --- a/wcfsetup/install/files/lib/data/category/Category.class.php +++ b/wcfsetup/install/files/lib/data/category/Category.class.php @@ -68,16 +68,6 @@ class Category extends ProcessibleDatabaseObject implements IPermissionObject, I */ protected $defaultPermission = false; - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'categoryID'; - - /** - * @inheritDoc - */ - protected static $databaseTableName = 'category'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/clipboard/action/ClipboardAction.class.php b/wcfsetup/install/files/lib/data/clipboard/action/ClipboardAction.class.php index 1b4620d04d..78f3d5f7f1 100644 --- a/wcfsetup/install/files/lib/data/clipboard/action/ClipboardAction.class.php +++ b/wcfsetup/install/files/lib/data/clipboard/action/ClipboardAction.class.php @@ -16,14 +16,4 @@ use wcf\data\DatabaseObject; * @property-read string $actionClassName * @property-read integer $showOrder */ -class ClipboardAction extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'clipboard_action'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'actionID'; -} +class ClipboardAction extends DatabaseObject {} diff --git a/wcfsetup/install/files/lib/data/comment/Comment.class.php b/wcfsetup/install/files/lib/data/comment/Comment.class.php index 9846c9e643..fdea2f852d 100644 --- a/wcfsetup/install/files/lib/data/comment/Comment.class.php +++ b/wcfsetup/install/files/lib/data/comment/Comment.class.php @@ -28,16 +28,6 @@ use wcf\util\StringUtil; class Comment extends DatabaseObject implements IMessage { use TUserContent; - /** - * @inheritDoc - */ - protected static $databaseTableName = 'comment'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'commentID'; - /** * Returns a list of response ids. * diff --git a/wcfsetup/install/files/lib/data/comment/response/CommentResponse.class.php b/wcfsetup/install/files/lib/data/comment/response/CommentResponse.class.php index 42057b52e1..ef401ff11e 100644 --- a/wcfsetup/install/files/lib/data/comment/response/CommentResponse.class.php +++ b/wcfsetup/install/files/lib/data/comment/response/CommentResponse.class.php @@ -26,16 +26,6 @@ use wcf\util\StringUtil; class CommentResponse extends DatabaseObject implements IMessage { use TUserContent; - /** - * @inheritDoc - */ - protected static $databaseTableName = 'comment_response'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'responseID'; - /** * comment object * @var Comment diff --git a/wcfsetup/install/files/lib/data/condition/Condition.class.php b/wcfsetup/install/files/lib/data/condition/Condition.class.php index d2a43a7c38..4aeba3d551 100644 --- a/wcfsetup/install/files/lib/data/condition/Condition.class.php +++ b/wcfsetup/install/files/lib/data/condition/Condition.class.php @@ -17,16 +17,6 @@ use wcf\data\DatabaseObject; * @property-read array $conditionData */ class Condition extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'conditionID'; - - /** - * @inheritDoc - */ - protected static $databaseTableName = 'condition'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/core/object/CoreObject.class.php b/wcfsetup/install/files/lib/data/core/object/CoreObject.class.php index ae10ba6a03..2b858a7043 100644 --- a/wcfsetup/install/files/lib/data/core/object/CoreObject.class.php +++ b/wcfsetup/install/files/lib/data/core/object/CoreObject.class.php @@ -14,14 +14,4 @@ use wcf\data\DatabaseObject; * @property-read integer $packageID * @property-read string $objectName */ -class CoreObject extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'core_object'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'objectID'; -} +class CoreObject extends DatabaseObject {} diff --git a/wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php b/wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php index 3fcbf7d56e..01989cf741 100644 --- a/wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php +++ b/wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php @@ -35,16 +35,6 @@ use wcf\util\CronjobUtil; class Cronjob extends DatabaseObject { use TDatabaseObjectOptions; - /** - * @inheritDoc - */ - protected static $databaseTableName = 'cronjob'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'cronjobID'; - /** * indicates that cronjob is available for execution */ diff --git a/wcfsetup/install/files/lib/data/cronjob/log/CronjobLog.class.php b/wcfsetup/install/files/lib/data/cronjob/log/CronjobLog.class.php index ce3a9b51b2..dc85ef00b7 100644 --- a/wcfsetup/install/files/lib/data/cronjob/log/CronjobLog.class.php +++ b/wcfsetup/install/files/lib/data/cronjob/log/CronjobLog.class.php @@ -16,14 +16,4 @@ use wcf\data\DatabaseObject; * @property-read integer $success * @property-read string $error */ -class CronjobLog extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'cronjob_log'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'cronjobLogID'; -} +class CronjobLog extends DatabaseObject {} diff --git a/wcfsetup/install/files/lib/data/edit/history/entry/EditHistoryEntry.class.php b/wcfsetup/install/files/lib/data/edit/history/entry/EditHistoryEntry.class.php index d3087d96e4..e23441adbb 100644 --- a/wcfsetup/install/files/lib/data/edit/history/entry/EditHistoryEntry.class.php +++ b/wcfsetup/install/files/lib/data/edit/history/entry/EditHistoryEntry.class.php @@ -23,16 +23,6 @@ use wcf\data\DatabaseObject; * @property-read string $editReason */ class EditHistoryEntry extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'edit_history_entry'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'entryID'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/event/listener/EventListener.class.php b/wcfsetup/install/files/lib/data/event/listener/EventListener.class.php index d54ac22dfb..3b8df8a992 100644 --- a/wcfsetup/install/files/lib/data/event/listener/EventListener.class.php +++ b/wcfsetup/install/files/lib/data/event/listener/EventListener.class.php @@ -28,16 +28,6 @@ class EventListener extends DatabaseObject { use TDatabaseObjectOptions; use TDatabaseObjectPermissions; - /** - * @inheritDoc - */ - protected static $databaseTableName = 'event_listener'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'listenerID'; - /** * prefix of automatically created event listener names * @var string diff --git a/wcfsetup/install/files/lib/data/label/Label.class.php b/wcfsetup/install/files/lib/data/label/Label.class.php index 042399d6b3..b20adc8f9a 100644 --- a/wcfsetup/install/files/lib/data/label/Label.class.php +++ b/wcfsetup/install/files/lib/data/label/Label.class.php @@ -19,16 +19,6 @@ use wcf\system\WCF; * @property-read integer $showOrder */ class Label extends DatabaseObject implements IRouteController { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'label'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'labelID'; - /** * Returns the label's textual representation if a label is treated as a * string. diff --git a/wcfsetup/install/files/lib/data/label/group/LabelGroup.class.php b/wcfsetup/install/files/lib/data/label/group/LabelGroup.class.php index 3983c607eb..2a6bf6917c 100644 --- a/wcfsetup/install/files/lib/data/label/group/LabelGroup.class.php +++ b/wcfsetup/install/files/lib/data/label/group/LabelGroup.class.php @@ -19,16 +19,6 @@ use wcf\system\WCF; * @property-read integer $showOrder */ class LabelGroup extends DatabaseObject implements IRouteController { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'label_group'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'groupID'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/language/Language.class.php b/wcfsetup/install/files/lib/data/language/Language.class.php index bc55cc5d5c..535451c6e2 100644 --- a/wcfsetup/install/files/lib/data/language/Language.class.php +++ b/wcfsetup/install/files/lib/data/language/Language.class.php @@ -21,16 +21,6 @@ use wcf\system\WCF; * @property-read integer $isDisabled */ class Language extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'language'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'languageID'; - /** * list of language items * @var string[] diff --git a/wcfsetup/install/files/lib/data/language/category/LanguageCategory.class.php b/wcfsetup/install/files/lib/data/language/category/LanguageCategory.class.php index 2912eb50f4..dc028c4cbf 100644 --- a/wcfsetup/install/files/lib/data/language/category/LanguageCategory.class.php +++ b/wcfsetup/install/files/lib/data/language/category/LanguageCategory.class.php @@ -14,11 +14,6 @@ use wcf\data\DatabaseObject; * @property-read string $languageCategory */ class LanguageCategory extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'language_category'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/language/item/LanguageItem.class.php b/wcfsetup/install/files/lib/data/language/item/LanguageItem.class.php index 87695b934a..fcb20b882d 100644 --- a/wcfsetup/install/files/lib/data/language/item/LanguageItem.class.php +++ b/wcfsetup/install/files/lib/data/language/item/LanguageItem.class.php @@ -21,11 +21,6 @@ use wcf\data\DatabaseObject; * @property-read integer|null $packageID */ class LanguageItem extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'language_item'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/like/Like.class.php b/wcfsetup/install/files/lib/data/like/Like.class.php index 3dd9e854c1..54a3777ae9 100644 --- a/wcfsetup/install/files/lib/data/like/Like.class.php +++ b/wcfsetup/install/files/lib/data/like/Like.class.php @@ -20,16 +20,6 @@ use wcf\system\WCF; * @property-read integer $likeValue */ class Like extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'like'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'likeID'; - /** * like value * @var integer diff --git a/wcfsetup/install/files/lib/data/like/object/LikeObject.class.php b/wcfsetup/install/files/lib/data/like/object/LikeObject.class.php index 050e75d867..451c06b0d7 100644 --- a/wcfsetup/install/files/lib/data/like/object/LikeObject.class.php +++ b/wcfsetup/install/files/lib/data/like/object/LikeObject.class.php @@ -23,11 +23,6 @@ use wcf\system\WCF; * @property-read string $cachedUsers */ class LikeObject extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'like_object'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/media/Media.class.php b/wcfsetup/install/files/lib/data/media/Media.class.php index 57037182a2..5ce4f99dbc 100644 --- a/wcfsetup/install/files/lib/data/media/Media.class.php +++ b/wcfsetup/install/files/lib/data/media/Media.class.php @@ -54,16 +54,6 @@ class Media extends DatabaseObject implements ILinkableObject, IRouteController, */ protected $i18nData; - /** - * @inheritDoc - */ - protected static $databaseTableName = 'media'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'mediaID'; - /** * data of the different thumbnail sizes * @var array diff --git a/wcfsetup/install/files/lib/data/menu/Menu.class.php b/wcfsetup/install/files/lib/data/menu/Menu.class.php index 58d7587cc2..389df95f5a 100644 --- a/wcfsetup/install/files/lib/data/menu/Menu.class.php +++ b/wcfsetup/install/files/lib/data/menu/Menu.class.php @@ -21,16 +21,6 @@ use wcf\system\WCF; * @property-read integer $packageID */ class Menu extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'menu'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'menuID'; - /** * menu item node tree * @var MenuItemNodeTree diff --git a/wcfsetup/install/files/lib/data/menu/item/MenuItem.class.php b/wcfsetup/install/files/lib/data/menu/item/MenuItem.class.php index be074a5733..5e974c3b6c 100644 --- a/wcfsetup/install/files/lib/data/menu/item/MenuItem.class.php +++ b/wcfsetup/install/files/lib/data/menu/item/MenuItem.class.php @@ -31,16 +31,6 @@ use wcf\system\WCF; * @property-read integer $packageID */ class MenuItem extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'menu_item'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'itemID'; - /** * @var IMenuPageHandler */ diff --git a/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueue.class.php b/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueue.class.php index 10c64bafe7..18e9b241df 100644 --- a/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueue.class.php +++ b/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueue.class.php @@ -25,16 +25,6 @@ use wcf\system\WCF; * @property-read array $additionalData */ class ModerationQueue extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'moderation_queue'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'queueID'; - // states of column 'status' const STATUS_OUTSTANDING = 0; const STATUS_PROCESSING = 1; diff --git a/wcfsetup/install/files/lib/data/modification/log/ModificationLog.class.php b/wcfsetup/install/files/lib/data/modification/log/ModificationLog.class.php index 8dd09e339f..4ea0875e75 100644 --- a/wcfsetup/install/files/lib/data/modification/log/ModificationLog.class.php +++ b/wcfsetup/install/files/lib/data/modification/log/ModificationLog.class.php @@ -21,16 +21,6 @@ use wcf\data\DatabaseObject; * @property-read array $additionalData */ class ModificationLog extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'modification_log'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'logID'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/notice/Notice.class.php b/wcfsetup/install/files/lib/data/notice/Notice.class.php index 24bbd0f20c..7e13926012 100644 --- a/wcfsetup/install/files/lib/data/notice/Notice.class.php +++ b/wcfsetup/install/files/lib/data/notice/Notice.class.php @@ -31,16 +31,6 @@ class Notice extends DatabaseObject implements IRouteController { */ protected $isDismissed = null; - /** - * @inheritDoc - */ - protected static $databaseTableName = 'notice'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'noticeID'; - /** * Returns the textual representation of the notice. * diff --git a/wcfsetup/install/files/lib/data/object/type/ObjectType.class.php b/wcfsetup/install/files/lib/data/object/type/ObjectType.class.php index 529c9323ba..60df6c2048 100644 --- a/wcfsetup/install/files/lib/data/object/type/ObjectType.class.php +++ b/wcfsetup/install/files/lib/data/object/type/ObjectType.class.php @@ -27,11 +27,6 @@ class ObjectType extends ProcessibleDatabaseObject { use TDatabaseObjectOptions; use TDatabaseObjectPermissions; - /** - * @inheritDoc - */ - protected static $databaseTableName = 'object_type'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinition.class.php b/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinition.class.php index ce4f794bf5..cefc91cbc6 100644 --- a/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinition.class.php +++ b/wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinition.class.php @@ -16,14 +16,4 @@ use wcf\data\DatabaseObject; * @property-read string $interfaceName * @property-read string $categoryName */ -class ObjectTypeDefinition extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'object_type_definition'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'definitionID'; -} +class ObjectTypeDefinition extends DatabaseObject {} diff --git a/wcfsetup/install/files/lib/data/option/Option.class.php b/wcfsetup/install/files/lib/data/option/Option.class.php index d2e192977e..dbb7974cfd 100644 --- a/wcfsetup/install/files/lib/data/option/Option.class.php +++ b/wcfsetup/install/files/lib/data/option/Option.class.php @@ -35,16 +35,6 @@ class Option extends DatabaseObject { use TDatabaseObjectOptions; use TDatabaseObjectPermissions; - /** - * @inheritDoc - */ - protected static $databaseTableName = 'option'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'optionID'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/option/category/OptionCategory.class.php b/wcfsetup/install/files/lib/data/option/category/OptionCategory.class.php index 2960345c6d..6e5c2dbfce 100644 --- a/wcfsetup/install/files/lib/data/option/category/OptionCategory.class.php +++ b/wcfsetup/install/files/lib/data/option/category/OptionCategory.class.php @@ -23,14 +23,4 @@ use wcf\data\TDatabaseObjectPermissions; class OptionCategory extends DatabaseObject { use TDatabaseObjectOptions; use TDatabaseObjectPermissions; - - /** - * @inheritDoc - */ - protected static $databaseTableName = 'option_category'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'categoryID'; } diff --git a/wcfsetup/install/files/lib/data/package/Package.class.php b/wcfsetup/install/files/lib/data/package/Package.class.php index 31bf7b21e2..3082be4a78 100644 --- a/wcfsetup/install/files/lib/data/package/Package.class.php +++ b/wcfsetup/install/files/lib/data/package/Package.class.php @@ -52,16 +52,6 @@ class Package extends DatabaseObject { */ protected $requiredPackages = null; - /** - * @inheritDoc - */ - protected static $databaseTableName = 'package'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'packageID'; - /** * list of ids of packages which are required by another package * @var integer[] diff --git a/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPlugin.class.php index 3342385294..6e9ab660c0 100644 --- a/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPlugin.class.php +++ b/wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPlugin.class.php @@ -16,11 +16,6 @@ use wcf\data\DatabaseObject; * @property-read string $className */ class PackageInstallationPlugin extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'package_installation_plugin'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueue.class.php b/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueue.class.php index c7f45a47a0..93dc43a114 100644 --- a/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueue.class.php +++ b/wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueue.class.php @@ -24,16 +24,6 @@ use wcf\system\WCF; * @property-read integer $isApplication */ class PackageInstallationQueue extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'package_installation_queue'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'queueID'; - /** * Returns a new process number for package installation queue. * diff --git a/wcfsetup/install/files/lib/data/package/update/PackageUpdate.class.php b/wcfsetup/install/files/lib/data/package/update/PackageUpdate.class.php index 6eee68c4de..fa3efd1c3d 100644 --- a/wcfsetup/install/files/lib/data/package/update/PackageUpdate.class.php +++ b/wcfsetup/install/files/lib/data/package/update/PackageUpdate.class.php @@ -20,11 +20,6 @@ use wcf\data\DatabaseObject; * @property-read integer $isApplication */ class PackageUpdate extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'package_update'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServer.class.php b/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServer.class.php index eba7c405ea..ae179d65c5 100644 --- a/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServer.class.php +++ b/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServer.class.php @@ -25,11 +25,6 @@ use wcf\util\FileUtil; * @property-read string $apiVersion */ class PackageUpdateServer extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'package_update_server'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersion.class.php b/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersion.class.php index ccd115a322..b88502a95d 100644 --- a/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersion.class.php +++ b/wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersion.class.php @@ -20,11 +20,6 @@ use wcf\data\DatabaseObject; * @property-read integer $isAccessible */ class PackageUpdateVersion extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'package_update_version'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/page/Page.class.php b/wcfsetup/install/files/lib/data/page/Page.class.php index 4b36a34aa1..cd0203d085 100644 --- a/wcfsetup/install/files/lib/data/page/Page.class.php +++ b/wcfsetup/install/files/lib/data/page/Page.class.php @@ -52,16 +52,6 @@ class Page extends DatabaseObject implements ILinkableObject, ITitledObject { */ public static $availablePageTypes = ['text', 'html', 'tpl', 'system']; - /** - * @inheritDoc - */ - protected static $databaseTableName = 'page'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'pageID'; - /** * @var \wcf\system\page\handler\IMenuPageHandler */ diff --git a/wcfsetup/install/files/lib/data/paid/subscription/PaidSubscription.class.php b/wcfsetup/install/files/lib/data/paid/subscription/PaidSubscription.class.php index 3720575919..c26a3def22 100644 --- a/wcfsetup/install/files/lib/data/paid/subscription/PaidSubscription.class.php +++ b/wcfsetup/install/files/lib/data/paid/subscription/PaidSubscription.class.php @@ -28,16 +28,6 @@ use wcf\system\WCF; * @property-read string $excludedSubscriptionIDs */ class PaidSubscription extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'paid_subscription'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'subscriptionID'; - /** * Returns list of purchase buttons. * diff --git a/wcfsetup/install/files/lib/data/paid/subscription/transaction/log/PaidSubscriptionTransactionLog.class.php b/wcfsetup/install/files/lib/data/paid/subscription/transaction/log/PaidSubscriptionTransactionLog.class.php index 54a421f54c..8b3bacbcf5 100644 --- a/wcfsetup/install/files/lib/data/paid/subscription/transaction/log/PaidSubscriptionTransactionLog.class.php +++ b/wcfsetup/install/files/lib/data/paid/subscription/transaction/log/PaidSubscriptionTransactionLog.class.php @@ -25,16 +25,6 @@ use wcf\system\WCF; * @property-read string $logMessage */ class PaidSubscriptionTransactionLog extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'paid_subscription_transaction_log'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'logID'; - /** * user object * @var \wcf\data\user\User diff --git a/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUser.class.php b/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUser.class.php index 3bc332defc..b8bda64ac6 100644 --- a/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUser.class.php +++ b/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUser.class.php @@ -20,16 +20,6 @@ use wcf\system\WCF; * @property-read integer $isActive */ class PaidSubscriptionUser extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'paid_subscription_user'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'subscriptionUserID'; - /** * paid subscription object * @var \wcf\data\paid\subscription\PaidSubscription diff --git a/wcfsetup/install/files/lib/data/poll/Poll.class.php b/wcfsetup/install/files/lib/data/poll/Poll.class.php index 43e562bab6..1aee0512ea 100644 --- a/wcfsetup/install/files/lib/data/poll/Poll.class.php +++ b/wcfsetup/install/files/lib/data/poll/Poll.class.php @@ -28,16 +28,6 @@ use wcf\system\WCF; * @property-read integer $votes */ class Poll extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'poll'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'pollID'; - /** * participation status * @var boolean diff --git a/wcfsetup/install/files/lib/data/poll/option/PollOption.class.php b/wcfsetup/install/files/lib/data/poll/option/PollOption.class.php index 594fc285f2..a6a7068fa7 100644 --- a/wcfsetup/install/files/lib/data/poll/option/PollOption.class.php +++ b/wcfsetup/install/files/lib/data/poll/option/PollOption.class.php @@ -18,16 +18,6 @@ use wcf\data\DatabaseObject; * @property-read integer $showOrder */ class PollOption extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'poll_option'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'optionID'; - /** * true, if option was selected by current user * @var boolean diff --git a/wcfsetup/install/files/lib/data/search/Search.class.php b/wcfsetup/install/files/lib/data/search/Search.class.php index 703337f4a8..aebb94aaaf 100644 --- a/wcfsetup/install/files/lib/data/search/Search.class.php +++ b/wcfsetup/install/files/lib/data/search/Search.class.php @@ -17,14 +17,4 @@ use wcf\data\DatabaseObject; * @property-read string $searchType * @property-read string $searchHash */ -class Search extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'search'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'searchID'; -} +class Search extends DatabaseObject {} diff --git a/wcfsetup/install/files/lib/data/search/keyword/SearchKeyword.class.php b/wcfsetup/install/files/lib/data/search/keyword/SearchKeyword.class.php index 2ee94209ae..08c867f358 100644 --- a/wcfsetup/install/files/lib/data/search/keyword/SearchKeyword.class.php +++ b/wcfsetup/install/files/lib/data/search/keyword/SearchKeyword.class.php @@ -15,14 +15,4 @@ use wcf\data\DatabaseObject; * @property-read integer $searches * @property-read integer $lastSearchTime */ -class SearchKeyword extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'search_keyword'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'keywordID'; -} +class SearchKeyword extends DatabaseObject {} diff --git a/wcfsetup/install/files/lib/data/session/Session.class.php b/wcfsetup/install/files/lib/data/session/Session.class.php index 06bb9e94e9..5903e153d8 100644 --- a/wcfsetup/install/files/lib/data/session/Session.class.php +++ b/wcfsetup/install/files/lib/data/session/Session.class.php @@ -13,16 +13,6 @@ use wcf\data\acp\session\ACPSession; * @property-read string $spiderID */ class Session extends ACPSession { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'session'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'sessionID'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/session/virtual/SessionVirtual.class.php b/wcfsetup/install/files/lib/data/session/virtual/SessionVirtual.class.php index a1951fb1aa..39c1f080aa 100644 --- a/wcfsetup/install/files/lib/data/session/virtual/SessionVirtual.class.php +++ b/wcfsetup/install/files/lib/data/session/virtual/SessionVirtual.class.php @@ -11,14 +11,4 @@ use wcf\data\acp\session\virtual\ACPSessionVirtual; * @license GNU Lesser General Public License * @package WoltLabSuite\Core\Data\Session\Virtual */ -class SessionVirtual extends ACPSessionVirtual { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'session_virtual'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'virtualSessionID'; -} +class SessionVirtual extends ACPSessionVirtual {} diff --git a/wcfsetup/install/files/lib/data/smiley/Smiley.class.php b/wcfsetup/install/files/lib/data/smiley/Smiley.class.php index 3f34371275..c28b9e76d8 100644 --- a/wcfsetup/install/files/lib/data/smiley/Smiley.class.php +++ b/wcfsetup/install/files/lib/data/smiley/Smiley.class.php @@ -22,16 +22,6 @@ use wcf\util\StringUtil; * @property-read integer $showOrder */ class Smiley extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'smiley'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'smileyID'; - /** * Returns the url to this smiley. * diff --git a/wcfsetup/install/files/lib/data/spider/Spider.class.php b/wcfsetup/install/files/lib/data/spider/Spider.class.php index cf320f6efa..fdfba6d5f0 100644 --- a/wcfsetup/install/files/lib/data/spider/Spider.class.php +++ b/wcfsetup/install/files/lib/data/spider/Spider.class.php @@ -15,14 +15,4 @@ use wcf\data\DatabaseObject; * @property-read string $spiderName * @property-read string $spiderURL */ -class Spider extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'spider'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'spiderID'; -} +class Spider extends DatabaseObject {} diff --git a/wcfsetup/install/files/lib/data/stat/daily/StatDaily.class.php b/wcfsetup/install/files/lib/data/stat/daily/StatDaily.class.php index a1bad51308..519fc70027 100644 --- a/wcfsetup/install/files/lib/data/stat/daily/StatDaily.class.php +++ b/wcfsetup/install/files/lib/data/stat/daily/StatDaily.class.php @@ -16,14 +16,4 @@ use wcf\data\DatabaseObject; * @property-read integer $counter * @property-read integer $total */ -class StatDaily extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'stat_daily'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'statID'; -} +class StatDaily extends DatabaseObject {} diff --git a/wcfsetup/install/files/lib/data/style/Style.class.php b/wcfsetup/install/files/lib/data/style/Style.class.php index 39462a197a..42150605e2 100644 --- a/wcfsetup/install/files/lib/data/style/Style.class.php +++ b/wcfsetup/install/files/lib/data/style/Style.class.php @@ -30,16 +30,6 @@ use wcf\system\WCF; * @property-read integer $isTainted */ class Style extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'style'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'styleID'; - /** * list of style variables * @var string[] diff --git a/wcfsetup/install/files/lib/data/style/variable/StyleVariable.class.php b/wcfsetup/install/files/lib/data/style/variable/StyleVariable.class.php index 0f111bd847..8ea67c0e64 100644 --- a/wcfsetup/install/files/lib/data/style/variable/StyleVariable.class.php +++ b/wcfsetup/install/files/lib/data/style/variable/StyleVariable.class.php @@ -15,16 +15,6 @@ use wcf\data\DatabaseObject; * @property-read string $defaultValue */ class StyleVariable extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'style_variable'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'variableID'; - const TYPE_COLOR = 'color'; const TYPE_TEXT = 'text'; const TYPE_UNIT = 'unit'; diff --git a/wcfsetup/install/files/lib/data/tag/Tag.class.php b/wcfsetup/install/files/lib/data/tag/Tag.class.php index bd7780c512..9cc4ad169f 100644 --- a/wcfsetup/install/files/lib/data/tag/Tag.class.php +++ b/wcfsetup/install/files/lib/data/tag/Tag.class.php @@ -19,16 +19,6 @@ use wcf\util\ArrayUtil; * @property-read integer|null $synonymFor */ class Tag extends DatabaseObject implements IRouteController { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'tag'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'tagID'; - /** * Return the tag with the given name or null of no such tag exists. * diff --git a/wcfsetup/install/files/lib/data/template/Template.class.php b/wcfsetup/install/files/lib/data/template/Template.class.php index d55bacba2a..b9ae0a61e3 100644 --- a/wcfsetup/install/files/lib/data/template/Template.class.php +++ b/wcfsetup/install/files/lib/data/template/Template.class.php @@ -22,16 +22,6 @@ use wcf\util\FileUtil; * @property-read integer $lastModificationTime */ class Template extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'template'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'templateID'; - /** @noinspection PhpMissingParentConstructorInspection */ /** * @inheritDoc diff --git a/wcfsetup/install/files/lib/data/template/group/TemplateGroup.class.php b/wcfsetup/install/files/lib/data/template/group/TemplateGroup.class.php index 192143154b..7ab6ce803f 100644 --- a/wcfsetup/install/files/lib/data/template/group/TemplateGroup.class.php +++ b/wcfsetup/install/files/lib/data/template/group/TemplateGroup.class.php @@ -18,11 +18,6 @@ use wcf\util\StringUtil; * @property-read string $templateGroupFolderName */ class TemplateGroup extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'template_group'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/template/listener/TemplateListener.class.php b/wcfsetup/install/files/lib/data/template/listener/TemplateListener.class.php index 4c6d2b7618..92669c761e 100644 --- a/wcfsetup/install/files/lib/data/template/listener/TemplateListener.class.php +++ b/wcfsetup/install/files/lib/data/template/listener/TemplateListener.class.php @@ -21,14 +21,4 @@ use wcf\data\DatabaseObject; * @property-read string $permissions * @property-read string $options */ -class TemplateListener extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'template_listener'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'listenerID'; -} +class TemplateListener extends DatabaseObject {} diff --git a/wcfsetup/install/files/lib/data/user/User.class.php b/wcfsetup/install/files/lib/data/user/User.class.php index 8cde1f3f9c..7b395b838f 100644 --- a/wcfsetup/install/files/lib/data/user/User.class.php +++ b/wcfsetup/install/files/lib/data/user/User.class.php @@ -64,16 +64,6 @@ use wcf\util\PasswordUtil; * @property-read integer $likesReceived */ final class User extends DatabaseObject implements IRouteController, IUserContent { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'user'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'userID'; - /** * list of group ids * @var integer[] diff --git a/wcfsetup/install/files/lib/data/user/activity/event/UserActivityEvent.class.php b/wcfsetup/install/files/lib/data/user/activity/event/UserActivityEvent.class.php index 64c895ea09..68ab5bdac7 100644 --- a/wcfsetup/install/files/lib/data/user/activity/event/UserActivityEvent.class.php +++ b/wcfsetup/install/files/lib/data/user/activity/event/UserActivityEvent.class.php @@ -19,16 +19,6 @@ use wcf\data\DatabaseObject; * @property-read array $additionalData */ class UserActivityEvent extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'user_activity_event'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'eventID'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/user/authentication/failure/UserAuthenticationFailure.class.php b/wcfsetup/install/files/lib/data/user/authentication/failure/UserAuthenticationFailure.class.php index f85a691871..08a481b9ee 100644 --- a/wcfsetup/install/files/lib/data/user/authentication/failure/UserAuthenticationFailure.class.php +++ b/wcfsetup/install/files/lib/data/user/authentication/failure/UserAuthenticationFailure.class.php @@ -21,16 +21,6 @@ use wcf\system\WCF; * @property-read string $userAgent */ class UserAuthenticationFailure extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'user_authentication_failure'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'failureID'; - /** * Returns the ip address and attempts to convert into IPv4. * diff --git a/wcfsetup/install/files/lib/data/user/avatar/UserAvatar.class.php b/wcfsetup/install/files/lib/data/user/avatar/UserAvatar.class.php index 86d166e0bf..c147f04842 100644 --- a/wcfsetup/install/files/lib/data/user/avatar/UserAvatar.class.php +++ b/wcfsetup/install/files/lib/data/user/avatar/UserAvatar.class.php @@ -28,16 +28,6 @@ class UserAvatar extends DatabaseObject implements IUserAvatar { */ public static $avatarThumbnailSizes = [32, 96, 128, 256]; - /** - * @inheritDoc - */ - protected static $databaseTableName = 'user_avatar'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'avatarID'; - /** * maximum thumbnail size * @var integer diff --git a/wcfsetup/install/files/lib/data/user/follow/UserFollow.class.php b/wcfsetup/install/files/lib/data/user/follow/UserFollow.class.php index 18c4a0c522..330cdb5a74 100644 --- a/wcfsetup/install/files/lib/data/user/follow/UserFollow.class.php +++ b/wcfsetup/install/files/lib/data/user/follow/UserFollow.class.php @@ -17,16 +17,6 @@ use wcf\system\WCF; * @property-read integer $time */ class UserFollow extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'user_follow'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'followID'; - /** * Retrieves a follower. * diff --git a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php index 0676369ea0..d550fa063e 100644 --- a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php +++ b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php @@ -49,16 +49,6 @@ class UserGroup extends DatabaseObject implements ITitledObject { */ const OTHER = 4; - /** - * @inheritDoc - */ - protected static $databaseTableName = 'user_group'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'groupID'; - /** * group cache * @var UserGroup[] diff --git a/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignment.class.php b/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignment.class.php index 35f03a6380..18e108bd3a 100644 --- a/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignment.class.php +++ b/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignment.class.php @@ -20,16 +20,6 @@ use wcf\system\request\IRouteController; * @property-read integer $isDisabled */ class UserGroupAssignment extends DatabaseObject implements IRouteController { - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'assignmentID'; - - /** - * @inheritDoc - */ - protected static $databaseTableName = 'user_group_assignment'; - /** * Returns the conditions of the automatic assignment to a user group. * diff --git a/wcfsetup/install/files/lib/data/user/group/option/UserGroupOption.class.php b/wcfsetup/install/files/lib/data/user/group/option/UserGroupOption.class.php index 093f64cdc8..e40f89d23d 100644 --- a/wcfsetup/install/files/lib/data/user/group/option/UserGroupOption.class.php +++ b/wcfsetup/install/files/lib/data/user/group/option/UserGroupOption.class.php @@ -17,9 +17,4 @@ class UserGroupOption extends Option { * @inheritDoc */ protected static $databaseTableName = 'user_group_option'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'optionID'; } diff --git a/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategory.class.php b/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategory.class.php index 34cce7e38a..8151d8ba3b 100644 --- a/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategory.class.php +++ b/wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategory.class.php @@ -23,14 +23,4 @@ use wcf\data\TDatabaseObjectPermissions; class UserGroupOptionCategory extends DatabaseObject { use TDatabaseObjectOptions; use TDatabaseObjectPermissions; - - /** - * @inheritDoc - */ - protected static $databaseTableName = 'user_group_option_category'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'categoryID'; } diff --git a/wcfsetup/install/files/lib/data/user/ignore/UserIgnore.class.php b/wcfsetup/install/files/lib/data/user/ignore/UserIgnore.class.php index 670a65288a..e0bd58b421 100644 --- a/wcfsetup/install/files/lib/data/user/ignore/UserIgnore.class.php +++ b/wcfsetup/install/files/lib/data/user/ignore/UserIgnore.class.php @@ -17,16 +17,6 @@ use wcf\system\WCF; * @property-read integer $time */ class UserIgnore extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'user_ignore'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'ignoreID'; - /** * Returns a UserIgnore object for given ignored user id. * diff --git a/wcfsetup/install/files/lib/data/user/menu/item/UserMenuItem.class.php b/wcfsetup/install/files/lib/data/user/menu/item/UserMenuItem.class.php index bd5a08e09a..8a71e638cf 100644 --- a/wcfsetup/install/files/lib/data/user/menu/item/UserMenuItem.class.php +++ b/wcfsetup/install/files/lib/data/user/menu/item/UserMenuItem.class.php @@ -29,11 +29,6 @@ use wcf\system\WCF; * @property-read string $iconClassName */ class UserMenuItem extends ProcessibleDatabaseObject implements ITreeMenuItem { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'user_menu_item'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/user/notification/UserNotification.class.php b/wcfsetup/install/files/lib/data/user/notification/UserNotification.class.php index bb746135fb..edf21d9df0 100644 --- a/wcfsetup/install/files/lib/data/user/notification/UserNotification.class.php +++ b/wcfsetup/install/files/lib/data/user/notification/UserNotification.class.php @@ -27,16 +27,6 @@ use wcf\system\WCF; * @property-read array $additionalData */ class UserNotification extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'user_notification'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'notificationID'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/user/notification/event/UserNotificationEvent.class.php b/wcfsetup/install/files/lib/data/user/notification/event/UserNotificationEvent.class.php index 768616c977..7ade2063cc 100644 --- a/wcfsetup/install/files/lib/data/user/notification/event/UserNotificationEvent.class.php +++ b/wcfsetup/install/files/lib/data/user/notification/event/UserNotificationEvent.class.php @@ -27,16 +27,6 @@ class UserNotificationEvent extends ProcessibleDatabaseObject { use TDatabaseObjectOptions; use TDatabaseObjectPermissions; - /** - * @inheritDoc - */ - protected static $databaseTableName = 'user_notification_event'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'eventID'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/user/object/watch/UserObjectWatch.class.php b/wcfsetup/install/files/lib/data/user/object/watch/UserObjectWatch.class.php index 8ca67af76b..f21ab4e070 100644 --- a/wcfsetup/install/files/lib/data/user/object/watch/UserObjectWatch.class.php +++ b/wcfsetup/install/files/lib/data/user/object/watch/UserObjectWatch.class.php @@ -18,16 +18,6 @@ use wcf\system\WCF; * @property-read integer $notification */ class UserObjectWatch extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'user_object_watch'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'watchID'; - /** * Returns the UserObjectWatch with the given data or null if no such object * exists. diff --git a/wcfsetup/install/files/lib/data/user/option/UserOption.class.php b/wcfsetup/install/files/lib/data/user/option/UserOption.class.php index 32d4c34141..bcff3ec924 100644 --- a/wcfsetup/install/files/lib/data/user/option/UserOption.class.php +++ b/wcfsetup/install/files/lib/data/user/option/UserOption.class.php @@ -99,11 +99,6 @@ class UserOption extends Option { */ protected static $databaseTableName = 'user_option'; - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'optionID'; - /** * option value * @var string diff --git a/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategory.class.php b/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategory.class.php index f720d0b5dd..c033303a88 100644 --- a/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategory.class.php +++ b/wcfsetup/install/files/lib/data/user/option/category/UserOptionCategory.class.php @@ -20,16 +20,6 @@ use wcf\system\WCF; * @property-read string $options */ class UserOptionCategory extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'user_option_category'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'categoryID'; - /** * Returns the title of this category. * diff --git a/wcfsetup/install/files/lib/data/user/profile/menu/item/UserProfileMenuItem.class.php b/wcfsetup/install/files/lib/data/user/profile/menu/item/UserProfileMenuItem.class.php index fe177fd5f1..5d621ae420 100644 --- a/wcfsetup/install/files/lib/data/user/profile/menu/item/UserProfileMenuItem.class.php +++ b/wcfsetup/install/files/lib/data/user/profile/menu/item/UserProfileMenuItem.class.php @@ -35,11 +35,6 @@ class UserProfileMenuItem extends DatabaseObject { */ protected $contentManager = null; - /** - * @inheritDoc - */ - protected static $databaseTableName = 'user_profile_menu_item'; - /** * @inheritDoc */ diff --git a/wcfsetup/install/files/lib/data/user/profile/visitor/UserProfileVisitor.class.php b/wcfsetup/install/files/lib/data/user/profile/visitor/UserProfileVisitor.class.php index 6575567f94..04f84b0365 100644 --- a/wcfsetup/install/files/lib/data/user/profile/visitor/UserProfileVisitor.class.php +++ b/wcfsetup/install/files/lib/data/user/profile/visitor/UserProfileVisitor.class.php @@ -17,16 +17,6 @@ use wcf\system\WCF; * @property-read integer $time */ class UserProfileVisitor extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'user_profile_visitor'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'visitorID'; - /** * Returns a profile visitor object or `null` if it does not exist. * diff --git a/wcfsetup/install/files/lib/data/user/rank/UserRank.class.php b/wcfsetup/install/files/lib/data/user/rank/UserRank.class.php index c6d9532aa7..5d9249eb30 100644 --- a/wcfsetup/install/files/lib/data/user/rank/UserRank.class.php +++ b/wcfsetup/install/files/lib/data/user/rank/UserRank.class.php @@ -22,16 +22,6 @@ use wcf\util\StringUtil; * @property-read integer $requiredGender */ class UserRank extends DatabaseObject { - /** - * @inheritDoc - */ - protected static $databaseTableName = 'user_rank'; - - /** - * @inheritDoc - */ - protected static $databaseTableIndexName = 'rankID'; - /** * Returns the image of this user rank. * -- 2.20.1