From 3728a6bd6e181ffb46c29b08c54788dd95aa884d Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Fri, 10 Jun 2016 17:54:17 +0200 Subject: [PATCH] Remove unnecessary trailing commas --- wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php | 2 +- wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php | 2 +- wcfsetup/install/files/lib/acp/page/LabelListPage.class.php | 2 +- wcfsetup/install/files/lib/action/AJAXInvokeAction.class.php | 2 +- wcfsetup/install/files/lib/data/media/MediaAction.class.php | 2 +- .../paid/subscription/user/PaidSubscriptionUserAction.class.php | 2 +- wcfsetup/install/files/lib/data/user/UserAction.class.php | 2 +- .../files/lib/data/user/ignore/UserIgnoreAction.class.php | 2 +- wcfsetup/install/files/lib/form/MailForm.class.php | 2 +- wcfsetup/install/files/lib/form/RegisterForm.class.php | 2 +- .../user/profile/content/AboutUserProfileMenuContent.class.php | 2 +- .../user/profile/content/LikesUserProfileMenuContent.class.php | 2 +- .../files/lib/system/message/QuickReplyManager.class.php | 2 +- .../lib/system/option/user/MessageUserOptionOutput.class.php | 2 +- .../package/plugin/BBCodePackageInstallationPlugin.class.php | 2 +- .../install/files/lib/system/page/PageLocationManager.class.php | 2 +- wcfsetup/install/files/lib/system/upload/UploadFile.class.php | 2 +- .../files/lib/system/worker/SendNewPasswordWorker.class.php | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php b/wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php index 531ff8223d..82826a1760 100644 --- a/wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php @@ -238,7 +238,7 @@ class BBCodeAddForm extends AbstractForm { 'attributeHtml' => $attribute->attributeHtml, 'validationPattern' => $attribute->validationPattern, 'required' => $attribute->required, - 'useText' => $attribute->useText, + 'useText' => $attribute->useText ]]); $attributeAction->executeAction(); } diff --git a/wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php b/wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php index 358f7b92ad..4ea27e2699 100644 --- a/wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php @@ -118,7 +118,7 @@ class BBCodeEditForm extends BBCodeAddForm { 'attributeHtml' => $attribute->attributeHtml, 'validationPattern' => $attribute->validationPattern, 'required' => $attribute->required, - 'useText' => $attribute->useText, + 'useText' => $attribute->useText ]]); $attributeAction->executeAction(); } diff --git a/wcfsetup/install/files/lib/acp/page/LabelListPage.class.php b/wcfsetup/install/files/lib/acp/page/LabelListPage.class.php index 9b6633d818..fbc3ad6b3b 100644 --- a/wcfsetup/install/files/lib/acp/page/LabelListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/LabelListPage.class.php @@ -127,7 +127,7 @@ class LabelListPage extends SortablePage { $this->objectList->getConditionBuilder()->add('(label LIKE ? OR labelID IN (?))', ['%'.addcslashes($this->label, '_%').'%', $labelIDs]); } else { - $this->objectList->getConditionBuilder()->add('label LIKE ?', ['%'.addcslashes($this->label, '_%').'%',]); + $this->objectList->getConditionBuilder()->add('label LIKE ?', ['%'.addcslashes($this->label, '_%').'%']); } } } diff --git a/wcfsetup/install/files/lib/action/AJAXInvokeAction.class.php b/wcfsetup/install/files/lib/action/AJAXInvokeAction.class.php index 3dd726c479..b6a410dd2e 100644 --- a/wcfsetup/install/files/lib/action/AJAXInvokeAction.class.php +++ b/wcfsetup/install/files/lib/action/AJAXInvokeAction.class.php @@ -190,7 +190,7 @@ class AJAXInvokeAction extends AbstractSecureAction { throw new AJAXException($exception->getMessage(), AJAXException::BAD_PARAMETERS, $e->getTraceAsString(), [ 'errorMessage' => $exception->getMessage(), 'errorType' => $e->getType(), - 'fieldName' => $exception->getFieldName(), + 'fieldName' => $exception->getFieldName() ]); } else if ($e instanceof ValidateActionException) { diff --git a/wcfsetup/install/files/lib/data/media/MediaAction.class.php b/wcfsetup/install/files/lib/data/media/MediaAction.class.php index 32c2df9e00..adf062cb23 100644 --- a/wcfsetup/install/files/lib/data/media/MediaAction.class.php +++ b/wcfsetup/install/files/lib/data/media/MediaAction.class.php @@ -214,7 +214,7 @@ class MediaAction extends AbstractDatabaseObjectAction implements ISearchAction, $mediaData[$row['mediaID']] = [ 'altText' => [], 'caption' => [], - 'title' => [], + 'title' => [] ]; } diff --git a/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUserAction.class.php b/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUserAction.class.php index 264b23915d..6546d2b499 100644 --- a/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUserAction.class.php +++ b/wcfsetup/install/files/lib/data/paid/subscription/user/PaidSubscriptionUserAction.class.php @@ -233,7 +233,7 @@ class PaidSubscriptionUserAction extends AbstractDatabaseObjectAction { } if (!empty($groupIDs)) { $action = new UserAction([$subscriptionUser->userID], 'removeFromGroups', [ - 'groups' => $groupIDs, + 'groups' => $groupIDs ]); $action->executeAction(); } diff --git a/wcfsetup/install/files/lib/data/user/UserAction.class.php b/wcfsetup/install/files/lib/data/user/UserAction.class.php index d3b87b15d0..d5b595f728 100644 --- a/wcfsetup/install/files/lib/data/user/UserAction.class.php +++ b/wcfsetup/install/files/lib/data/user/UserAction.class.php @@ -610,7 +610,7 @@ class UserAction extends AbstractDatabaseObjectAction implements IClipboardActio 'data' => [ 'activationCode' => UserRegistrationUtil::getActivationCode() ], - 'removeGroups' => UserGroup::getGroupIDsByType([UserGroup::USERS]), + 'removeGroups' => UserGroup::getGroupIDsByType([UserGroup::USERS]) ]); $action->executeAction(); $action = new UserAction($this->objects, 'addToGroups', [ diff --git a/wcfsetup/install/files/lib/data/user/ignore/UserIgnoreAction.class.php b/wcfsetup/install/files/lib/data/user/ignore/UserIgnoreAction.class.php index 663d5507b9..138673a7fa 100644 --- a/wcfsetup/install/files/lib/data/user/ignore/UserIgnoreAction.class.php +++ b/wcfsetup/install/files/lib/data/user/ignore/UserIgnoreAction.class.php @@ -54,7 +54,7 @@ class UserIgnoreAction extends AbstractDatabaseObjectAction { UserIgnoreEditor::create([ 'ignoreUserID' => $this->parameters['data']['userID'], 'time' => TIME_NOW, - 'userID' => WCF::getUser()->userID, + 'userID' => WCF::getUser()->userID ]); UserStorageHandler::getInstance()->reset([WCF::getUser()->userID], 'ignoredUserIDs'); diff --git a/wcfsetup/install/files/lib/form/MailForm.class.php b/wcfsetup/install/files/lib/form/MailForm.class.php index 16b619ad64..a248a35963 100644 --- a/wcfsetup/install/files/lib/form/MailForm.class.php +++ b/wcfsetup/install/files/lib/form/MailForm.class.php @@ -144,7 +144,7 @@ class MailForm extends AbstractCaptchaForm { $messageData = [ 'message' => $this->message, 'recipient' => $this->user, - 'username' => WCF::getUser()->userID ? WCF::getUser()->username : $this->email, + 'username' => WCF::getUser()->userID ? WCF::getUser()->username : $this->email ]; // build mail diff --git a/wcfsetup/install/files/lib/form/RegisterForm.class.php b/wcfsetup/install/files/lib/form/RegisterForm.class.php index 62dc53d260..e628783bce 100644 --- a/wcfsetup/install/files/lib/form/RegisterForm.class.php +++ b/wcfsetup/install/files/lib/form/RegisterForm.class.php @@ -433,7 +433,7 @@ class RegisterForm extends UserAddForm { 'data' => array_merge($this->additionalFields, [ 'username' => $this->username, 'email' => $this->email, - 'password' => $this->password, + 'password' => $this->password ]), 'groups' => $this->groupIDs, 'languageIDs' => $this->visibleLanguages, diff --git a/wcfsetup/install/files/lib/system/menu/user/profile/content/AboutUserProfileMenuContent.class.php b/wcfsetup/install/files/lib/system/menu/user/profile/content/AboutUserProfileMenuContent.class.php index 2d0d4c2728..0a0d666a4b 100644 --- a/wcfsetup/install/files/lib/system/menu/user/profile/content/AboutUserProfileMenuContent.class.php +++ b/wcfsetup/install/files/lib/system/menu/user/profile/content/AboutUserProfileMenuContent.class.php @@ -37,7 +37,7 @@ class AboutUserProfileMenuContent extends SingletonFactory implements IUserProfi WCF::getTPL()->assign([ 'options' => $this->optionHandler->getOptionTree(), - 'userID' => $user->userID, + 'userID' => $user->userID ]); return WCF::getTPL()->fetch('userProfileAbout'); diff --git a/wcfsetup/install/files/lib/system/menu/user/profile/content/LikesUserProfileMenuContent.class.php b/wcfsetup/install/files/lib/system/menu/user/profile/content/LikesUserProfileMenuContent.class.php index 3e9f0d9686..e3e9d93cb3 100644 --- a/wcfsetup/install/files/lib/system/menu/user/profile/content/LikesUserProfileMenuContent.class.php +++ b/wcfsetup/install/files/lib/system/menu/user/profile/content/LikesUserProfileMenuContent.class.php @@ -28,7 +28,7 @@ class LikesUserProfileMenuContent extends SingletonFactory implements IUserProfi WCF::getTPL()->assign([ 'likeList' => $likeList, 'userID' => $userID, - 'lastLikeTime' => $likeList->getLastLikeTime(), + 'lastLikeTime' => $likeList->getLastLikeTime() ]); return WCF::getTPL()->fetch('userProfileLikes'); diff --git a/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php b/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php index 9cc3f4d656..c1c2c6babf 100644 --- a/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php +++ b/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php @@ -230,7 +230,7 @@ class QuickReplyManager extends SingletonFactory { 'container' => $this->container, 'objects' => $messageList, 'startIndex' => $startIndex, - 'sortOrder' => $sortOrder, + 'sortOrder' => $sortOrder ]); // assign 'to top' link diff --git a/wcfsetup/install/files/lib/system/option/user/MessageUserOptionOutput.class.php b/wcfsetup/install/files/lib/system/option/user/MessageUserOptionOutput.class.php index 3608c2a8c3..c1f9880e92 100644 --- a/wcfsetup/install/files/lib/system/option/user/MessageUserOptionOutput.class.php +++ b/wcfsetup/install/files/lib/system/option/user/MessageUserOptionOutput.class.php @@ -30,7 +30,7 @@ class MessageUserOptionOutput implements IUserOptionOutput { WCF::getTPL()->assign([ 'option' => $option, - 'value' => MessageParser::getInstance()->parse($value), + 'value' => MessageParser::getInstance()->parse($value) ]); return WCF::getTPL()->fetch('messageUserOptionOutput'); } diff --git a/wcfsetup/install/files/lib/system/package/plugin/BBCodePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/BBCodePackageInstallationPlugin.class.php index 4e43d601fc..54d633f083 100644 --- a/wcfsetup/install/files/lib/system/package/plugin/BBCodePackageInstallationPlugin.class.php +++ b/wcfsetup/install/files/lib/system/package/plugin/BBCodePackageInstallationPlugin.class.php @@ -180,7 +180,7 @@ class BBCodePackageInstallationPlugin extends AbstractXMLPackageInstallationPlug 'attributeHtml' => (!empty($attribute['html']) ? $attribute['html'] : ''), 'validationPattern' => (!empty($attribute['validationpattern']) ? $attribute['validationpattern'] : ''), 'required' => (!empty($attribute['required']) ? $attribute['required'] : 0), - 'useText' => (!empty($attribute['usetext']) ? $attribute['usetext'] : 0), + 'useText' => (!empty($attribute['usetext']) ? $attribute['usetext'] : 0) ]); } } diff --git a/wcfsetup/install/files/lib/system/page/PageLocationManager.class.php b/wcfsetup/install/files/lib/system/page/PageLocationManager.class.php index 87f27ff31a..f560a28afb 100644 --- a/wcfsetup/install/files/lib/system/page/PageLocationManager.class.php +++ b/wcfsetup/install/files/lib/system/page/PageLocationManager.class.php @@ -100,7 +100,7 @@ class PageLocationManager extends SingletonFactory { 'pageID' => $page->pageID, 'pageObjectID' => $pageObjectID, 'title' => $title, - 'useAsParentLocation' => $useAsParentLocation, + 'useAsParentLocation' => $useAsParentLocation ]; } diff --git a/wcfsetup/install/files/lib/system/upload/UploadFile.class.php b/wcfsetup/install/files/lib/system/upload/UploadFile.class.php index 2df6a040b1..6ce0a815d1 100644 --- a/wcfsetup/install/files/lib/system/upload/UploadFile.class.php +++ b/wcfsetup/install/files/lib/system/upload/UploadFile.class.php @@ -172,7 +172,7 @@ class UploadFile { return [ 'width' => $imageData[0], 'height' => $imageData[1], - 'mimeType' => $imageData['mime'], + 'mimeType' => $imageData['mime'] ]; } } diff --git a/wcfsetup/install/files/lib/system/worker/SendNewPasswordWorker.class.php b/wcfsetup/install/files/lib/system/worker/SendNewPasswordWorker.class.php index 70edf06c00..62090401a9 100644 --- a/wcfsetup/install/files/lib/system/worker/SendNewPasswordWorker.class.php +++ b/wcfsetup/install/files/lib/system/worker/SendNewPasswordWorker.class.php @@ -92,7 +92,7 @@ class SendNewPasswordWorker extends AbstractWorker { // send mail $mail = new Mail([$userEditor->username => $userEditor->email], $userEditor->getLanguage()->getDynamicVariable('wcf.acp.user.sendNewPassword.mail.subject'), $userEditor->getLanguage()->getDynamicVariable('wcf.acp.user.sendNewPassword.mail', [ 'password' => $newPassword, - 'username' => $userEditor->username, + 'username' => $userEditor->username ])); $mail->send(); } -- 2.20.1