Inspection of "Correctly parse the subject parameters for link (u..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#10078)

by Joas

created 2018-07-02 12:00 UTC

Status

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

@@ -98,44 +98,44 @@  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_PUBLISH . '_self') {
+		} else if ($event->getSubject() === self::SUBJECT_PUBLISH.'_self') {
 			$subject = $this->l->t('You shared calendar {calendar} as public link');
-		} else if ($event->getSubject() === self::SUBJECT_UNPUBLISH . '_self') {
+		} else if ($event->getSubject() === self::SUBJECT_UNPUBLISH.'_self') {
 			$subject = $this->l->t('You removed public link for 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();
@@ -171,41 +171,41 @@  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_PUBLISH . '_self':
-				case self::SUBJECT_UNPUBLISH . '_self':
+				case self::SUBJECT_UPDATE.'_self':
+				case self::SUBJECT_PUBLISH.'_self':
+				case self::SUBJECT_UNPUBLISH.'_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),
@@ -221,44 +221,44 @@  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_PUBLISH . '_self':
-			case self::SUBJECT_UNPUBLISH . '_self':
+			case self::SUBJECT_UPDATE.'_self':
+			case self::SUBJECT_PUBLISH.'_self':
+			case self::SUBJECT_UNPUBLISH.'_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.

		@@ -98,44 +98,44 @@ discard block
		block discarded – undo
98	98
99	99	if ($event->getSubject() === self::SUBJECT_ADD) {
100	100	$subject = $this->l->t('{actor} created calendar {calendar}');
101		- } else if ($event->getSubject() === self::SUBJECT_ADD . '_self') {
	101	+ } else if ($event->getSubject() === self::SUBJECT_ADD.'_self') {
102	102	$subject = $this->l->t('You created calendar {calendar}');
103	103	} else if ($event->getSubject() === self::SUBJECT_DELETE) {
104	104	$subject = $this->l->t('{actor} deleted calendar {calendar}');
105		- } else if ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
	105	+ } else if ($event->getSubject() === self::SUBJECT_DELETE.'_self') {
106	106	$subject = $this->l->t('You deleted calendar {calendar}');
107	107	} else if ($event->getSubject() === self::SUBJECT_UPDATE) {
108	108	$subject = $this->l->t('{actor} updated calendar {calendar}');
109		- } else if ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
	109	+ } else if ($event->getSubject() === self::SUBJECT_UPDATE.'_self') {
110	110	$subject = $this->l->t('You updated calendar {calendar}');
111	111
112		- } else if ($event->getSubject() === self::SUBJECT_PUBLISH . '_self') {
	112	+ } else if ($event->getSubject() === self::SUBJECT_PUBLISH.'_self') {
113	113	$subject = $this->l->t('You shared calendar {calendar} as public link');
114		- } else if ($event->getSubject() === self::SUBJECT_UNPUBLISH . '_self') {
	114	+ } else if ($event->getSubject() === self::SUBJECT_UNPUBLISH.'_self') {
115	115	$subject = $this->l->t('You removed public link for calendar {calendar}');
116	116
117	117	} else if ($event->getSubject() === self::SUBJECT_SHARE_USER) {
118	118	$subject = $this->l->t('{actor} shared calendar {calendar} with you');
119		- } else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
	119	+ } else if ($event->getSubject() === self::SUBJECT_SHARE_USER.'_you') {
120	120	$subject = $this->l->t('You shared calendar {calendar} with {user}');
121		- } else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
	121	+ } else if ($event->getSubject() === self::SUBJECT_SHARE_USER.'_by') {
122	122	$subject = $this->l->t('{actor} shared calendar {calendar} with {user}');
123	123	} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
124	124	$subject = $this->l->t('{actor} unshared calendar {calendar} from you');
125		- } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
	125	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_you') {
126	126	$subject = $this->l->t('You unshared calendar {calendar} from {user}');
127		- } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
	127	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_by') {
128	128	$subject = $this->l->t('{actor} unshared calendar {calendar} from {user}');
129		- } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
	129	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_self') {
130	130	$subject = $this->l->t('{actor} unshared calendar {calendar} from themselves');
131	131
132		- } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
	132	+ } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_you') {
133	133	$subject = $this->l->t('You shared calendar {calendar} with group {group}');
134		- } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
	134	+ } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_by') {
135	135	$subject = $this->l->t('{actor} shared calendar {calendar} with group {group}');
136		- } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
	136	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_you') {
137	137	$subject = $this->l->t('You unshared calendar {calendar} from group {group}');
138		- } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
	138	+ } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_by') {
139	139	$subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}');
140	140	} else {
141	141	throw new \InvalidArgumentException();
		@@ -171,41 +171,41 @@ discard block
		block discarded – undo
171	171	if (isset($parameters['calendar'])) {
172	172	switch ($subject) {
173	173	case self::SUBJECT_ADD:
174		- case self::SUBJECT_ADD . '_self':
	174	+ case self::SUBJECT_ADD.'_self':
175	175	case self::SUBJECT_DELETE:
176		- case self::SUBJECT_DELETE . '_self':
	176	+ case self::SUBJECT_DELETE.'_self':
177	177	case self::SUBJECT_UPDATE:
178		- case self::SUBJECT_UPDATE . '_self':
179		- case self::SUBJECT_PUBLISH . '_self':
180		- case self::SUBJECT_UNPUBLISH . '_self':
	178	+ case self::SUBJECT_UPDATE.'_self':
	179	+ case self::SUBJECT_PUBLISH.'_self':
	180	+ case self::SUBJECT_UNPUBLISH.'_self':
181	181	case self::SUBJECT_SHARE_USER:
182	182	case self::SUBJECT_UNSHARE_USER:
183		- case self::SUBJECT_UNSHARE_USER . '_self':
	183	+ case self::SUBJECT_UNSHARE_USER.'_self':
184	184	return [
185	185	'actor' => $this->generateUserParameter($parameters['actor']),
186	186	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
187	187	];
188		- case self::SUBJECT_SHARE_USER . '_you':
189		- case self::SUBJECT_UNSHARE_USER . '_you':
	188	+ case self::SUBJECT_SHARE_USER.'_you':
	189	+ case self::SUBJECT_UNSHARE_USER.'_you':
190	190	return [
191	191	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
192	192	'user' => $this->generateUserParameter($parameters['user']),
193	193	];
194		- case self::SUBJECT_SHARE_USER . '_by':
195		- case self::SUBJECT_UNSHARE_USER . '_by':
	194	+ case self::SUBJECT_SHARE_USER.'_by':
	195	+ case self::SUBJECT_UNSHARE_USER.'_by':
196	196	return [
197	197	'actor' => $this->generateUserParameter($parameters['actor']),
198	198	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
199	199	'user' => $this->generateUserParameter($parameters['user']),
200	200	];
201		- case self::SUBJECT_SHARE_GROUP . '_you':
202		- case self::SUBJECT_UNSHARE_GROUP . '_you':
	201	+ case self::SUBJECT_SHARE_GROUP.'_you':
	202	+ case self::SUBJECT_UNSHARE_GROUP.'_you':
203	203	return [
204	204	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
205	205	'group' => $this->generateGroupParameter($parameters['group']),
206	206	];
207		- case self::SUBJECT_SHARE_GROUP . '_by':
208		- case self::SUBJECT_UNSHARE_GROUP . '_by':
	207	+ case self::SUBJECT_SHARE_GROUP.'_by':
	208	+ case self::SUBJECT_UNSHARE_GROUP.'_by':
209	209	return [
210	210	'actor' => $this->generateUserParameter($parameters['actor']),
211	211	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
		@@ -221,44 +221,44 @@ discard block
		block discarded – undo
221	221	// they will get the dead entries in their stream.
222	222	switch ($subject) {
223	223	case self::SUBJECT_ADD:
224		- case self::SUBJECT_ADD . '_self':
	224	+ case self::SUBJECT_ADD.'_self':
225	225	case self::SUBJECT_DELETE:
226		- case self::SUBJECT_DELETE . '_self':
	226	+ case self::SUBJECT_DELETE.'_self':
227	227	case self::SUBJECT_UPDATE:
228		- case self::SUBJECT_UPDATE . '_self':
229		- case self::SUBJECT_PUBLISH . '_self':
230		- case self::SUBJECT_UNPUBLISH . '_self':
	228	+ case self::SUBJECT_UPDATE.'_self':
	229	+ case self::SUBJECT_PUBLISH.'_self':
	230	+ case self::SUBJECT_UNPUBLISH.'_self':
231	231	case self::SUBJECT_SHARE_USER:
232	232	case self::SUBJECT_UNSHARE_USER:
233		- case self::SUBJECT_UNSHARE_USER . '_self':
	233	+ case self::SUBJECT_UNSHARE_USER.'_self':
234	234	return [
235	235	'actor' => $this->generateUserParameter($parameters[0]),
236		- 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
	236	+ 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
237	237	];
238		- case self::SUBJECT_SHARE_USER . '_you':
239		- case self::SUBJECT_UNSHARE_USER . '_you':
	238	+ case self::SUBJECT_SHARE_USER.'_you':
	239	+ case self::SUBJECT_UNSHARE_USER.'_you':
240	240	return [
241	241	'user' => $this->generateUserParameter($parameters[0]),
242		- 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
	242	+ 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
243	243	];
244		- case self::SUBJECT_SHARE_USER . '_by':
245		- case self::SUBJECT_UNSHARE_USER . '_by':
	244	+ case self::SUBJECT_SHARE_USER.'_by':
	245	+ case self::SUBJECT_UNSHARE_USER.'_by':
246	246	return [
247	247	'user' => $this->generateUserParameter($parameters[0]),
248		- 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
	248	+ 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
249	249	'actor' => $this->generateUserParameter($parameters[2]),
250	250	];
251		- case self::SUBJECT_SHARE_GROUP . '_you':
252		- case self::SUBJECT_UNSHARE_GROUP . '_you':
	251	+ case self::SUBJECT_SHARE_GROUP.'_you':
	252	+ case self::SUBJECT_UNSHARE_GROUP.'_you':
253	253	return [
254	254	'group' => $this->generateGroupParameter($parameters[0]),
255		- 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
	255	+ 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
256	256	];
257		- case self::SUBJECT_SHARE_GROUP . '_by':
258		- case self::SUBJECT_UNSHARE_GROUP . '_by':
	257	+ case self::SUBJECT_SHARE_GROUP.'_by':
	258	+ case self::SUBJECT_UNSHARE_GROUP.'_by':
259	259	return [
260	260	'group' => $this->generateGroupParameter($parameters[0]),
261		- 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
	261	+ 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
262	262	'actor' => $this->generateUserParameter($parameters[2]),
263	263	];
264	264	}

nextcloud / server

Pull Request — master (#10078)

Status

Category

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