Inspection of "Merge pull request #19039 from nextcloud/dav-activ..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( a1c1b3...a1f329 )

by Roeland

created 2020-04-30 07:11 UTC

Status

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

@@ -94,7 +94,7 @@  discard block
 block discarded – undo
 				// The calendar app needs to be manually loaded for the routes to be loaded
 				OC_App::loadApp('calendar');
 				$linkData = $eventData['link'];
-				$objectId = base64_encode('/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $linkData['calendar_uri'] . '/' . $linkData['object_uri']);
+				$objectId = base64_encode('/remote.php/dav/calendars/'.$linkData['owner'].'/'.$linkData['calendar_uri'].'/'.$linkData['object_uri']);
 				$link = [
 					'view' => 'dayGridMonth',
 					'timeRange' => 'now',
@@ -131,17 +131,17 @@  discard block
 block discarded – undo
 			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.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}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_event_self') {
 			$subject = $this->l->t('You created event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_event') {
 			$subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_event_self') {
 			$subject = $this->l->t('You deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_event') {
 			$subject = $this->l->t('{actor} updated event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_event_self') {
 			$subject = $this->l->t('You updated event {event} in calendar {calendar}');
 		} else {
 			throw new \InvalidArgumentException();
@@ -166,17 +166,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->generateClassifiedObjectParameter($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->generateClassifiedObjectParameter($parameters['object']),
@@ -190,19 +190,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.

apps/dav/lib/CalDAV/Activity/Backend.php 1 patch

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

@@ -148,7 +148,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' => [
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
 					$event,
 					$calendarData,
 					Calendar::SUBJECT_UNSHARE_USER,
-					Calendar::SUBJECT_DELETE . '_self'
+					Calendar::SUBJECT_DELETE.'_self'
 				);
 
 				if ($owner !== $principal[2]) {
@@ -216,15 +216,15 @@  discard block
 block discarded – undo
 					];
 
 					if ($owner === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_you';
+						$subject = Calendar::SUBJECT_UNSHARE_USER.'_you';
 					} elseif ($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)
@@ -245,13 +245,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)
@@ -287,13 +287,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)
@@ -314,13 +314,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)
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
 
 		$classification = $objectData['classification'] ?? CalDavBackend::CLASSIFICATION_PUBLIC;
 		$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';
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
 
 			$event->setAffectedUser($user)
 				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
+					$user === $currentUser ? $action.'_self' : $action,
 					$params
 				);
 

Please login to merge, or discard this patch.

		@@ -94,7 +94,7 @@ discard block
		block discarded – undo
94	94	// The calendar app needs to be manually loaded for the routes to be loaded
95	95	OC_App::loadApp('calendar');
96	96	$linkData = $eventData['link'];
97		- $objectId = base64_encode('/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $linkData['calendar_uri'] . '/' . $linkData['object_uri']);
	97	+ $objectId = base64_encode('/remote.php/dav/calendars/'.$linkData['owner'].'/'.$linkData['calendar_uri'].'/'.$linkData['object_uri']);
98	98	$link = [
99	99	'view' => 'dayGridMonth',
100	100	'timeRange' => 'now',
		@@ -131,17 +131,17 @@ discard block
		block discarded – undo
131	131	$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg')));
132	132	}
133	133
134		- if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
	134	+ if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_event') {
135	135	$subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
136		- } elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') {
	136	+ } elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_event_self') {
137	137	$subject = $this->l->t('You created event {event} in calendar {calendar}');
138		- } elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') {
	138	+ } elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_event') {
139	139	$subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
140		- } elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') {
	140	+ } elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_event_self') {
141	141	$subject = $this->l->t('You deleted event {event} from calendar {calendar}');
142		- } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') {
	142	+ } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_event') {
143	143	$subject = $this->l->t('{actor} updated event {event} in calendar {calendar}');
144		- } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event_self') {
	144	+ } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_event_self') {
145	145	$subject = $this->l->t('You updated event {event} in calendar {calendar}');
146	146	} else {
147	147	throw new \InvalidArgumentException();
		@@ -166,17 +166,17 @@ discard block
		block discarded – undo
166	166	// Nextcloud 13+
167	167	if (isset($parameters['calendar'])) {
168	168	switch ($subject) {
169		- case self::SUBJECT_OBJECT_ADD . '_event':
170		- case self::SUBJECT_OBJECT_DELETE . '_event':
171		- case self::SUBJECT_OBJECT_UPDATE . '_event':
	169	+ case self::SUBJECT_OBJECT_ADD.'_event':
	170	+ case self::SUBJECT_OBJECT_DELETE.'_event':
	171	+ case self::SUBJECT_OBJECT_UPDATE.'_event':
172	172	return [
173	173	'actor' => $this->generateUserParameter($parameters['actor']),
174	174	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
175	175	'event' => $this->generateClassifiedObjectParameter($parameters['object']),
176	176	];
177		- case self::SUBJECT_OBJECT_ADD . '_event_self':
178		- case self::SUBJECT_OBJECT_DELETE . '_event_self':
179		- case self::SUBJECT_OBJECT_UPDATE . '_event_self':
	177	+ case self::SUBJECT_OBJECT_ADD.'_event_self':
	178	+ case self::SUBJECT_OBJECT_DELETE.'_event_self':
	179	+ case self::SUBJECT_OBJECT_UPDATE.'_event_self':
180	180	return [
181	181	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
182	182	'event' => $this->generateClassifiedObjectParameter($parameters['object']),
		@@ -190,19 +190,19 @@ discard block
		block discarded – undo
190	190	// Otherwise if people upgrade over multiple releases in a short period,
191	191	// they will get the dead entries in their stream.
192	192	switch ($subject) {
193		- case self::SUBJECT_OBJECT_ADD . '_event':
194		- case self::SUBJECT_OBJECT_DELETE . '_event':
195		- case self::SUBJECT_OBJECT_UPDATE . '_event':
	193	+ case self::SUBJECT_OBJECT_ADD.'_event':
	194	+ case self::SUBJECT_OBJECT_DELETE.'_event':
	195	+ case self::SUBJECT_OBJECT_UPDATE.'_event':
196	196	return [
197	197	'actor' => $this->generateUserParameter($parameters[0]),
198		- 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
	198	+ 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
199	199	'event' => $this->generateObjectParameter($parameters[2]),
200	200	];
201		- case self::SUBJECT_OBJECT_ADD . '_event_self':
202		- case self::SUBJECT_OBJECT_DELETE . '_event_self':
203		- case self::SUBJECT_OBJECT_UPDATE . '_event_self':
	201	+ case self::SUBJECT_OBJECT_ADD.'_event_self':
	202	+ case self::SUBJECT_OBJECT_DELETE.'_event_self':
	203	+ case self::SUBJECT_OBJECT_UPDATE.'_event_self':
204	204	return [
205		- 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
	205	+ 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
206	206	'event' => $this->generateObjectParameter($parameters[2]),
207	207	];
208	208	}

		@@ -148,7 +148,7 @@ discard block
		block discarded – undo
148	148	foreach ($users as $user) {
149	149	$event->setAffectedUser($user)
150	150	->setSubject(
151		- $user === $currentUser ? $action . '_self' : $action,
	151	+ $user === $currentUser ? $action.'_self' : $action,
152	152	[
153	153	'actor' => $currentUser,
154	154	'calendar' => [
		@@ -201,7 +201,7 @@ discard block
		block discarded – undo
201	201	$event,
202	202	$calendarData,
203	203	Calendar::SUBJECT_UNSHARE_USER,
204		- Calendar::SUBJECT_DELETE . '_self'
	204	+ Calendar::SUBJECT_DELETE.'_self'
205	205	);
206	206
207	207	if ($owner !== $principal[2]) {
		@@ -216,15 +216,15 @@ discard block
		block discarded – undo
216	216	];
217	217
218	218	if ($owner === $event->getAuthor()) {
219		- $subject = Calendar::SUBJECT_UNSHARE_USER . '_you';
	219	+ $subject = Calendar::SUBJECT_UNSHARE_USER.'_you';
220	220	} elseif ($principal[2] === $event->getAuthor()) {
221		- $subject = Calendar::SUBJECT_UNSHARE_USER . '_self';
	221	+ $subject = Calendar::SUBJECT_UNSHARE_USER.'_self';
222	222	} else {
223	223	$event->setAffectedUser($event->getAuthor())
224		- ->setSubject(Calendar::SUBJECT_UNSHARE_USER . '_you', $parameters);
	224	+ ->setSubject(Calendar::SUBJECT_UNSHARE_USER.'_you', $parameters);
225	225	$this->activityManager->publish($event);
226	226
227		- $subject = Calendar::SUBJECT_UNSHARE_USER . '_by';
	227	+ $subject = Calendar::SUBJECT_UNSHARE_USER.'_by';
228	228	}
229	229
230	230	$event->setAffectedUser($owner)
		@@ -245,13 +245,13 @@ discard block
		block discarded – undo
245	245	];
246	246
247	247	if ($owner === $event->getAuthor()) {
248		- $subject = Calendar::SUBJECT_UNSHARE_GROUP . '_you';
	248	+ $subject = Calendar::SUBJECT_UNSHARE_GROUP.'_you';
249	249	} else {
250	250	$event->setAffectedUser($event->getAuthor())
251		- ->setSubject(Calendar::SUBJECT_UNSHARE_GROUP . '_you', $parameters);
	251	+ ->setSubject(Calendar::SUBJECT_UNSHARE_GROUP.'_you', $parameters);
252	252	$this->activityManager->publish($event);
253	253
254		- $subject = Calendar::SUBJECT_UNSHARE_GROUP . '_by';
	254	+ $subject = Calendar::SUBJECT_UNSHARE_GROUP.'_by';
255	255	}
256	256
257	257	$event->setAffectedUser($owner)
		@@ -287,13 +287,13 @@ discard block
		block discarded – undo
287	287	];
288	288
289	289	if ($owner === $event->getAuthor()) {
290		- $subject = Calendar::SUBJECT_SHARE_USER . '_you';
	290	+ $subject = Calendar::SUBJECT_SHARE_USER.'_you';
291	291	} else {
292	292	$event->setAffectedUser($event->getAuthor())
293		- ->setSubject(Calendar::SUBJECT_SHARE_USER . '_you', $parameters);
	293	+ ->setSubject(Calendar::SUBJECT_SHARE_USER.'_you', $parameters);
294	294	$this->activityManager->publish($event);
295	295
296		- $subject = Calendar::SUBJECT_SHARE_USER . '_by';
	296	+ $subject = Calendar::SUBJECT_SHARE_USER.'_by';
297	297	}
298	298
299	299	$event->setAffectedUser($owner)
		@@ -314,13 +314,13 @@ discard block
		block discarded – undo
314	314	];
315	315
316	316	if ($owner === $event->getAuthor()) {
317		- $subject = Calendar::SUBJECT_SHARE_GROUP . '_you';
	317	+ $subject = Calendar::SUBJECT_SHARE_GROUP.'_you';
318	318	} else {
319	319	$event->setAffectedUser($event->getAuthor())
320		- ->setSubject(Calendar::SUBJECT_SHARE_GROUP . '_you', $parameters);
	320	+ ->setSubject(Calendar::SUBJECT_SHARE_GROUP.'_you', $parameters);
321	321	$this->activityManager->publish($event);
322	322
323		- $subject = Calendar::SUBJECT_SHARE_GROUP . '_by';
	323	+ $subject = Calendar::SUBJECT_SHARE_GROUP.'_by';
324	324	}
325	325
326	326	$event->setAffectedUser($owner)
		@@ -419,7 +419,7 @@ discard block
		block discarded – undo
419	419
420	420	$classification = $objectData['classification'] ?? CalDavBackend::CLASSIFICATION_PUBLIC;
421	421	$object = $this->getObjectNameAndType($objectData);
422		- $action = $action . '_' . $object['type'];
	422	+ $action = $action.'_'.$object['type'];
423	423
424	424	if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'COMPLETED') {
425	425	$action .= '_completed';
		@@ -466,7 +466,7 @@ discard block
		block discarded – undo
466	466
467	467	$event->setAffectedUser($user)
468	468	->setSubject(
469		- $user === $currentUser ? $action . '_self' : $action,
	469	+ $user === $currentUser ? $action.'_self' : $action,
470	470	$params
471	471	);
472	472

nextcloud / server

Push — master ( a1c1b3...a1f329 )

Status

Category

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

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