Automatically guess DBO database table name and index name
authorMatthias Schmidt <gravatronics@live.com>
Thu, 4 Aug 2016 16:09:31 +0000 (18:09 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Thu, 4 Aug 2016 16:11:50 +0000 (18:11 +0200)
See #1804

89 files changed:
wcfsetup/install/files/lib/data/DatabaseObject.class.php
wcfsetup/install/files/lib/data/acl/option/ACLOption.class.php
wcfsetup/install/files/lib/data/acl/option/category/ACLOptionCategory.class.php
wcfsetup/install/files/lib/data/acp/search/provider/ACPSearchProvider.class.php
wcfsetup/install/files/lib/data/acp/session/ACPSession.class.php
wcfsetup/install/files/lib/data/acp/session/access/log/ACPSessionAccessLog.class.php
wcfsetup/install/files/lib/data/acp/session/log/ACPSessionLog.class.php
wcfsetup/install/files/lib/data/acp/session/virtual/ACPSessionVirtual.class.php
wcfsetup/install/files/lib/data/acp/template/ACPTemplate.class.php
wcfsetup/install/files/lib/data/ad/Ad.class.php
wcfsetup/install/files/lib/data/application/Application.class.php
wcfsetup/install/files/lib/data/article/Article.class.php
wcfsetup/install/files/lib/data/article/content/ArticleContent.class.php
wcfsetup/install/files/lib/data/attachment/Attachment.class.php
wcfsetup/install/files/lib/data/bbcode/attribute/BBCodeAttribute.class.php
wcfsetup/install/files/lib/data/bbcode/media/provider/BBCodeMediaProvider.class.php
wcfsetup/install/files/lib/data/box/Box.class.php
wcfsetup/install/files/lib/data/captcha/question/CaptchaQuestion.class.php
wcfsetup/install/files/lib/data/category/Category.class.php
wcfsetup/install/files/lib/data/clipboard/action/ClipboardAction.class.php
wcfsetup/install/files/lib/data/comment/Comment.class.php
wcfsetup/install/files/lib/data/comment/response/CommentResponse.class.php
wcfsetup/install/files/lib/data/condition/Condition.class.php
wcfsetup/install/files/lib/data/core/object/CoreObject.class.php
wcfsetup/install/files/lib/data/cronjob/Cronjob.class.php
wcfsetup/install/files/lib/data/cronjob/log/CronjobLog.class.php
wcfsetup/install/files/lib/data/edit/history/entry/EditHistoryEntry.class.php
wcfsetup/install/files/lib/data/event/listener/EventListener.class.php
wcfsetup/install/files/lib/data/label/Label.class.php
wcfsetup/install/files/lib/data/label/group/LabelGroup.class.php
wcfsetup/install/files/lib/data/language/Language.class.php
wcfsetup/install/files/lib/data/language/category/LanguageCategory.class.php
wcfsetup/install/files/lib/data/language/item/LanguageItem.class.php
wcfsetup/install/files/lib/data/like/Like.class.php
wcfsetup/install/files/lib/data/like/object/LikeObject.class.php
wcfsetup/install/files/lib/data/media/Media.class.php
wcfsetup/install/files/lib/data/menu/Menu.class.php
wcfsetup/install/files/lib/data/menu/item/MenuItem.class.php
wcfsetup/install/files/lib/data/moderation/queue/ModerationQueue.class.php
wcfsetup/install/files/lib/data/modification/log/ModificationLog.class.php
wcfsetup/install/files/lib/data/notice/Notice.class.php
wcfsetup/install/files/lib/data/object/type/ObjectType.class.php
wcfsetup/install/files/lib/data/object/type/definition/ObjectTypeDefinition.class.php
wcfsetup/install/files/lib/data/option/Option.class.php
wcfsetup/install/files/lib/data/option/category/OptionCategory.class.php
wcfsetup/install/files/lib/data/package/Package.class.php
wcfsetup/install/files/lib/data/package/installation/plugin/PackageInstallationPlugin.class.php
wcfsetup/install/files/lib/data/package/installation/queue/PackageInstallationQueue.class.php
wcfsetup/install/files/lib/data/package/update/PackageUpdate.class.php
wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServer.class.php
wcfsetup/install/files/lib/data/package/update/version/PackageUpdateVersion.class.php
wcfsetup/install/files/lib/data/page/Page.class.php
wcfsetup/install/files/lib/data/paid/subscription/PaidSubscription.class.php
wcfsetup/install/files/lib/data/paid/subscription/transaction/log/PaidSubscriptionTransactionLog.class.php
wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUser.class.php
wcfsetup/install/files/lib/data/poll/Poll.class.php
wcfsetup/install/files/lib/data/poll/option/PollOption.class.php
wcfsetup/install/files/lib/data/search/Search.class.php
wcfsetup/install/files/lib/data/search/keyword/SearchKeyword.class.php
wcfsetup/install/files/lib/data/session/Session.class.php
wcfsetup/install/files/lib/data/session/virtual/SessionVirtual.class.php
wcfsetup/install/files/lib/data/smiley/Smiley.class.php
wcfsetup/install/files/lib/data/spider/Spider.class.php
wcfsetup/install/files/lib/data/stat/daily/StatDaily.class.php
wcfsetup/install/files/lib/data/style/Style.class.php
wcfsetup/install/files/lib/data/style/variable/StyleVariable.class.php
wcfsetup/install/files/lib/data/tag/Tag.class.php
wcfsetup/install/files/lib/data/template/Template.class.php
wcfsetup/install/files/lib/data/template/group/TemplateGroup.class.php
wcfsetup/install/files/lib/data/template/listener/TemplateListener.class.php
wcfsetup/install/files/lib/data/user/User.class.php
wcfsetup/install/files/lib/data/user/activity/event/UserActivityEvent.class.php
wcfsetup/install/files/lib/data/user/authentication/failure/UserAuthenticationFailure.class.php
wcfsetup/install/files/lib/data/user/avatar/UserAvatar.class.php
wcfsetup/install/files/lib/data/user/follow/UserFollow.class.php
wcfsetup/install/files/lib/data/user/group/UserGroup.class.php
wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignment.class.php
wcfsetup/install/files/lib/data/user/group/option/UserGroupOption.class.php
wcfsetup/install/files/lib/data/user/group/option/category/UserGroupOptionCategory.class.php
wcfsetup/install/files/lib/data/user/ignore/UserIgnore.class.php
wcfsetup/install/files/lib/data/user/menu/item/UserMenuItem.class.php
wcfsetup/install/files/lib/data/user/notification/UserNotification.class.php
wcfsetup/install/files/lib/data/user/notification/event/UserNotificationEvent.class.php
wcfsetup/install/files/lib/data/user/object/watch/UserObjectWatch.class.php
wcfsetup/install/files/lib/data/user/option/UserOption.class.php
wcfsetup/install/files/lib/data/user/option/category/UserOptionCategory.class.php
wcfsetup/install/files/lib/data/user/profile/menu/item/UserProfileMenuItem.class.php
wcfsetup/install/files/lib/data/user/profile/visitor/UserProfileVisitor.class.php
wcfsetup/install/files/lib/data/user/rank/UserRank.class.php

index d3137fabdbaab6f8a63bb524359b70f6f21c91ae..04b015d5750aa854a9b54518665739fc1319b459 100644 (file)
@@ -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;
        }
        
        /**
index 77e0aca41b59925069c837d9d77607c4625c8d55..f1ec43cc7d8f4b0e662fae40a2df4b8849bdc971 100644 (file)
@@ -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.
         * 
index 135da77c5d5bca413ce3d96b4a6ad55277780d71..e553f81de00d2a92e84e23006c33243385e09570 100644 (file)
@@ -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 {}
index eeb27f5afa75e2d6ed465ac293c1461b1a4bf04f..602ae454b9cfe53bff5efc93be5b4476eb1c1048 100644 (file)
@@ -21,9 +21,4 @@ class ACPSearchProvider extends DatabaseObject {
         * @inheritDoc
         */
        protected static $databaseTableName = 'acp_search_provider';
-       
-       /**
-        * @inheritDoc
-        */
-       protected static $databaseTableIndexName = 'providerID';
 }
index 1e6c0b35c73bf8218ba5c49a0aabbe701922b478..1132f5f1b140cfc76948a5f7311ea4ed2c346a9c 100644 (file)
@@ -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.
         * 
index 71cefa4c840d7bce8b8c568d5f6743c6ded172f8..d4e54987c86e985b4d7071ef25afb00ec52dde95 100644 (file)
@@ -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
         */
index 62dae90078e88154142c4de869da36bc7d081e5b..1d816a6f400acf570d1c88659241e753ff7eebc7 100644 (file)
@@ -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
         */
index 63327fc7659088c0c5926b2bc7455ed414f2b686..f639459175fddf60a916a6f72ed47554c670e8e0 100644 (file)
@@ -26,11 +26,6 @@ use wcf\util\UserUtil;
  * @property-read      string          $sessionVariables
  */
 class ACPSessionVirtual extends DatabaseObject {
-       /**
-        * @inheritDoc
-        */
-       protected static $databaseTableName = 'acp_session_virtual';
-       
        /**
         * @inheritDoc
         */
index 75527f72ea4c6c994ba1c2ef1bed3389424ef96f..e8b54916f8dcbb00a7027b044207481cbd8c944f 100644 (file)
@@ -16,11 +16,6 @@ use wcf\data\DatabaseObject;
  * @property-read      string          $application
  */
 class ACPTemplate extends DatabaseObject {
-       /**
-        * @inheritDoc
-        */
-       protected static $databaseTableName = 'acp_template';
-       
        /**
         * @inheritDoc
         */
index 40622d06939ab819bc812aba0d3c19d2531420a3..38e7c9d56deacc67c1b48027e92cfff23d28a4a3 100644 (file)
@@ -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.
         * 
index 5bf25e4befbc0f54dc88b476ed4bcbd12241a35b..55d69309faf3893366fdc6173c72cdd8772b233f 100644 (file)
@@ -37,11 +37,6 @@ class Application extends DatabaseObject {
         */
        protected $pageURL = '';
        
-       /**
-        * @inheritDoc
-        */
-       protected static $databaseTableName = 'application';
-       
        /**
         * @inheritDoc
         */
index b31b613c738f73eafdcadc4d8102ba461017bbf7..8680ead157b3eeb8372457886f3991d495928245 100644 (file)
@@ -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
         */
index 36aec40dbc4d1490b30511cb20124ae4efe98619..ad42f27935c7c8718fd5ae9877b930e6f040e35b 100644 (file)
@@ -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
         */
index 09a7787b9f2a940200ae53ac0f11180744d06960..b28db69dd09d5e43e5958d218b5191e46d35d846 100644 (file)
@@ -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
index bb857efd8187289d3c7447b3bcb6af4f496e3765..78dd4f1ee60a9cfeaaa414cc744256b06d97932f 100644 (file)
@@ -25,11 +25,6 @@ class BBCodeAttribute extends DatabaseObject {
         */
        protected static $databaseTableName = 'bbcode_attribute';
        
-       /**
-        * @inheritDoc
-        */
-       protected static $databaseTableIndexName = 'attributeID';
-       
        /**
         * Reads attributes by assigned bbcode.
         * 
index 20c31044ae383274183b621b850137016f351b4b..53cae2eab9035e2a59a2e6e35b5db28ebeabf442 100644 (file)
@@ -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[]
index 08d8967c1159d4c96110ec63ca70067b6fd58083..a39857fb6f3a2af086ea0d975f5ffc645910a08a 100644 (file)
@@ -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[]
index 4afe9408f83a9a7ada6ec3320185e805746da257..427296c04c7461c3765df6f4739fbb21f335daf7 100644 (file)
@@ -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.
         * 
index 9069c5751f06df7f20cc341fc33df5951a9f4236..0ae5a88c3395b34634f615e9e0bce0ad6665b0ba 100644 (file)
@@ -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
         */
index 1b4620d04dfb19dbc0e48ce467b56d7586dccea2..78f3d5f7f178675cb1080dc2757315870ac14599 100644 (file)
@@ -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 {}
index 9846c9e6436a637b2260e198914b4e31cdac86dc..fdea2f852d5e9e31fff66ca7cc2eb52fd7326cdf 100644 (file)
@@ -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.
         * 
index 42057b52e137b016ed4d48d40e598905ed6966a0..ef401ff11e096baf077447e3487bef79aa4dd921 100644 (file)
@@ -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
index d2a43a7c3891071e94b75d86a3e5901b559d161b..4aeba3d551a76d1da321eeb805b63cf3bf67d7d0 100644 (file)
@@ -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
         */
index ae10ba6a03c4c2d7c9bc474e374b6f005da075d2..2b858a7043b6178ca0fc8f6b9264573a2ddcb1cd 100644 (file)
@@ -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 {}
index 3fcbf7d56e11356c05aa0ec744dbe44922abe850..01989cf741235588820d2004a2e1d03507a883bc 100644 (file)
@@ -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
         */
index ce3a9b51b2440faa1134f8755aa1de75073ea984..dc85ef00b7c7264acf7ca45c6fed4de929257ae1 100644 (file)
@@ -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 {}
index d3087d96e4936fe808d93d43fb415cc2a2ad73ac..e23441adbb4bf5b22419c944500ee50eb609836f 100644 (file)
@@ -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
         */
index d54ac22dfb09c0a3b8a2e1d68c3a44dbedfea4ee..3b8df8a99268a7e62f0ac892455f02ba93a09893 100644 (file)
@@ -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
index 042399d6b31d0930023aafc50fbdfc8d31327325..b20adc8f9abf06757c287d088e8eb64ce62f93e9 100644 (file)
@@ -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.
index 3983c607ebde8c6ee4b1731bed80db0f462bfc62..2a6bf6917c54b2c67f43790f224f4ae1baee212c 100644 (file)
@@ -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
         */
index bc55cc5d5c46ca8f32f8c26d7b7fc39d025c1fac..535451c6e2c60545d28cbbb6da60f30c906f779c 100644 (file)
@@ -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[]
index 2912eb50f4074f26241193e61a113bb02e1bb8cb..dc028c4cbf1c82ba39f1d705b0bbca4e5eed55eb 100644 (file)
@@ -14,11 +14,6 @@ use wcf\data\DatabaseObject;
  * @property-read      string          $languageCategory
  */
 class LanguageCategory extends DatabaseObject {
-       /**
-        * @inheritDoc
-        */
-       protected static $databaseTableName = 'language_category';
-       
        /**
         * @inheritDoc
         */
index 87695b934ab2b6216f87177fa2f17680f4bf8198..fcb20b882d6ca646b5c2feee99938f78a72e7727 100644 (file)
@@ -21,11 +21,6 @@ use wcf\data\DatabaseObject;
  * @property-read      integer|null    $packageID
  */
 class LanguageItem extends DatabaseObject {
-       /**
-        * @inheritDoc
-        */
-       protected static $databaseTableName = 'language_item';
-       
        /**
         * @inheritDoc
         */
index 3dd9e854c17af6d7ed3b34bd183d37a52554d247..54a3777ae9cfea7115e6c410cfc2dac9d3dade36 100644 (file)
@@ -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
index 050e75d867b43338c1601023e00079045dfd2734..451c06b0d7a4c2e4c9d7386bda504b7a945981ec 100644 (file)
@@ -23,11 +23,6 @@ use wcf\system\WCF;
  * @property-read      string          $cachedUsers
  */
 class LikeObject extends DatabaseObject {
-       /**
-        * @inheritDoc
-        */
-       protected static $databaseTableName = 'like_object';
-       
        /**
         * @inheritDoc
         */
index 57037182a25b9a6154494edc094968ee08352a04..5ce4f99dbc7ad80ec90ccd30dc54432a43884ce4 100644 (file)
@@ -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
index 58d7587cc2409e34e7a660f16bd67759d7aea0ec..389df95f5a6e3ff1da96bfc2b27f460252088a2c 100644 (file)
@@ -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
index be074a5733acef953a7438e75d1dd0eb558d7740..5e974c3b6ce39ccac98dc7fb02a70b435281ddec 100644 (file)
@@ -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
         */
index 10c64bafe76f3664210e89a9040a86ee9d1ee269..18e9b241df4d66c5913bd0a79bb8f1b7d3352a39 100644 (file)
@@ -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;
index 8dd09e339f6cb7c9414ca263096708f6fe94237f..4ea0875e75b7a4e9d56cf8b96310a9ac24a573e7 100644 (file)
@@ -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
         */
index 24bbd0f20cd7b31c9714cf89cbd7b2a5b4daa9a0..7e13926012bf5e3e25fc8dbed69bf3d149d708da 100644 (file)
@@ -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.
         * 
index 529c9323ba542b621614ddc09921101ae884bff1..60df6c204805666e12236185867f391e610b754a 100644 (file)
@@ -27,11 +27,6 @@ class ObjectType extends ProcessibleDatabaseObject {
        use TDatabaseObjectOptions;
        use TDatabaseObjectPermissions;
        
-       /**
-        * @inheritDoc
-        */
-       protected static $databaseTableName = 'object_type';
-       
        /**
         * @inheritDoc
         */
index ce4f794bf54d2d3b3caed00e98d06f1fa5905bc3..cefc91cbc6374742523f7a62995b62685584eb47 100644 (file)
@@ -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 {}
index d2e192977ea92338028f25840190cebcb8af5bc4..dbb7974cfda060cf63e69bed60a377646492e470 100644 (file)
@@ -35,16 +35,6 @@ class Option extends DatabaseObject {
        use TDatabaseObjectOptions;
        use TDatabaseObjectPermissions;
        
-       /**
-        * @inheritDoc
-        */
-       protected static $databaseTableName = 'option';
-       
-       /**
-        * @inheritDoc
-        */
-       protected static $databaseTableIndexName = 'optionID';
-       
        /**
         * @inheritDoc
         */
index 2960345c6d58599d1d2262b005d6d3c511ec5dc8..6e5c2dbfced53e2adfa2d8f7e288264732725799 100644 (file)
@@ -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';
 }
index 31bf7b21e237efe47e9e786ed5370fe4a0d7a353..3082be4a78e6df7fd8172ce61f9023995a1ee498 100644 (file)
@@ -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[]
index 3342385294d6881bf0d50245c4429c37d230944a..6e9ab660c06a0a06d000aeeb42f8c0772ff58262 100644 (file)
@@ -16,11 +16,6 @@ use wcf\data\DatabaseObject;
  * @property-read      string          $className
  */
 class PackageInstallationPlugin extends DatabaseObject {
-       /**
-        * @inheritDoc
-        */
-       protected static $databaseTableName = 'package_installation_plugin';
-       
        /**
         * @inheritDoc
         */
index c7f45a47a0284f180a2a371da209c8bd03233663..93dc43a114343abf82c35e4ca1f3d3d98420d926 100644 (file)
@@ -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.
         * 
index 6eee68c4de3fbe4dadb2f7d1d10a9155fa7a83f7..fa3efd1c3dfe7180d44029bd02898d2c0a13608b 100644 (file)
@@ -20,11 +20,6 @@ use wcf\data\DatabaseObject;
  * @property-read      integer         $isApplication
  */
 class PackageUpdate extends DatabaseObject {
-       /**
-        * @inheritDoc
-        */
-       protected static $databaseTableName = 'package_update';
-       
        /**
         * @inheritDoc
         */
index eba7c405ea436225dec19abb921c91f79f2c80a4..ae179d65c51a3d97aa038d8e3489ba181f1861bb 100644 (file)
@@ -25,11 +25,6 @@ use wcf\util\FileUtil;
  * @property-read      string          $apiVersion
  */
 class PackageUpdateServer extends DatabaseObject {
-       /**
-        * @inheritDoc
-        */
-       protected static $databaseTableName = 'package_update_server';
-       
        /**
         * @inheritDoc
         */
index ccd115a322d98ab2c50641b5bf0067f95e65bc9d..b88502a95d6df89c355c9b7b22ece40147a587be 100644 (file)
@@ -20,11 +20,6 @@ use wcf\data\DatabaseObject;
  * @property-read      integer         $isAccessible
  */
 class PackageUpdateVersion extends DatabaseObject {
-       /**
-        * @inheritDoc
-        */
-       protected static $databaseTableName = 'package_update_version';
-       
        /**
         * @inheritDoc
         */
index 4b36a34aa1f3bf22ff712a8bc0b7265f3af7c885..cd0203d085cb12be52c1bdd4b393c4c208f184c4 100644 (file)
@@ -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
         */
index 3720575919b2ab7247bf4d19108af78e10a1375a..c26a3def225ec49649c307705b44a4e617d3a6b2 100644 (file)
@@ -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.
         * 
index 54a421f54c1c993a2f1ce9080a27fff6079cf9e8..8b3bacbcf59a5e3c0770a1ca97209ea183058945 100644 (file)
@@ -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
index 3bc332defcaa420a43d98673952ea9b8ff8bd320..b8bda64ac616e9eb24c6798528639c2b4fa6f895 100644 (file)
@@ -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
index 43e562bab666620758c85e700cea331138810901..1aee0512ea466acf040e4f74651601915f732b05 100644 (file)
@@ -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
index 594fc285f2776dadc17e59c4ab72b37f2e650c06..a6a7068fa7aa2c9e39af750278f5dcfb4f9c9cdd 100644 (file)
@@ -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
index 703337f4a82b903b094244e44d0b9f725600a629..aebb94aaaffbdd93b94353561f287ae5f8ca533f 100644 (file)
@@ -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 {}
index 2ee94209ae778fbc3fe8f1aa8d7b1cb31ccb55c9..08c867f35850efded384e4a42f16a961f2fa4318 100644 (file)
@@ -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 {}
index 06bb9e94e9c89922f44ea7dce81bcb8918be2b3e..5903e153d8e79771f38116d674542da555f1892a 100644 (file)
@@ -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
         */
index a1951fb1aa21fadf3b43298832de4e492c0a9dbc..39c1f080aa87d9c468c436813e3e6fd7d481d2d1 100644 (file)
@@ -11,14 +11,4 @@ use wcf\data\acp\session\virtual\ACPSessionVirtual;
  * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @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 {}
index 3f343712756a08fa794d96357f86e7ef3b13f67a..c28b9e76d81a309401794f08bb2719c7a60ddf3a 100644 (file)
@@ -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.
         * 
index cf320f6efa78a24b727672095027076db5d58b11..fdfba6d5f0051528aadeabb491bb265e8f203c83 100644 (file)
@@ -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 {}
index a1bad51308cc5889c662fd51e6be3d6b191f507c..519fc700270c63b76a319ec2c0c3f64076236294 100644 (file)
@@ -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 {}
index 39462a197adc003a9fef4afa9dd4d61ebc910753..42150605e2d97cf4d110a0b276ba724de0b52ade 100644 (file)
@@ -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[]
index 0f111bd8479e758afb98a509aeb57f45122e79fe..8ea67c0e6427f8e47bf3a905597e1414faf0a9eb 100644 (file)
@@ -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';
index bd7780c512dd06e4fa4bc24915f0042469cb82a0..9cc4ad169f3df6fea6e2cfdf99e1626e2641bde0 100644 (file)
@@ -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.
         * 
index d55bacba2a12b1635b656bf5d41bfe75e8900e3d..b9ae0a61e3d95bf2c5d6e1d44cc967f50bb79672 100644 (file)
@@ -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
index 192143154b28c694dc674c848caa2d5f96818ac3..7ab6ce803fef6e92687b1d717a32a8d684b715e0 100644 (file)
@@ -18,11 +18,6 @@ use wcf\util\StringUtil;
  * @property-read      string          $templateGroupFolderName
  */
 class TemplateGroup extends DatabaseObject {
-       /**
-        * @inheritDoc
-        */
-       protected static $databaseTableName = 'template_group';
-       
        /**
         * @inheritDoc
         */
index 4c6d2b7618416accffe00cafce85732f1e7d0d1a..92669c761e6d0f075f7e69c4cc5aba5ba5bfb816 100644 (file)
@@ -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 {}
index 8cde1f3f9c17b224467857bddf65531d6eb7303e..7b395b838f0fe09f7b1dae5288bc154cdf91aac5 100644 (file)
@@ -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[]
index 64c895ea09d3721f698f74d9613445d62d3ead4b..68ab5bdac7329c98882776bf7f66b97679288746 100644 (file)
@@ -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
         */
index f85a6918715894e4fc79c7fa6210e249e8486afe..08a481b9ee801c29297743eebdc4cdb6a4502d41 100644 (file)
@@ -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.
         * 
index 86d166e0bfffda3012d4c07a483abef220d111b5..c147f04842754dae938863bdeb1c1062db40c590 100644 (file)
@@ -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
index 18c4a0c5224a4b7126b496cd99e028c6387ce533..330cdb5a749ec2cc6b8b70749fdcf1e41e65869b 100644 (file)
@@ -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.
         * 
index 0676369ea04cc2d52f60b4aa1e2167491e8c5265..d550fa063ecc411b711683d3eda7bfb8b3dc09c5 100644 (file)
@@ -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[]
index 35f03a638009d672de9b236e197006019d8bbe76..18e108bd3aaf602b96941ea904c8e53cfa36be7d 100644 (file)
@@ -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.
         * 
index 093f64cdc80c781724da946c358b667093d4da8c..e40f89d23dee108daf5f73957c28e6a560677bce 100644 (file)
@@ -17,9 +17,4 @@ class UserGroupOption extends Option {
         * @inheritDoc
         */
        protected static $databaseTableName = 'user_group_option';
-       
-       /**
-        * @inheritDoc
-        */
-       protected static $databaseTableIndexName = 'optionID';
 }
index 34cce7e38a192b9d050a31bb64f76ae863af69ab..8151d8ba3b605f70365028cae2a6c76d1d712238 100644 (file)
@@ -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';
 }
index 670a65288a974fa8f58cf6cd7f11aba01b47144f..e0bd58b421ee3978b01df504335b2554e4e38059 100644 (file)
@@ -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.
         * 
index bd5a08e09a91d9676215caf749ba1bb18f146941..8a71e638cf6e319edd8a60c62950ab120f52c6d1 100644 (file)
@@ -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
         */
index bb746135fb845e7a07eea0f691237a33266aba5e..edf21d9df06c6040b56e2c4cf6d95786396e42f2 100644 (file)
@@ -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
         */
index 768616c977f7f63b8916bed7d5e7a6a292d49dac..7ade2063cc5149ce6c34658ecbb037d9f4fa9644 100644 (file)
@@ -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
         */
index 8ca67af76b4aa50f38e19e588c5036d1916dd46c..f21ab4e07050cc088e244e9bb7ff5a86f61e630e 100644 (file)
@@ -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.
index 32d4c34141379e3fb6cb02077551876bde5441f4..bcff3ec924071627381759fae88cafb78c883a4a 100644 (file)
@@ -99,11 +99,6 @@ class UserOption extends Option {
         */
        protected static $databaseTableName = 'user_option';
        
-       /**
-        * @inheritDoc
-        */
-       protected static $databaseTableIndexName = 'optionID';
-       
        /**
         * option value
         * @var string
index f720d0b5ddc8e87d4caf30cb45b965b5c696762c..c033303a88f400f73523f1fb56c0fdbeb5668a5b 100644 (file)
@@ -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.
         * 
index fe177fd5f1943d1ad17083e35f5b495fdc29f9f6..5d621ae4204f997087031a1f80d166a2a3e06754 100644 (file)
@@ -35,11 +35,6 @@ class UserProfileMenuItem extends DatabaseObject {
         */
        protected $contentManager = null;
        
-       /**
-        * @inheritDoc
-        */
-       protected static $databaseTableName = 'user_profile_menu_item';
-       
        /**
         * @inheritDoc
         */
index 6575567f9478e03cbc1d8f4bdcb8d29b6751f4b9..04f84b0365d9006d074d5439df818d78666a1c54 100644 (file)
@@ -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.
         * 
index c6d9532aa7708a1f020259c843e065578557615b..5d9249eb30370d1276c660cf416904e39c328a7c 100644 (file)
@@ -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.
         *