Use class constant
authorMatthias Schmidt <gravatronics@live.com>
Sat, 21 May 2016 11:44:31 +0000 (13:44 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 21 May 2016 11:44:31 +0000 (13:44 +0200)
files/lib/data/conversation/FeedConversation.class.php
files/lib/data/conversation/label/ConversationLabelAction.class.php
files/lib/data/conversation/message/ConversationMessageAction.class.php
files/lib/system/clipboard/action/ConversationClipboardAction.class.php
files/lib/system/importer/ConversationImporter.class.php
files/lib/system/importer/ConversationLabelImporter.class.php
files/lib/system/importer/ConversationMessageImporter.class.php
files/lib/system/moderation/queue/report/ConversationMessageModerationQueueReportHandler.class.php
files/lib/system/user/notification/object/type/ConversationMessageNotificationObjectType.class.php
files/lib/system/user/notification/object/type/ConversationNotificationObjectType.class.php

index cdccbfc57434d95a191134aa967cb47c68258fb9..642e68d22dc9f5e76f4d3e1833fdb8bd6eae940d 100644 (file)
@@ -18,7 +18,7 @@ class FeedConversation extends DatabaseObjectDecorator implements IFeedEntry {
        /**
         * @inheritDoc
         */
-       protected static $baseClass = 'wcf\data\conversation\Conversation';
+       protected static $baseClass = Conversation::class;
        
        /**
         * @inheritDoc
index d3abaf33672f75aa0c49d957d1b37d35f0bc7467..edf43600e1a68a5216edc4daa249b3c61b2062a5 100644 (file)
@@ -25,7 +25,7 @@ class ConversationLabelAction extends AbstractDatabaseObjectAction {
        /**
         * @inheritDoc
         */
-       protected $className = 'wcf\data\conversation\label\ConversationLabelEditor';
+       protected $className = ConversationLabelEditor::class;
        
        /**
         * @inheritDoc
index 6e8b229836eee9e791af4b39382ae4827844d474..82d2f7ae49684a044d68105cefcee4691c05bb62 100644 (file)
@@ -43,7 +43,7 @@ class ConversationMessageAction extends AbstractDatabaseObjectAction implements
        /**
         * @inheritDoc
         */
-       protected $className = 'wcf\data\conversation\message\ConversationMessageEditor';
+       protected $className = ConversationMessageEditor::class;
        
        /**
         * conversation object
@@ -230,7 +230,7 @@ class ConversationMessageAction extends AbstractDatabaseObjectAction implements
         */
        public function validateQuickReply() {
                QuickReplyManager::getInstance()->setAllowedBBCodes(explode(',', WCF::getSession()->getPermission('user.message.allowedBBCodes')));
-               QuickReplyManager::getInstance()->validateParameters($this, $this->parameters, 'wcf\data\conversation\Conversation');
+               QuickReplyManager::getInstance()->validateParameters($this, $this->parameters, Conversation::class);
        }
        
        /**
@@ -240,7 +240,7 @@ class ConversationMessageAction extends AbstractDatabaseObjectAction implements
                return QuickReplyManager::getInstance()->createMessage(
                        $this,
                        $this->parameters,
-                       'wcf\data\conversation\ConversationAction',
+                       ConversationAction::class,
                        CONVERSATION_LIST_DEFAULT_SORT_ORDER,
                        'conversationMessageList'
                );
index 3238dc26e16b54e2a8160936feecd37a9b7d08d4..6b9a8e51b797451dcc252a1a424302652d7f38bb 100644 (file)
@@ -2,6 +2,7 @@
 namespace wcf\system\clipboard\action;
 use wcf\data\clipboard\action\ClipboardAction;
 use wcf\data\conversation\Conversation;
+use wcf\data\conversation\ConversationAction;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\WCF;
 
@@ -104,7 +105,7 @@ class ConversationClipboardAction extends AbstractClipboardAction {
         * @inheritDoc
         */
        public function getClassName() {
-               return 'wcf\data\conversation\ConversationAction';
+               return ConversationAction::class;
        }
        
        /**
index da9a08fa521241682c7069c5b5dbb0bfc4426208..70eb66f77624a748fd69426bf921d3eb4bb22b01 100644 (file)
@@ -17,7 +17,7 @@ class ConversationImporter extends AbstractImporter {
        /**
         * @inheritDoc
         */
-       protected $className = 'wcf\data\conversation\Conversation';
+       protected $className = Conversation::class;
        
        /**
         * @inheritDoc
index f85ca12c0fc7bf36b681b5ca7bd26fe5d99fd979..bcf5826fd8ffc24849f5335ae1bd8bc5acc8e7d4 100644 (file)
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\system\importer;
+use wcf\data\conversation\label\ConversationLabel;
 use wcf\data\conversation\label\ConversationLabelAction;
 
 /**
@@ -16,7 +17,7 @@ class ConversationLabelImporter extends AbstractImporter {
        /**
         * @inheritDoc
         */
-       protected $className = 'wcf\data\conversation\label\ConversationLabel';
+       protected $className = ConversationLabel::class;
        
        /**
         * @inheritDoc
index 0d68f60dd5fa06c729a3b7d5e78d21edf1f05c92..21d3273607455230a1dae501c164352e2f90dde1 100644 (file)
@@ -17,7 +17,7 @@ class ConversationMessageImporter extends AbstractImporter {
        /**
         * @inheritDoc
         */
-       protected $className = 'wcf\data\conversation\message\ConversationMessage';
+       protected $className = ConversationMessage::class;
        
        /**
         * @inheritDoc
index 5485de09f9bb6d73c235022c42f46bbda590ff44..2b5529901622195e051b02335f065c4a3515eee3 100644 (file)
@@ -26,7 +26,7 @@ class ConversationMessageModerationQueueReportHandler extends AbstractModeration
        /**
         * @inheritDoc
         */
-       protected $className = 'wcf\data\conversation\message\ConversationMessage';
+       protected $className = ConversationMessage::class;
        
        /**
         * @inheritDoc
index 8444aaba7c136c4c1a332a92e63464f817228658..0e3808c89268ce307df762124c8d2856398740ba 100644 (file)
@@ -1,5 +1,8 @@
 <?php
 namespace wcf\system\user\notification\object\type;
+use wcf\data\conversation\message\ConversationMessage;
+use wcf\data\conversation\message\ConversationMessageList;
+use wcf\system\user\notification\object\ConversationMessageUserNotificationObject;
 
 /**
  * Represents a conversation message notification object type.
@@ -15,15 +18,15 @@ class ConversationMessageNotificationObjectType extends AbstractUserNotification
        /**
         * @inheritDoc
         */
-       protected static $decoratorClassName = 'wcf\system\user\notification\object\ConversationMessageUserNotificationObject';
+       protected static $decoratorClassName = ConversationMessageUserNotificationObject::class;
        
        /**
         * @inheritDoc
         */
-       protected static $objectClassName = 'wcf\data\conversation\message\ConversationMessage';
+       protected static $objectClassName = ConversationMessage::class;
        
        /**
         * @inheritDoc
         */
-       protected static $objectListClassName = 'wcf\data\conversation\message\ConversationMessageList';
+       protected static $objectListClassName = ConversationMessageList::class;
 }
index 6c80523c4ef496094ffa95b04e0c5592d6889cdc..c75f6a06ba5bad60756d40a471a03b1436602789 100644 (file)
@@ -1,6 +1,8 @@
 <?php
 namespace wcf\system\user\notification\object\type;
 use wcf\data\conversation\Conversation;
+use wcf\data\conversation\ConversationList;
+use wcf\system\user\notification\object\ConversationUserNotificationObject;
 use wcf\system\WCF;
 
 /**
@@ -17,17 +19,17 @@ class ConversationNotificationObjectType extends AbstractUserNotificationObjectT
        /**
         * @inheritDoc
         */
-       protected static $decoratorClassName = 'wcf\system\user\notification\object\ConversationUserNotificationObject';
+       protected static $decoratorClassName = ConversationUserNotificationObject::class;
        
        /**
         * @inheritDoc
         */
-       protected static $objectClassName = 'wcf\data\conversation\Conversation';
+       protected static $objectClassName = Conversation::class;
        
        /**
         * @inheritDoc
         */
-       protected static $objectListClassName = 'wcf\data\conversation\ConversationList';
+       protected static $objectListClassName = ConversationList::class;
        
        /**
         * @inheritDoc