Fix php cs issues

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2020-04-22 19:57:19 +02:00
parent 7ad5daabeb
commit 52febb396c
130 changed files with 1068 additions and 1424 deletions

View File

@@ -48,8 +48,7 @@ use OCP\IL10N;
use OCP\IUser;
class ActivityManager {
const DECK_NOAUTHOR_COMMENT_SYSTEM_ENFORCED = 'DECK_NOAUTHOR_COMMENT_SYSTEM_ENFORCED';
public const DECK_NOAUTHOR_COMMENT_SYSTEM_ENFORCED = 'DECK_NOAUTHOR_COMMENT_SYSTEM_ENFORCED';
private $manager;
private $userId;
private $permissionService;
@@ -60,49 +59,49 @@ class ActivityManager {
private $stackMapper;
private $l10n;
const DECK_OBJECT_BOARD = 'deck_board';
const DECK_OBJECT_CARD = 'deck_card';
public const DECK_OBJECT_BOARD = 'deck_board';
public const DECK_OBJECT_CARD = 'deck_card';
const SUBJECT_BOARD_CREATE = 'board_create';
const SUBJECT_BOARD_UPDATE = 'board_update';
const SUBJECT_BOARD_UPDATE_TITLE = 'board_update_title';
const SUBJECT_BOARD_UPDATE_ARCHIVED = 'board_update_archived';
const SUBJECT_BOARD_DELETE = 'board_delete';
const SUBJECT_BOARD_RESTORE = 'board_restore';
const SUBJECT_BOARD_SHARE = 'board_share';
const SUBJECT_BOARD_UNSHARE = 'board_unshare';
public const SUBJECT_BOARD_CREATE = 'board_create';
public const SUBJECT_BOARD_UPDATE = 'board_update';
public const SUBJECT_BOARD_UPDATE_TITLE = 'board_update_title';
public const SUBJECT_BOARD_UPDATE_ARCHIVED = 'board_update_archived';
public const SUBJECT_BOARD_DELETE = 'board_delete';
public const SUBJECT_BOARD_RESTORE = 'board_restore';
public const SUBJECT_BOARD_SHARE = 'board_share';
public const SUBJECT_BOARD_UNSHARE = 'board_unshare';
const SUBJECT_STACK_CREATE = 'stack_create';
const SUBJECT_STACK_UPDATE = 'stack_update';
const SUBJECT_STACK_UPDATE_TITLE = 'stack_update_title';
const SUBJECT_STACK_UPDATE_ORDER = 'stack_update_order';
const SUBJECT_STACK_DELETE = 'stack_delete';
public const SUBJECT_STACK_CREATE = 'stack_create';
public const SUBJECT_STACK_UPDATE = 'stack_update';
public const SUBJECT_STACK_UPDATE_TITLE = 'stack_update_title';
public const SUBJECT_STACK_UPDATE_ORDER = 'stack_update_order';
public const SUBJECT_STACK_DELETE = 'stack_delete';
const SUBJECT_CARD_CREATE = 'card_create';
const SUBJECT_CARD_DELETE = 'card_delete';
const SUBJECT_CARD_RESTORE = 'card_restore';
const SUBJECT_CARD_UPDATE = 'card_update';
const SUBJECT_CARD_UPDATE_TITLE = 'card_update_title';
const SUBJECT_CARD_UPDATE_DESCRIPTION = 'card_update_description';
const SUBJECT_CARD_UPDATE_DUEDATE = 'card_update_duedate';
const SUBJECT_CARD_UPDATE_ARCHIVE = 'card_update_archive';
const SUBJECT_CARD_UPDATE_UNARCHIVE = 'card_update_unarchive';
const SUBJECT_CARD_UPDATE_STACKID = 'card_update_stackId';
const SUBJECT_CARD_USER_ASSIGN = 'card_user_assign';
const SUBJECT_CARD_USER_UNASSIGN = 'card_user_unassign';
public const SUBJECT_CARD_CREATE = 'card_create';
public const SUBJECT_CARD_DELETE = 'card_delete';
public const SUBJECT_CARD_RESTORE = 'card_restore';
public const SUBJECT_CARD_UPDATE = 'card_update';
public const SUBJECT_CARD_UPDATE_TITLE = 'card_update_title';
public const SUBJECT_CARD_UPDATE_DESCRIPTION = 'card_update_description';
public const SUBJECT_CARD_UPDATE_DUEDATE = 'card_update_duedate';
public const SUBJECT_CARD_UPDATE_ARCHIVE = 'card_update_archive';
public const SUBJECT_CARD_UPDATE_UNARCHIVE = 'card_update_unarchive';
public const SUBJECT_CARD_UPDATE_STACKID = 'card_update_stackId';
public const SUBJECT_CARD_USER_ASSIGN = 'card_user_assign';
public const SUBJECT_CARD_USER_UNASSIGN = 'card_user_unassign';
const SUBJECT_ATTACHMENT_CREATE = 'attachment_create';
const SUBJECT_ATTACHMENT_UPDATE = 'attachment_update';
const SUBJECT_ATTACHMENT_DELETE = 'attachment_delete';
const SUBJECT_ATTACHMENT_RESTORE = 'attachment_restore';
public const SUBJECT_ATTACHMENT_CREATE = 'attachment_create';
public const SUBJECT_ATTACHMENT_UPDATE = 'attachment_update';
public const SUBJECT_ATTACHMENT_DELETE = 'attachment_delete';
public const SUBJECT_ATTACHMENT_RESTORE = 'attachment_restore';
const SUBJECT_LABEL_CREATE = 'label_create';
const SUBJECT_LABEL_UPDATE = 'label_update';
const SUBJECT_LABEL_DELETE = 'label_delete';
const SUBJECT_LABEL_ASSIGN = 'label_assign';
const SUBJECT_LABEL_UNASSING = 'label_unassign';
public const SUBJECT_LABEL_CREATE = 'label_create';
public const SUBJECT_LABEL_UPDATE = 'label_update';
public const SUBJECT_LABEL_DELETE = 'label_delete';
public const SUBJECT_LABEL_ASSIGN = 'label_assign';
public const SUBJECT_LABEL_UNASSING = 'label_unassign';
const SUBJECT_CARD_COMMENT_CREATE = 'card_comment_create';
public const SUBJECT_CARD_COMMENT_CREATE = 'card_comment_create';
public function __construct(
IManager $manager,
@@ -197,7 +196,7 @@ class ActivityManager {
case self::SUBJECT_CARD_UPDATE_DUEDATE:
if (!isset($subjectParams['after'])) {
$subject = $ownActivity ? $this->l10n->t('You have removed the due date of card {card}') : $this->l10n->t('{user} has removed the due date of card {card}');
} else if (!isset($subjectParams['before']) && isset($subjectParams['after'])) {
} elseif (!isset($subjectParams['before']) && isset($subjectParams['after'])) {
$subject = $ownActivity ? $this->l10n->t('You have set the due date of card {card} to {after}') : $this->l10n->t('{user} has set the due date of card {card} to {after}');
} else {
$subject = $ownActivity ? $this->l10n->t('You have updated the due date of card {card} to {after}') : $this->l10n->t('{user} has updated the due date of card {card} to {after}');
@@ -376,7 +375,7 @@ class ActivityManager {
break;
}
if ($subject === self::SUBJECT_CARD_UPDATE_DESCRIPTION){
if ($subject === self::SUBJECT_CARD_UPDATE_DESCRIPTION) {
$card = $subjectParams['card'];
if ($card->getLastEditor() === $this->userId) {
return null;
@@ -526,5 +525,4 @@ class ActivityManager {
'board' => $board
];
}
}

View File

@@ -23,9 +23,7 @@
namespace OCA\Deck\Activity;
class ChangeSet implements \JsonSerializable {
private $before;
private $after;
private $diff = false;

View File

@@ -50,12 +50,12 @@ class CommentEventHandler implements ICommentsEventHandler {
* @param CommentsEvent $event
*/
public function handle(CommentsEvent $event) {
if($event->getComment()->getObjectType() !== 'deckCard') {
if ($event->getComment()->getObjectType() !== 'deckCard') {
return;
}
$eventType = $event->getEvent();
if( $eventType === CommentsEvent::EVENT_ADD
if ($eventType === CommentsEvent::EVENT_ADD
) {
$this->notificationHandler($event);
$this->activityHandler($event);
@@ -65,7 +65,7 @@ class CommentEventHandler implements ICommentsEventHandler {
$applicableEvents = [
CommentsEvent::EVENT_UPDATE
];
if(in_array($eventType, $applicableEvents)) {
if (in_array($eventType, $applicableEvents)) {
$this->notificationHandler($event);
return;
}
@@ -79,7 +79,6 @@ class CommentEventHandler implements ICommentsEventHandler {
$comment = $event->getComment();
$card = $this->cardMapper->find($comment->getObjectId());
$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_CARD_COMMENT_CREATE, ['comment' => $comment]);
}
/**

View File

@@ -25,7 +25,6 @@
namespace OCA\Deck\Activity;
use cogpowered\FineDiff\Diff;
use OCA\Deck\Db\Acl;
use OCP\Activity\IEvent;

View File

@@ -23,7 +23,6 @@
namespace OCA\Deck\Activity;
class DescriptionSetting extends Setting {
/**
@@ -41,5 +40,4 @@ class DescriptionSetting extends Setting {
public function getName() {
return $this->l->t('A <strong>card description</strong> inside the Deck app has been changed');
}
}

View File

@@ -27,7 +27,6 @@ use OCP\IL10N;
use OCP\IURLGenerator;
class Filter implements \OCP\Activity\IFilter {
private $l10n;
private $urlGenerator;

View File

@@ -23,7 +23,6 @@
namespace OCA\Deck\Activity;
use OCP\IL10N;
class Setting implements \OCP\Activity\ISetting {

View File

@@ -23,7 +23,6 @@
namespace OCA\Deck\Activity;
class SettingComment extends Setting {
/**
@@ -49,5 +48,4 @@ class SettingComment extends Setting {
public function canChangeStream() {
return false;
}
}