From dd900ec4b7a623a2a114f659b37dbd9d86718f34 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Fri, 29 Jul 2016 16:49:22 +0200 Subject: [PATCH] Code-style fixes --- .../install/files/lib/data/user/UserAction.class.php | 6 +++--- wcfsetup/install/files/lib/form/RegisterForm.class.php | 10 +++++----- .../lib/form/RegisterNewActivationCodeForm.class.php | 4 ++-- .../email/mime/RecipientAwareTextMimePart.class.php | 3 ++- .../notification/UserNotificationHandler.class.php | 4 ++-- ...QueueCommentResponseUserNotificationEvent.class.php | 2 +- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/wcfsetup/install/files/lib/data/user/UserAction.class.php b/wcfsetup/install/files/lib/data/user/UserAction.class.php index f700923578..e70c57b1e9 100644 --- a/wcfsetup/install/files/lib/data/user/UserAction.class.php +++ b/wcfsetup/install/files/lib/data/user/UserAction.class.php @@ -8,13 +8,13 @@ use wcf\data\ISearchAction; use wcf\system\clipboard\ClipboardHandler; use wcf\system\comment\CommentHandler; use wcf\system\database\util\PreparedStatementConditionBuilder; -use wcf\system\event\EventHandler; -use wcf\system\exception\PermissionDeniedException; -use wcf\system\exception\UserInputException; use wcf\system\email\mime\MimePartFacade; use wcf\system\email\mime\RecipientAwareTextMimePart; use wcf\system\email\Email; use wcf\system\email\UserMailbox; +use wcf\system\event\EventHandler; +use wcf\system\exception\PermissionDeniedException; +use wcf\system\exception\UserInputException; use wcf\system\request\RequestHandler; use wcf\system\WCF; use wcf\util\UserRegistrationUtil; diff --git a/wcfsetup/install/files/lib/form/RegisterForm.class.php b/wcfsetup/install/files/lib/form/RegisterForm.class.php index 617c048775..f3232865b8 100644 --- a/wcfsetup/install/files/lib/form/RegisterForm.class.php +++ b/wcfsetup/install/files/lib/form/RegisterForm.class.php @@ -10,17 +10,17 @@ use wcf\data\user\UserAction; use wcf\data\user\UserEditor; use wcf\data\user\UserProfile; use wcf\system\captcha\CaptchaHandler; -use wcf\system\exception\NamedUserException; -use wcf\system\exception\PermissionDeniedException; -use wcf\system\exception\SystemException; -use wcf\system\exception\UserInputException; -use wcf\system\language\LanguageFactory; use wcf\system\email\mime\MimePartFacade; use wcf\system\email\mime\PlainTextMimePart; use wcf\system\email\mime\RecipientAwareTextMimePart; use wcf\system\email\Email; use wcf\system\email\Mailbox; use wcf\system\email\UserMailbox; +use wcf\system\exception\NamedUserException; +use wcf\system\exception\PermissionDeniedException; +use wcf\system\exception\SystemException; +use wcf\system\exception\UserInputException; +use wcf\system\language\LanguageFactory; use wcf\system\request\LinkHandler; use wcf\system\user\authentication\UserAuthenticationFactory; use wcf\system\Regex; diff --git a/wcfsetup/install/files/lib/form/RegisterNewActivationCodeForm.class.php b/wcfsetup/install/files/lib/form/RegisterNewActivationCodeForm.class.php index d2e3bd9d0c..a5100d651e 100644 --- a/wcfsetup/install/files/lib/form/RegisterNewActivationCodeForm.class.php +++ b/wcfsetup/install/files/lib/form/RegisterNewActivationCodeForm.class.php @@ -2,12 +2,12 @@ namespace wcf\form; use wcf\data\user\User; use wcf\data\user\UserAction; -use wcf\system\exception\IllegalLinkException; -use wcf\system\exception\UserInputException; use wcf\system\email\mime\MimePartFacade; use wcf\system\email\mime\RecipientAwareTextMimePart; use wcf\system\email\Email; use wcf\system\email\UserMailbox; +use wcf\system\exception\IllegalLinkException; +use wcf\system\exception\UserInputException; use wcf\system\request\LinkHandler; use wcf\system\WCF; use wcf\util\HeaderUtil; diff --git a/wcfsetup/install/files/lib/system/email/mime/RecipientAwareTextMimePart.class.php b/wcfsetup/install/files/lib/system/email/mime/RecipientAwareTextMimePart.class.php index bddec4650a..806c86a3ef 100644 --- a/wcfsetup/install/files/lib/system/email/mime/RecipientAwareTextMimePart.class.php +++ b/wcfsetup/install/files/lib/system/email/mime/RecipientAwareTextMimePart.class.php @@ -1,5 +1,6 @@ fetch($this->template, $this->application, $this->getTemplateVariables(), true); if ($this->mimeType === 'text/html') { - $emogrifier = new \Pelago\Emogrifier(); + $emogrifier = new Emogrifier(); $emogrifier->disableInvisibleNodeRemoval(); $emogrifier->setHtml($result); diff --git a/wcfsetup/install/files/lib/system/user/notification/UserNotificationHandler.class.php b/wcfsetup/install/files/lib/system/user/notification/UserNotificationHandler.class.php index a3459d39c3..0f5d3bc2e2 100644 --- a/wcfsetup/install/files/lib/system/user/notification/UserNotificationHandler.class.php +++ b/wcfsetup/install/files/lib/system/user/notification/UserNotificationHandler.class.php @@ -12,12 +12,12 @@ use wcf\data\user\UserProfile; use wcf\system\cache\builder\UserNotificationEventCacheBuilder; use wcf\system\cache\runtime\UserProfileRuntimeCache; use wcf\system\database\util\PreparedStatementConditionBuilder; -use wcf\system\event\EventHandler; -use wcf\system\exception\SystemException; use wcf\system\email\mime\MimePartFacade; use wcf\system\email\mime\RecipientAwareTextMimePart; use wcf\system\email\Email; use wcf\system\email\UserMailbox; +use wcf\system\event\EventHandler; +use wcf\system\exception\SystemException; use wcf\system\user\notification\event\IUserNotificationEvent; use wcf\system\user\notification\object\type\IUserNotificationObjectType; use wcf\system\user\notification\object\IUserNotificationObject; diff --git a/wcfsetup/install/files/lib/system/user/notification/event/ModerationQueueCommentResponseUserNotificationEvent.class.php b/wcfsetup/install/files/lib/system/user/notification/event/ModerationQueueCommentResponseUserNotificationEvent.class.php index bcad919b45..52da16177c 100644 --- a/wcfsetup/install/files/lib/system/user/notification/event/ModerationQueueCommentResponseUserNotificationEvent.class.php +++ b/wcfsetup/install/files/lib/system/user/notification/event/ModerationQueueCommentResponseUserNotificationEvent.class.php @@ -3,9 +3,9 @@ namespace wcf\system\user\notification\event; use wcf\data\moderation\queue\ViewableModerationQueue; use wcf\data\object\type\ObjectTypeCache; use wcf\data\user\UserProfile; -use wcf\system\email\Email; use wcf\system\cache\runtime\CommentRuntimeCache; use wcf\system\cache\runtime\UserProfileRuntimeCache; +use wcf\system\email\Email; use wcf\system\moderation\queue\report\IModerationQueueReportHandler; use wcf\system\WCF; -- 2.20.1