Inspection of "Merge pull request #6849 from nextcloud/fix-missin..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 6ddda3...b3ff9a )

by Blizzz

created 2017-10-31 14:05 UTC

Status

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

@@ -133,7 +133,7 @@  discard block
 block discarded – undo
 		foreach ($users as $user) {
 			$event->setAffectedUser($user)
 				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
+					$user === $currentUser ? $action.'_self' : $action,
 					[
 						'actor' => $currentUser,
 						'calendar' => [
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
 					$event,
 					$calendarData,
 					Calendar::SUBJECT_UNSHARE_USER,
-					Calendar::SUBJECT_DELETE . '_self'
+					Calendar::SUBJECT_DELETE.'_self'
 				);
 
 				if ($owner !== $principal[2]) {
@@ -201,15 +201,15 @@  discard block
 block discarded – undo
 					];
 
 					if ($owner === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_you';
+						$subject = Calendar::SUBJECT_UNSHARE_USER.'_you';
 					} else if ($principal[2] === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_self';
+						$subject = Calendar::SUBJECT_UNSHARE_USER.'_self';
 					} else {
 						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Calendar::SUBJECT_UNSHARE_USER . '_you', $parameters);
+							->setSubject(Calendar::SUBJECT_UNSHARE_USER.'_you', $parameters);
 						$this->activityManager->publish($event);
 
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_by';
+						$subject = Calendar::SUBJECT_UNSHARE_USER.'_by';
 					}
 
 					$event->setAffectedUser($owner)
@@ -230,13 +230,13 @@  discard block
 block discarded – undo
 				];
 
 				if ($owner === $event->getAuthor()) {
-					$subject = Calendar::SUBJECT_UNSHARE_GROUP . '_you';
+					$subject = Calendar::SUBJECT_UNSHARE_GROUP.'_you';
 				} else {
 					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Calendar::SUBJECT_UNSHARE_GROUP . '_you', $parameters);
+						->setSubject(Calendar::SUBJECT_UNSHARE_GROUP.'_you', $parameters);
 					$this->activityManager->publish($event);
 
-					$subject = Calendar::SUBJECT_UNSHARE_GROUP . '_by';
+					$subject = Calendar::SUBJECT_UNSHARE_GROUP.'_by';
 				}
 
 				$event->setAffectedUser($owner)
@@ -272,13 +272,13 @@  discard block
 block discarded – undo
 					];
 
 					if ($owner === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_SHARE_USER . '_you';
+						$subject = Calendar::SUBJECT_SHARE_USER.'_you';
 					} else {
 						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Calendar::SUBJECT_SHARE_USER . '_you', $parameters);
+							->setSubject(Calendar::SUBJECT_SHARE_USER.'_you', $parameters);
 						$this->activityManager->publish($event);
 
-						$subject = Calendar::SUBJECT_SHARE_USER . '_by';
+						$subject = Calendar::SUBJECT_SHARE_USER.'_by';
 					}
 
 					$event->setAffectedUser($owner)
@@ -299,13 +299,13 @@  discard block
 block discarded – undo
 				];
 
 				if ($owner === $event->getAuthor()) {
-					$subject = Calendar::SUBJECT_SHARE_GROUP . '_you';
+					$subject = Calendar::SUBJECT_SHARE_GROUP.'_you';
 				} else {
 					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Calendar::SUBJECT_SHARE_GROUP . '_you', $parameters);
+						->setSubject(Calendar::SUBJECT_SHARE_GROUP.'_you', $parameters);
 					$this->activityManager->publish($event);
 
-					$subject = Calendar::SUBJECT_SHARE_GROUP . '_by';
+					$subject = Calendar::SUBJECT_SHARE_GROUP.'_by';
 				}
 
 				$event->setAffectedUser($owner)
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
 		}
 
 		$object = $this->getObjectNameAndType($objectData);
-		$action = $action . '_' . $object['type'];
+		$action = $action.'_'.$object['type'];
 
 		if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'COMPLETED') {
 			$action .= '_completed';
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
 		foreach ($users as $user) {
 			$event->setAffectedUser($user)
 				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
+					$user === $currentUser ? $action.'_self' : $action,
 					[
 						'actor' => $event->getAuthor(),
 						'calendar' => [
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
 	protected function getObjectNameAndType(array $objectData) {
 		$vObject = Reader::read($objectData['calendardata']);
 		$component = $componentType = null;
-		foreach($vObject->getComponents() as $component) {
+		foreach ($vObject->getComponents() as $component) {
 			if (in_array($component->name, ['VEVENT', 'VTODO'])) {
 				$componentType = $component->name;
 				break;

Please login to merge, or discard this patch.

apps/dav/lib/CalDAV/Activity/Provider/Todo.php 1 patch

Spacing +32 added lines, -32 removed lines patch added patch discarded remove patch

@@ -46,26 +46,26 @@  discard block
 block discarded – undo
 			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg')));
 		}
 
-		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo') {
+		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_todo') {
 			$subject = $this->l->t('{actor} created todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_todo_self') {
 			$subject = $this->l->t('You created todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_todo') {
 			$subject = $this->l->t('{actor} deleted todo {todo} from list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_todo_self') {
 			$subject = $this->l->t('You deleted todo {todo} from list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo') {
 			$subject = $this->l->t('{actor} updated todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_self') {
 			$subject = $this->l->t('You updated todo {todo} in list {calendar}');
 
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_completed') {
 			$subject = $this->l->t('{actor} solved todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_completed_self') {
 			$subject = $this->l->t('You solved todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action') {
 			$subject = $this->l->t('{actor} reopened todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action_self') {
 			$subject = $this->l->t('You reopened todo {todo} in list {calendar}');
 		} else {
 			throw new \InvalidArgumentException();
@@ -90,21 +90,21 @@  discard block
 block discarded – undo
 		// Nextcloud 13+
 		if (isset($parameters['calendar'])) {
 			switch ($subject) {
-				case self::SUBJECT_OBJECT_ADD . '_todo':
-				case self::SUBJECT_OBJECT_DELETE . '_todo':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_completed':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action':
+				case self::SUBJECT_OBJECT_ADD.'_todo':
+				case self::SUBJECT_OBJECT_DELETE.'_todo':
+				case self::SUBJECT_OBJECT_UPDATE.'_todo':
+				case self::SUBJECT_OBJECT_UPDATE.'_todo_completed':
+				case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'todo' => $this->generateObjectParameter($parameters['object']),
 					];
-				case self::SUBJECT_OBJECT_ADD . '_todo_self':
-				case self::SUBJECT_OBJECT_DELETE . '_todo_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self':
+				case self::SUBJECT_OBJECT_ADD.'_todo_self':
+				case self::SUBJECT_OBJECT_DELETE.'_todo_self':
+				case self::SUBJECT_OBJECT_UPDATE.'_todo_self':
+				case self::SUBJECT_OBJECT_UPDATE.'_todo_completed_self':
+				case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action_self':
 					return [
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'todo' => $this->generateObjectParameter($parameters['object']),
@@ -118,23 +118,23 @@  discard block
 block discarded – undo
 		// Otherwise if people upgrade over multiple releases in a short period,
 		// they will get the dead entries in their stream.
 		switch ($subject) {
-			case self::SUBJECT_OBJECT_ADD . '_todo':
-			case self::SUBJECT_OBJECT_DELETE . '_todo':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_completed':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action':
+			case self::SUBJECT_OBJECT_ADD.'_todo':
+			case self::SUBJECT_OBJECT_DELETE.'_todo':
+			case self::SUBJECT_OBJECT_UPDATE.'_todo':
+			case self::SUBJECT_OBJECT_UPDATE.'_todo_completed':
+			case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action':
 				return [
 					'actor' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 					'todo' => $this->generateObjectParameter($parameters[2]),
 				];
-			case self::SUBJECT_OBJECT_ADD . '_todo_self':
-			case self::SUBJECT_OBJECT_DELETE . '_todo_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self':
+			case self::SUBJECT_OBJECT_ADD.'_todo_self':
+			case self::SUBJECT_OBJECT_DELETE.'_todo_self':
+			case self::SUBJECT_OBJECT_UPDATE.'_todo_self':
+			case self::SUBJECT_OBJECT_UPDATE.'_todo_completed_self':
+			case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action_self':
 				return [
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 					'todo' => $this->generateObjectParameter($parameters[2]),
 				];
 		}

Please login to merge, or discard this patch.

apps/dav/lib/CalDAV/Activity/Provider/Calendar.php 1 patch

Spacing +41 added lines, -41 removed lines patch added patch discarded remove patch

@@ -92,39 +92,39 @@  discard block
 block discarded – undo
 
 		if ($event->getSubject() === self::SUBJECT_ADD) {
 			$subject = $this->l->t('{actor} created calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_ADD . '_self') {
+		} else if ($event->getSubject() === self::SUBJECT_ADD.'_self') {
 			$subject = $this->l->t('You created calendar {calendar}');
 		} else if ($event->getSubject() === self::SUBJECT_DELETE) {
 			$subject = $this->l->t('{actor} deleted calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
+		} else if ($event->getSubject() === self::SUBJECT_DELETE.'_self') {
 			$subject = $this->l->t('You deleted calendar {calendar}');
 		} else if ($event->getSubject() === self::SUBJECT_UPDATE) {
 			$subject = $this->l->t('{actor} updated calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
+		} else if ($event->getSubject() === self::SUBJECT_UPDATE.'_self') {
 			$subject = $this->l->t('You updated calendar {calendar}');
 
 		} else if ($event->getSubject() === self::SUBJECT_SHARE_USER) {
 			$subject = $this->l->t('{actor} shared calendar {calendar} with you');
-		} else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
+		} else if ($event->getSubject() === self::SUBJECT_SHARE_USER.'_you') {
 			$subject = $this->l->t('You shared calendar {calendar} with {user}');
-		} else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
+		} else if ($event->getSubject() === self::SUBJECT_SHARE_USER.'_by') {
 			$subject = $this->l->t('{actor} shared calendar {calendar} with {user}');
 		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
 			$subject = $this->l->t('{actor} unshared calendar {calendar} from you');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
+		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_you') {
 			$subject = $this->l->t('You unshared calendar {calendar} from {user}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
+		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_by') {
 			$subject = $this->l->t('{actor} unshared calendar {calendar} from {user}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
+		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_self') {
 			$subject = $this->l->t('{actor} unshared calendar {calendar} from themselves');
 
-		} else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
+		} else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_you') {
 			$subject = $this->l->t('You shared calendar {calendar} with group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
+		} else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_by') {
 			$subject = $this->l->t('{actor} shared calendar {calendar} with group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
+		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_you') {
 			$subject = $this->l->t('You unshared calendar {calendar} from group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
+		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_by') {
 			$subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}');
 		} else {
 			throw new \InvalidArgumentException();
@@ -160,39 +160,39 @@  discard block
 block discarded – undo
 		if (isset($parameters['calendar'])) {
 			switch ($subject) {
 				case self::SUBJECT_ADD:
-				case self::SUBJECT_ADD . '_self':
+				case self::SUBJECT_ADD.'_self':
 				case self::SUBJECT_DELETE:
-				case self::SUBJECT_DELETE . '_self':
+				case self::SUBJECT_DELETE.'_self':
 				case self::SUBJECT_UPDATE:
-				case self::SUBJECT_UPDATE . '_self':
+				case self::SUBJECT_UPDATE.'_self':
 				case self::SUBJECT_SHARE_USER:
 				case self::SUBJECT_UNSHARE_USER:
-				case self::SUBJECT_UNSHARE_USER . '_self':
+				case self::SUBJECT_UNSHARE_USER.'_self':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 					];
-				case self::SUBJECT_SHARE_USER . '_you':
-				case self::SUBJECT_UNSHARE_USER . '_you':
+				case self::SUBJECT_SHARE_USER.'_you':
+				case self::SUBJECT_UNSHARE_USER.'_you':
 					return [
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'user' => $this->generateUserParameter($parameters['user']),
 					];
-				case self::SUBJECT_SHARE_USER . '_by':
-				case self::SUBJECT_UNSHARE_USER . '_by':
+				case self::SUBJECT_SHARE_USER.'_by':
+				case self::SUBJECT_UNSHARE_USER.'_by':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'user' => $this->generateUserParameter($parameters['user']),
 					];
-				case self::SUBJECT_SHARE_GROUP . '_you':
-				case self::SUBJECT_UNSHARE_GROUP . '_you':
+				case self::SUBJECT_SHARE_GROUP.'_you':
+				case self::SUBJECT_UNSHARE_GROUP.'_you':
 					return [
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'group' => $this->generateGroupParameter($parameters['group']),
 					];
-				case self::SUBJECT_SHARE_GROUP . '_by':
-				case self::SUBJECT_UNSHARE_GROUP . '_by':
+				case self::SUBJECT_SHARE_GROUP.'_by':
+				case self::SUBJECT_UNSHARE_GROUP.'_by':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
@@ -208,42 +208,42 @@  discard block
 block discarded – undo
 		// they will get the dead entries in their stream.
 		switch ($subject) {
 			case self::SUBJECT_ADD:
-			case self::SUBJECT_ADD . '_self':
+			case self::SUBJECT_ADD.'_self':
 			case self::SUBJECT_DELETE:
-			case self::SUBJECT_DELETE . '_self':
+			case self::SUBJECT_DELETE.'_self':
 			case self::SUBJECT_UPDATE:
-			case self::SUBJECT_UPDATE . '_self':
+			case self::SUBJECT_UPDATE.'_self':
 			case self::SUBJECT_SHARE_USER:
 			case self::SUBJECT_UNSHARE_USER:
-			case self::SUBJECT_UNSHARE_USER . '_self':
+			case self::SUBJECT_UNSHARE_USER.'_self':
 				return [
 					'actor' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 				];
-			case self::SUBJECT_SHARE_USER . '_you':
-			case self::SUBJECT_UNSHARE_USER . '_you':
+			case self::SUBJECT_SHARE_USER.'_you':
+			case self::SUBJECT_UNSHARE_USER.'_you':
 				return [
 					'user' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 				];
-			case self::SUBJECT_SHARE_USER . '_by':
-			case self::SUBJECT_UNSHARE_USER . '_by':
+			case self::SUBJECT_SHARE_USER.'_by':
+			case self::SUBJECT_UNSHARE_USER.'_by':
 				return [
 					'user' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 					'actor' => $this->generateUserParameter($parameters[2]),
 				];
-			case self::SUBJECT_SHARE_GROUP . '_you':
-			case self::SUBJECT_UNSHARE_GROUP . '_you':
+			case self::SUBJECT_SHARE_GROUP.'_you':
+			case self::SUBJECT_UNSHARE_GROUP.'_you':
 				return [
 					'group' => $this->generateGroupParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 				];
-			case self::SUBJECT_SHARE_GROUP . '_by':
-			case self::SUBJECT_UNSHARE_GROUP . '_by':
+			case self::SUBJECT_SHARE_GROUP.'_by':
+			case self::SUBJECT_UNSHARE_GROUP.'_by':
 				return [
 					'group' => $this->generateGroupParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 					'actor' => $this->generateUserParameter($parameters[2]),
 				];
 		}

Please login to merge, or discard this patch.

apps/dav/lib/CalDAV/Activity/Provider/Event.php 1 patch

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -86,17 +86,17 @@  discard block
 block discarded – undo
 			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
 		}
 
-		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
+		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_event') {
 			$subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_event_self') {
 			$subject = $this->l->t('You created event {event} in calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_event') {
 			$subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_event_self') {
 			$subject = $this->l->t('You deleted event {event} from calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_event') {
 			$subject = $this->l->t('{actor} updated event {event} in calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_event_self') {
 			$subject = $this->l->t('You updated event {event} in calendar {calendar}');
 		} else {
 			throw new \InvalidArgumentException();
@@ -121,17 +121,17 @@  discard block
 block discarded – undo
 		// Nextcloud 13+
 		if (isset($parameters['calendar'])) {
 			switch ($subject) {
-				case self::SUBJECT_OBJECT_ADD . '_event':
-				case self::SUBJECT_OBJECT_DELETE . '_event':
-				case self::SUBJECT_OBJECT_UPDATE . '_event':
+				case self::SUBJECT_OBJECT_ADD.'_event':
+				case self::SUBJECT_OBJECT_DELETE.'_event':
+				case self::SUBJECT_OBJECT_UPDATE.'_event':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'event' => $this->generateObjectParameter($parameters['object']),
 					];
-				case self::SUBJECT_OBJECT_ADD . '_event_self':
-				case self::SUBJECT_OBJECT_DELETE . '_event_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_event_self':
+				case self::SUBJECT_OBJECT_ADD.'_event_self':
+				case self::SUBJECT_OBJECT_DELETE.'_event_self':
+				case self::SUBJECT_OBJECT_UPDATE.'_event_self':
 					return [
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'event' => $this->generateObjectParameter($parameters['object']),
@@ -145,19 +145,19 @@  discard block
 block discarded – undo
 		// Otherwise if people upgrade over multiple releases in a short period,
 		// they will get the dead entries in their stream.
 		switch ($subject) {
-			case self::SUBJECT_OBJECT_ADD . '_event':
-			case self::SUBJECT_OBJECT_DELETE . '_event':
-			case self::SUBJECT_OBJECT_UPDATE . '_event':
+			case self::SUBJECT_OBJECT_ADD.'_event':
+			case self::SUBJECT_OBJECT_DELETE.'_event':
+			case self::SUBJECT_OBJECT_UPDATE.'_event':
 				return [
 					'actor' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 					'event' => $this->generateObjectParameter($parameters[2]),
 				];
-			case self::SUBJECT_OBJECT_ADD . '_event_self':
-			case self::SUBJECT_OBJECT_DELETE . '_event_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_event_self':
+			case self::SUBJECT_OBJECT_ADD.'_event_self':
+			case self::SUBJECT_OBJECT_DELETE.'_event_self':
+			case self::SUBJECT_OBJECT_UPDATE.'_event_self':
 				return [
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 					'event' => $this->generateObjectParameter($parameters[2]),
 				];
 		}

Please login to merge, or discard this patch.

		@@ -133,7 +133,7 @@ discard block
		block discarded – undo
133	133	foreach ($users as $user) {
134	134	$event->setAffectedUser($user)
135	135	->setSubject(
136		- $user === $currentUser ? $action . '_self' : $action,
	136	+ $user === $currentUser ? $action.'_self' : $action,
137	137	[
138	138	'actor' => $currentUser,
139	139	'calendar' => [
		@@ -186,7 +186,7 @@ discard block
		block discarded – undo
186	186	$event,
187	187	$calendarData,
188	188	Calendar::SUBJECT_UNSHARE_USER,
189		- Calendar::SUBJECT_DELETE . '_self'
	189	+ Calendar::SUBJECT_DELETE.'_self'
190	190	);
191	191
192	192	if ($owner !== $principal[2]) {
		@@ -201,15 +201,15 @@ discard block
		block discarded – undo
201	201	];
202	202
203	203	if ($owner === $event->getAuthor()) {
204		- $subject = Calendar::SUBJECT_UNSHARE_USER . '_you';
	204	+ $subject = Calendar::SUBJECT_UNSHARE_USER.'_you';
205	205	} else if ($principal[2] === $event->getAuthor()) {
206		- $subject = Calendar::SUBJECT_UNSHARE_USER . '_self';
	206	+ $subject = Calendar::SUBJECT_UNSHARE_USER.'_self';
207	207	} else {
208	208	$event->setAffectedUser($event->getAuthor())
209		- ->setSubject(Calendar::SUBJECT_UNSHARE_USER . '_you', $parameters);
	209	+ ->setSubject(Calendar::SUBJECT_UNSHARE_USER.'_you', $parameters);
210	210	$this->activityManager->publish($event);
211	211
212		- $subject = Calendar::SUBJECT_UNSHARE_USER . '_by';
	212	+ $subject = Calendar::SUBJECT_UNSHARE_USER.'_by';
213	213	}
214	214
215	215	$event->setAffectedUser($owner)
		@@ -230,13 +230,13 @@ discard block
		block discarded – undo
230	230	];
231	231
232	232	if ($owner === $event->getAuthor()) {
233		- $subject = Calendar::SUBJECT_UNSHARE_GROUP . '_you';
	233	+ $subject = Calendar::SUBJECT_UNSHARE_GROUP.'_you';
234	234	} else {
235	235	$event->setAffectedUser($event->getAuthor())
236		- ->setSubject(Calendar::SUBJECT_UNSHARE_GROUP . '_you', $parameters);
	236	+ ->setSubject(Calendar::SUBJECT_UNSHARE_GROUP.'_you', $parameters);
237	237	$this->activityManager->publish($event);
238	238
239		- $subject = Calendar::SUBJECT_UNSHARE_GROUP . '_by';
	239	+ $subject = Calendar::SUBJECT_UNSHARE_GROUP.'_by';
240	240	}
241	241
242	242	$event->setAffectedUser($owner)
		@@ -272,13 +272,13 @@ discard block
		block discarded – undo
272	272	];
273	273
274	274	if ($owner === $event->getAuthor()) {
275		- $subject = Calendar::SUBJECT_SHARE_USER . '_you';
	275	+ $subject = Calendar::SUBJECT_SHARE_USER.'_you';
276	276	} else {
277	277	$event->setAffectedUser($event->getAuthor())
278		- ->setSubject(Calendar::SUBJECT_SHARE_USER . '_you', $parameters);
	278	+ ->setSubject(Calendar::SUBJECT_SHARE_USER.'_you', $parameters);
279	279	$this->activityManager->publish($event);
280	280
281		- $subject = Calendar::SUBJECT_SHARE_USER . '_by';
	281	+ $subject = Calendar::SUBJECT_SHARE_USER.'_by';
282	282	}
283	283
284	284	$event->setAffectedUser($owner)
		@@ -299,13 +299,13 @@ discard block
		block discarded – undo
299	299	];
300	300
301	301	if ($owner === $event->getAuthor()) {
302		- $subject = Calendar::SUBJECT_SHARE_GROUP . '_you';
	302	+ $subject = Calendar::SUBJECT_SHARE_GROUP.'_you';
303	303	} else {
304	304	$event->setAffectedUser($event->getAuthor())
305		- ->setSubject(Calendar::SUBJECT_SHARE_GROUP . '_you', $parameters);
	305	+ ->setSubject(Calendar::SUBJECT_SHARE_GROUP.'_you', $parameters);
306	306	$this->activityManager->publish($event);
307	307
308		- $subject = Calendar::SUBJECT_SHARE_GROUP . '_by';
	308	+ $subject = Calendar::SUBJECT_SHARE_GROUP.'_by';
309	309	}
310	310
311	311	$event->setAffectedUser($owner)
		@@ -403,7 +403,7 @@ discard block
		block discarded – undo
403	403	}
404	404
405	405	$object = $this->getObjectNameAndType($objectData);
406		- $action = $action . '_' . $object['type'];
	406	+ $action = $action.'_'.$object['type'];
407	407
408	408	if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'COMPLETED') {
409	409	$action .= '_completed';
		@@ -423,7 +423,7 @@ discard block
		block discarded – undo
423	423	foreach ($users as $user) {
424	424	$event->setAffectedUser($user)
425	425	->setSubject(
426		- $user === $currentUser ? $action . '_self' : $action,
	426	+ $user === $currentUser ? $action.'_self' : $action,
427	427	[
428	428	'actor' => $event->getAuthor(),
429	429	'calendar' => [
		@@ -448,7 +448,7 @@ discard block
		block discarded – undo
448	448	protected function getObjectNameAndType(array $objectData) {
449	449	$vObject = Reader::read($objectData['calendardata']);
450	450	$component = $componentType = null;
451		- foreach($vObject->getComponents() as $component) {
	451	+ foreach ($vObject->getComponents() as $component) {
452	452	if (in_array($component->name, ['VEVENT', 'VTODO'])) {
453	453	$componentType = $component->name;
454	454	break;

		@@ -92,39 +92,39 @@ discard block
		block discarded – undo
92	92
93	93	if ($event->getSubject() === self::SUBJECT_ADD) {
94	94	$subject = $this->l->t('{actor} created calendar {calendar}');
95		- } else if ($event->getSubject() === self::SUBJECT_ADD . '_self') {
	95	+ } else if ($event->getSubject() === self::SUBJECT_ADD.'_self') {
96	96	$subject = $this->l->t('You created calendar {calendar}');
97	97	} else if ($event->getSubject() === self::SUBJECT_DELETE) {
98	98	$subject = $this->l->t('{actor} deleted calendar {calendar}');
99		- } else if ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
	99	+ } else if ($event->getSubject() === self::SUBJECT_DELETE.'_self') {
100	100	$subject = $this->l->t('You deleted calendar {calendar}');
101	101	} else if ($event->getSubject() === self::SUBJECT_UPDATE) {
102	102	$subject = $this->l->t('{actor} updated calendar {calendar}');
103		- } else if ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
	103	+ } else if ($event->getSubject() === self::SUBJECT_UPDATE.'_self') {
104	104	$subject = $this->l->t('You updated calendar {calendar}');
105	105
106	106	} else if ($event->getSubject() === self::SUBJECT_SHARE_USER) {
107	107	$subject = $this->l->t('{actor} shared calendar {calendar} with you');
108		- } else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
	108	+ } else if ($event->getSubject() === self::SUBJECT_SHARE_USER.'_you') {
109	109	$subject = $this->l->t('You shared calendar {calendar} with {user}');
110		- } else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
	110	+ } else if ($event->getSubject() === self::SUBJECT_SHARE_USER.'_by') {
111	111	$subject = $this->l->t('{actor} shared calendar {calendar} with {user}');
112	112	} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
113	113	$subject = $this->l->t('{actor} unshared calendar {calendar} from you');
114		- } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
	114	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_you') {
115	115	$subject = $this->l->t('You unshared calendar {calendar} from {user}');
116		- } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
	116	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_by') {
117	117	$subject = $this->l->t('{actor} unshared calendar {calendar} from {user}');
118		- } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
	118	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_self') {
119	119	$subject = $this->l->t('{actor} unshared calendar {calendar} from themselves');
120	120
121		- } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
	121	+ } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_you') {
122	122	$subject = $this->l->t('You shared calendar {calendar} with group {group}');
123		- } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
	123	+ } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_by') {
124	124	$subject = $this->l->t('{actor} shared calendar {calendar} with group {group}');
125		- } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
	125	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_you') {
126	126	$subject = $this->l->t('You unshared calendar {calendar} from group {group}');
127		- } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
	127	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_by') {
128	128	$subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}');
129	129	} else {
130	130	throw new \InvalidArgumentException();
		@@ -160,39 +160,39 @@ discard block
		block discarded – undo
160	160	if (isset($parameters['calendar'])) {
161	161	switch ($subject) {
162	162	case self::SUBJECT_ADD:
163		- case self::SUBJECT_ADD . '_self':
	163	+ case self::SUBJECT_ADD.'_self':
164	164	case self::SUBJECT_DELETE:
165		- case self::SUBJECT_DELETE . '_self':
	165	+ case self::SUBJECT_DELETE.'_self':
166	166	case self::SUBJECT_UPDATE:
167		- case self::SUBJECT_UPDATE . '_self':
	167	+ case self::SUBJECT_UPDATE.'_self':
168	168	case self::SUBJECT_SHARE_USER:
169	169	case self::SUBJECT_UNSHARE_USER:
170		- case self::SUBJECT_UNSHARE_USER . '_self':
	170	+ case self::SUBJECT_UNSHARE_USER.'_self':
171	171	return [
172	172	'actor' => $this->generateUserParameter($parameters['actor']),
173	173	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
174	174	];
175		- case self::SUBJECT_SHARE_USER . '_you':
176		- case self::SUBJECT_UNSHARE_USER . '_you':
	175	+ case self::SUBJECT_SHARE_USER.'_you':
	176	+ case self::SUBJECT_UNSHARE_USER.'_you':
177	177	return [
178	178	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
179	179	'user' => $this->generateUserParameter($parameters['user']),
180	180	];
181		- case self::SUBJECT_SHARE_USER . '_by':
182		- case self::SUBJECT_UNSHARE_USER . '_by':
	181	+ case self::SUBJECT_SHARE_USER.'_by':
	182	+ case self::SUBJECT_UNSHARE_USER.'_by':
183	183	return [
184	184	'actor' => $this->generateUserParameter($parameters['actor']),
185	185	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
186	186	'user' => $this->generateUserParameter($parameters['user']),
187	187	];
188		- case self::SUBJECT_SHARE_GROUP . '_you':
189		- case self::SUBJECT_UNSHARE_GROUP . '_you':
	188	+ case self::SUBJECT_SHARE_GROUP.'_you':
	189	+ case self::SUBJECT_UNSHARE_GROUP.'_you':
190	190	return [
191	191	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
192	192	'group' => $this->generateGroupParameter($parameters['group']),
193	193	];
194		- case self::SUBJECT_SHARE_GROUP . '_by':
195		- case self::SUBJECT_UNSHARE_GROUP . '_by':
	194	+ case self::SUBJECT_SHARE_GROUP.'_by':
	195	+ case self::SUBJECT_UNSHARE_GROUP.'_by':
196	196	return [
197	197	'actor' => $this->generateUserParameter($parameters['actor']),
198	198	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
		@@ -208,42 +208,42 @@ discard block
		block discarded – undo
208	208	// they will get the dead entries in their stream.
209	209	switch ($subject) {
210	210	case self::SUBJECT_ADD:
211		- case self::SUBJECT_ADD . '_self':
	211	+ case self::SUBJECT_ADD.'_self':
212	212	case self::SUBJECT_DELETE:
213		- case self::SUBJECT_DELETE . '_self':
	213	+ case self::SUBJECT_DELETE.'_self':
214	214	case self::SUBJECT_UPDATE:
215		- case self::SUBJECT_UPDATE . '_self':
	215	+ case self::SUBJECT_UPDATE.'_self':
216	216	case self::SUBJECT_SHARE_USER:
217	217	case self::SUBJECT_UNSHARE_USER:
218		- case self::SUBJECT_UNSHARE_USER . '_self':
	218	+ case self::SUBJECT_UNSHARE_USER.'_self':
219	219	return [
220	220	'actor' => $this->generateUserParameter($parameters[0]),
221		- 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
	221	+ 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
222	222	];
223		- case self::SUBJECT_SHARE_USER . '_you':
224		- case self::SUBJECT_UNSHARE_USER . '_you':
	223	+ case self::SUBJECT_SHARE_USER.'_you':
	224	+ case self::SUBJECT_UNSHARE_USER.'_you':
225	225	return [
226	226	'user' => $this->generateUserParameter($parameters[0]),
227		- 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
	227	+ 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
228	228	];
229		- case self::SUBJECT_SHARE_USER . '_by':
230		- case self::SUBJECT_UNSHARE_USER . '_by':
	229	+ case self::SUBJECT_SHARE_USER.'_by':
	230	+ case self::SUBJECT_UNSHARE_USER.'_by':
231	231	return [
232	232	'user' => $this->generateUserParameter($parameters[0]),
233		- 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
	233	+ 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
234	234	'actor' => $this->generateUserParameter($parameters[2]),
235	235	];
236		- case self::SUBJECT_SHARE_GROUP . '_you':
237		- case self::SUBJECT_UNSHARE_GROUP . '_you':
	236	+ case self::SUBJECT_SHARE_GROUP.'_you':
	237	+ case self::SUBJECT_UNSHARE_GROUP.'_you':
238	238	return [
239	239	'group' => $this->generateGroupParameter($parameters[0]),
240		- 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
	240	+ 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
241	241	];
242		- case self::SUBJECT_SHARE_GROUP . '_by':
243		- case self::SUBJECT_UNSHARE_GROUP . '_by':
	242	+ case self::SUBJECT_SHARE_GROUP.'_by':
	243	+ case self::SUBJECT_UNSHARE_GROUP.'_by':
244	244	return [
245	245	'group' => $this->generateGroupParameter($parameters[0]),
246		- 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
	246	+ 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
247	247	'actor' => $this->generateUserParameter($parameters[2]),
248	248	];
249	249	}

		@@ -46,26 +46,26 @@ discard block
		block discarded – undo
46	46	$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg')));
47	47	}
48	48
49		- if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo') {
	49	+ if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_todo') {
50	50	$subject = $this->l->t('{actor} created todo {todo} in list {calendar}');
51		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo_self') {
	51	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_todo_self') {
52	52	$subject = $this->l->t('You created todo {todo} in list {calendar}');
53		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo') {
	53	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_todo') {
54	54	$subject = $this->l->t('{actor} deleted todo {todo} from list {calendar}');
55		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo_self') {
	55	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_todo_self') {
56	56	$subject = $this->l->t('You deleted todo {todo} from list {calendar}');
57		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo') {
	57	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo') {
58	58	$subject = $this->l->t('{actor} updated todo {todo} in list {calendar}');
59		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_self') {
	59	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_self') {
60	60	$subject = $this->l->t('You updated todo {todo} in list {calendar}');
61	61
62		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed') {
	62	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_completed') {
63	63	$subject = $this->l->t('{actor} solved todo {todo} in list {calendar}');
64		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self') {
	64	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_completed_self') {
65	65	$subject = $this->l->t('You solved todo {todo} in list {calendar}');
66		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action') {
	66	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action') {
67	67	$subject = $this->l->t('{actor} reopened todo {todo} in list {calendar}');
68		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self') {
	68	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action_self') {
69	69	$subject = $this->l->t('You reopened todo {todo} in list {calendar}');
70	70	} else {
71	71	throw new \InvalidArgumentException();
		@@ -90,21 +90,21 @@ discard block
		block discarded – undo
90	90	// Nextcloud 13+
91	91	if (isset($parameters['calendar'])) {
92	92	switch ($subject) {
93		- case self::SUBJECT_OBJECT_ADD . '_todo':
94		- case self::SUBJECT_OBJECT_DELETE . '_todo':
95		- case self::SUBJECT_OBJECT_UPDATE . '_todo':
96		- case self::SUBJECT_OBJECT_UPDATE . '_todo_completed':
97		- case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action':
	93	+ case self::SUBJECT_OBJECT_ADD.'_todo':
	94	+ case self::SUBJECT_OBJECT_DELETE.'_todo':
	95	+ case self::SUBJECT_OBJECT_UPDATE.'_todo':
	96	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_completed':
	97	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action':
98	98	return [
99	99	'actor' => $this->generateUserParameter($parameters['actor']),
100	100	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
101	101	'todo' => $this->generateObjectParameter($parameters['object']),
102	102	];
103		- case self::SUBJECT_OBJECT_ADD . '_todo_self':
104		- case self::SUBJECT_OBJECT_DELETE . '_todo_self':
105		- case self::SUBJECT_OBJECT_UPDATE . '_todo_self':
106		- case self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self':
107		- case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self':
	103	+ case self::SUBJECT_OBJECT_ADD.'_todo_self':
	104	+ case self::SUBJECT_OBJECT_DELETE.'_todo_self':
	105	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_self':
	106	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_completed_self':
	107	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action_self':
108	108	return [
109	109	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
110	110	'todo' => $this->generateObjectParameter($parameters['object']),
		@@ -118,23 +118,23 @@ discard block
		block discarded – undo
118	118	// Otherwise if people upgrade over multiple releases in a short period,
119	119	// they will get the dead entries in their stream.
120	120	switch ($subject) {
121		- case self::SUBJECT_OBJECT_ADD . '_todo':
122		- case self::SUBJECT_OBJECT_DELETE . '_todo':
123		- case self::SUBJECT_OBJECT_UPDATE . '_todo':
124		- case self::SUBJECT_OBJECT_UPDATE . '_todo_completed':
125		- case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action':
	121	+ case self::SUBJECT_OBJECT_ADD.'_todo':
	122	+ case self::SUBJECT_OBJECT_DELETE.'_todo':
	123	+ case self::SUBJECT_OBJECT_UPDATE.'_todo':
	124	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_completed':
	125	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action':
126	126	return [
127	127	'actor' => $this->generateUserParameter($parameters[0]),
128		- 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
	128	+ 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
129	129	'todo' => $this->generateObjectParameter($parameters[2]),
130	130	];
131		- case self::SUBJECT_OBJECT_ADD . '_todo_self':
132		- case self::SUBJECT_OBJECT_DELETE . '_todo_self':
133		- case self::SUBJECT_OBJECT_UPDATE . '_todo_self':
134		- case self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self':
135		- case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self':
	131	+ case self::SUBJECT_OBJECT_ADD.'_todo_self':
	132	+ case self::SUBJECT_OBJECT_DELETE.'_todo_self':
	133	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_self':
	134	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_completed_self':
	135	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action_self':
136	136	return [
137		- 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
	137	+ 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
138	138	'todo' => $this->generateObjectParameter($parameters[2]),
139	139	];
140	140	}

		@@ -86,17 +86,17 @@ discard block
		block discarded – undo
86	86	$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
87	87	}
88	88
89		- if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
	89	+ if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_event') {
90	90	$subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
91		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') {
	91	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_event_self') {
92	92	$subject = $this->l->t('You created event {event} in calendar {calendar}');
93		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') {
	93	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_event') {
94	94	$subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
95		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') {
	95	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_event_self') {
96	96	$subject = $this->l->t('You deleted event {event} from calendar {calendar}');
97		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') {
	97	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_event') {
98	98	$subject = $this->l->t('{actor} updated event {event} in calendar {calendar}');
99		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event_self') {
	99	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_event_self') {
100	100	$subject = $this->l->t('You updated event {event} in calendar {calendar}');
101	101	} else {
102	102	throw new \InvalidArgumentException();
		@@ -121,17 +121,17 @@ discard block
		block discarded – undo
121	121	// Nextcloud 13+
122	122	if (isset($parameters['calendar'])) {
123	123	switch ($subject) {
124		- case self::SUBJECT_OBJECT_ADD . '_event':
125		- case self::SUBJECT_OBJECT_DELETE . '_event':
126		- case self::SUBJECT_OBJECT_UPDATE . '_event':
	124	+ case self::SUBJECT_OBJECT_ADD.'_event':
	125	+ case self::SUBJECT_OBJECT_DELETE.'_event':
	126	+ case self::SUBJECT_OBJECT_UPDATE.'_event':
127	127	return [
128	128	'actor' => $this->generateUserParameter($parameters['actor']),
129	129	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
130	130	'event' => $this->generateObjectParameter($parameters['object']),
131	131	];
132		- case self::SUBJECT_OBJECT_ADD . '_event_self':
133		- case self::SUBJECT_OBJECT_DELETE . '_event_self':
134		- case self::SUBJECT_OBJECT_UPDATE . '_event_self':
	132	+ case self::SUBJECT_OBJECT_ADD.'_event_self':
	133	+ case self::SUBJECT_OBJECT_DELETE.'_event_self':
	134	+ case self::SUBJECT_OBJECT_UPDATE.'_event_self':
135	135	return [
136	136	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
137	137	'event' => $this->generateObjectParameter($parameters['object']),
		@@ -145,19 +145,19 @@ discard block
		block discarded – undo
145	145	// Otherwise if people upgrade over multiple releases in a short period,
146	146	// they will get the dead entries in their stream.
147	147	switch ($subject) {
148		- case self::SUBJECT_OBJECT_ADD . '_event':
149		- case self::SUBJECT_OBJECT_DELETE . '_event':
150		- case self::SUBJECT_OBJECT_UPDATE . '_event':
	148	+ case self::SUBJECT_OBJECT_ADD.'_event':
	149	+ case self::SUBJECT_OBJECT_DELETE.'_event':
	150	+ case self::SUBJECT_OBJECT_UPDATE.'_event':
151	151	return [
152	152	'actor' => $this->generateUserParameter($parameters[0]),
153		- 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
	153	+ 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
154	154	'event' => $this->generateObjectParameter($parameters[2]),
155	155	];
156		- case self::SUBJECT_OBJECT_ADD . '_event_self':
157		- case self::SUBJECT_OBJECT_DELETE . '_event_self':
158		- case self::SUBJECT_OBJECT_UPDATE . '_event_self':
	156	+ case self::SUBJECT_OBJECT_ADD.'_event_self':
	157	+ case self::SUBJECT_OBJECT_DELETE.'_event_self':
	158	+ case self::SUBJECT_OBJECT_UPDATE.'_event_self':
159	159	return [
160		- 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
	160	+ 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
161	161	'event' => $this->generateObjectParameter($parameters[2]),
162	162	];
163	163	}

nextcloud / server

Push — master ( 6ddda3...b3ff9a )

Status

Category

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

Spacing +32 added lines, -32 removed lines patch added patch discarded remove patch

Spacing +41 added lines, -41 removed lines patch added patch discarded remove patch

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch