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

Completed

Push — master ( 14f739...899b20 )

unknown

created 2025-06-01 13:35 UTC

Status

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

@@ -70,13 +70,13 @@  discard block
 block discarded – undo
 				$linkData = $eventData['link'];
 				$calendarUri = $this->urlencodeLowerHex($linkData['calendar_uri']);
 				if ($affectedUser === $linkData['owner']) {
-					$objectId = base64_encode($this->url->getWebroot() . '/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $calendarUri . '/' . $linkData['object_uri']);
+					$objectId = base64_encode($this->url->getWebroot().'/remote.php/dav/calendars/'.$linkData['owner'].'/'.$calendarUri.'/'.$linkData['object_uri']);
 				} else {
 					// Can't use the "real" owner and calendar names here because we create a custom
 					// calendar for incoming shares with the name "<calendar>_shared_by_<sharer>".
 					// Hack: Fix the link by generating it for the incoming shared calendar instead,
 					//       as seen from the affected user.
-					$objectId = base64_encode($this->url->getWebroot() . '/remote.php/dav/calendars/' . $affectedUser . '/' . $calendarUri . '_shared_by_' . $linkData['owner'] . '/' . $linkData['object_uri']);
+					$objectId = base64_encode($this->url->getWebroot().'/remote.php/dav/calendars/'.$affectedUser.'/'.$calendarUri.'_shared_by_'.$linkData['owner'].'/'.$linkData['object_uri']);
 				}
 				$params['link'] = $this->url->linkToRouteAbsolute('calendar.view.indexdirect.edit', [
 					'objectId' => $objectId,
@@ -109,29 +109,29 @@  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}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE . '_event') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE.'_event') {
 			$subject = $this->l->t('{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE . '_event_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE.'_event_self') {
 			$subject = $this->l->t('You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE_TO_TRASH.'_event') {
 			$subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE_TO_TRASH.'_event_self') {
 			$subject = $this->l->t('You deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE . '_event') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE.'_event') {
 			$subject = $this->l->t('{actor} restored event {event} of calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE . '_event_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE.'_event_self') {
 			$subject = $this->l->t('You restored event {event} of calendar {calendar}');
 		} else {
 			throw new UnknownActivityException();
@@ -156,21 +156,21 @@  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_MOVE_TO_TRASH . '_event':
-				case self::SUBJECT_OBJECT_RESTORE . '_event':
+				case self::SUBJECT_OBJECT_ADD.'_event':
+				case self::SUBJECT_OBJECT_DELETE.'_event':
+				case self::SUBJECT_OBJECT_UPDATE.'_event':
+				case self::SUBJECT_OBJECT_MOVE_TO_TRASH.'_event':
+				case self::SUBJECT_OBJECT_RESTORE.'_event':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'event' => $this->generateClassifiedObjectParameter($parameters['object'], $event->getAffectedUser()),
 					];
-				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_MOVE_TO_TRASH . '_event_self':
-				case self::SUBJECT_OBJECT_RESTORE . '_event_self':
+				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_MOVE_TO_TRASH.'_event_self':
+				case self::SUBJECT_OBJECT_RESTORE.'_event_self':
 					return [
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'event' => $this->generateClassifiedObjectParameter($parameters['object'], $event->getAffectedUser()),
@@ -180,14 +180,14 @@  discard block
 block discarded – undo
 
 		if (isset($parameters['sourceCalendar']) && isset($parameters['targetCalendar'])) {
 			switch ($subject) {
-				case self::SUBJECT_OBJECT_MOVE . '_event':
+				case self::SUBJECT_OBJECT_MOVE.'_event':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'sourceCalendar' => $this->generateCalendarParameter($parameters['sourceCalendar'], $this->l),
 						'targetCalendar' => $this->generateCalendarParameter($parameters['targetCalendar'], $this->l),
 						'event' => $this->generateClassifiedObjectParameter($parameters['object'], $event->getAffectedUser()),
 					];
-				case self::SUBJECT_OBJECT_MOVE . '_event_self':
+				case self::SUBJECT_OBJECT_MOVE.'_event_self':
 					return [
 						'sourceCalendar' => $this->generateCalendarParameter($parameters['sourceCalendar'], $this->l),
 						'targetCalendar' => $this->generateCalendarParameter($parameters['targetCalendar'], $this->l),
@@ -202,17 +202,17 @@  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($event->getObjectId(), $parameters[1]),
 					'event' => $this->generateObjectParameter($parameters[2], $event->getAffectedUser()),
 				];
-			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($event->getObjectId(), $parameters[1]),
 					'event' => $this->generateObjectParameter($parameters[2], $event->getAffectedUser()),

Please login to merge, or discard this patch.

apps/dav/tests/unit/CalDAV/Activity/Provider/EventTest.php 1 patch

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

@@ -75,7 +75,7 @@  discard block
 block discarded – undo
 		if ($link) {
 			$affectedUser = $link['owner'];
 			$generatedLink = [
-				'objectId' => base64_encode('/remote.php/dav/calendars/' . $link['owner'] . '/' . $link['calendar_uri'] . '/' . $link['object_uri']),
+				'objectId' => base64_encode('/remote.php/dav/calendars/'.$link['owner'].'/'.$link['calendar_uri'].'/'.$link['object_uri']),
 			];
 			$this->appManager->expects($this->once())
 				->method('isEnabledForUser')
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
 
 	public static function generateObjectParameterLinkEncodingDataProvider(): array {
 		return [
-			[ // Shared calendar
+			[// Shared calendar
 				[
 					'object_uri' => 'someuuid.ics',
 					'calendar_uri' => 'personal',
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
 				],
 				base64_encode('/remote.php/dav/calendars/sharee/personal_shared_by_sharer/someuuid.ics'),
 			],
-			[ // Shared calendar with umlauts
+			[// Shared calendar with umlauts
 				[
 					'object_uri' => 'someuuid.ics',
 					'calendar_uri' => 'umlaut_äüöß',
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
 				],
 				base64_encode('/remote.php/dav/calendars/sharee/umlaut_%c3%a4%c3%bc%c3%b6%c3%9f_shared_by_sharer/someuuid.ics'),
 			],
-			[ // Shared calendar with umlauts and mixed casing
+			[// Shared calendar with umlauts and mixed casing
 				[
 					'object_uri' => 'someuuid.ics',
 					'calendar_uri' => 'Umlaut_äüöß',
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
 				],
 				base64_encode('/remote.php/dav/calendars/sharee/Umlaut_%c3%a4%c3%bc%c3%b6%c3%9f_shared_by_sharer/someuuid.ics'),
 			],
-			[ // Owned calendar with umlauts
+			[// Owned calendar with umlauts
 				[
 					'object_uri' => 'someuuid.ics',
 					'calendar_uri' => 'umlaut_äüöß',
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
 				],
 				base64_encode('/remote.php/dav/calendars/sharee/umlaut_%c3%a4%c3%bc%c3%b6%c3%9f/someuuid.ics'),
 			],
-			[ // Owned calendar with umlauts and mixed casing
+			[// Owned calendar with umlauts and mixed casing
 				[
 					'object_uri' => 'someuuid.ics',
 					'calendar_uri' => 'Umlaut_äüöß',
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
 	/**
 	 * @dataProvider dataGenerateObjectParameterThrows
 	 */
-	public function testGenerateObjectParameterThrows(string|array $eventData, string $exception = InvalidArgumentException::class): void {
+	public function testGenerateObjectParameterThrows(string | array $eventData, string $exception = InvalidArgumentException::class): void {
 		$this->expectException($exception);
 
 		$this->invokePrivate($this->provider, 'generateObjectParameter', [$eventData, 'no_user']);

Please login to merge, or discard this patch.

		@@ -70,13 +70,13 @@ discard block
		block discarded – undo
70	70	$linkData = $eventData['link'];
71	71	$calendarUri = $this->urlencodeLowerHex($linkData['calendar_uri']);
72	72	if ($affectedUser === $linkData['owner']) {
73		- $objectId = base64_encode($this->url->getWebroot() . '/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $calendarUri . '/' . $linkData['object_uri']);
	73	+ $objectId = base64_encode($this->url->getWebroot().'/remote.php/dav/calendars/'.$linkData['owner'].'/'.$calendarUri.'/'.$linkData['object_uri']);
74	74	} else {
75	75	// Can't use the "real" owner and calendar names here because we create a custom
76	76	// calendar for incoming shares with the name "<calendar>_shared_by_<sharer>".
77	77	// Hack: Fix the link by generating it for the incoming shared calendar instead,
78	78	// as seen from the affected user.
79		- $objectId = base64_encode($this->url->getWebroot() . '/remote.php/dav/calendars/' . $affectedUser . '/' . $calendarUri . '_shared_by_' . $linkData['owner'] . '/' . $linkData['object_uri']);
	79	+ $objectId = base64_encode($this->url->getWebroot().'/remote.php/dav/calendars/'.$affectedUser.'/'.$calendarUri.'_shared_by_'.$linkData['owner'].'/'.$linkData['object_uri']);
80	80	}
81	81	$params['link'] = $this->url->linkToRouteAbsolute('calendar.view.indexdirect.edit', [
82	82	'objectId' => $objectId,
		@@ -109,29 +109,29 @@ discard block
		block discarded – undo
109	109	$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg')));
110	110	}
111	111
112		- if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
	112	+ if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_event') {
113	113	$subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
114		- } elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') {
	114	+ } elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_event_self') {
115	115	$subject = $this->l->t('You created event {event} in calendar {calendar}');
116		- } elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') {
	116	+ } elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_event') {
117	117	$subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
118		- } elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') {
	118	+ } elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_event_self') {
119	119	$subject = $this->l->t('You deleted event {event} from calendar {calendar}');
120		- } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') {
	120	+ } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_event') {
121	121	$subject = $this->l->t('{actor} updated event {event} in calendar {calendar}');
122		- } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event_self') {
	122	+ } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_event_self') {
123	123	$subject = $this->l->t('You updated event {event} in calendar {calendar}');
124		- } elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE . '_event') {
	124	+ } elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE.'_event') {
125	125	$subject = $this->l->t('{actor} moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}');
126		- } elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE . '_event_self') {
	126	+ } elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE.'_event_self') {
127	127	$subject = $this->l->t('You moved event {event} from calendar {sourceCalendar} to calendar {targetCalendar}');
128		- } elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event') {
	128	+ } elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE_TO_TRASH.'_event') {
129	129	$subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
130		- } elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event_self') {
	130	+ } elseif ($event->getSubject() === self::SUBJECT_OBJECT_MOVE_TO_TRASH.'_event_self') {
131	131	$subject = $this->l->t('You deleted event {event} from calendar {calendar}');
132		- } elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE . '_event') {
	132	+ } elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE.'_event') {
133	133	$subject = $this->l->t('{actor} restored event {event} of calendar {calendar}');
134		- } elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE . '_event_self') {
	134	+ } elseif ($event->getSubject() === self::SUBJECT_OBJECT_RESTORE.'_event_self') {
135	135	$subject = $this->l->t('You restored event {event} of calendar {calendar}');
136	136	} else {
137	137	throw new UnknownActivityException();
		@@ -156,21 +156,21 @@ discard block
		block discarded – undo
156	156	// Nextcloud 13+
157	157	if (isset($parameters['calendar'])) {
158	158	switch ($subject) {
159		- case self::SUBJECT_OBJECT_ADD . '_event':
160		- case self::SUBJECT_OBJECT_DELETE . '_event':
161		- case self::SUBJECT_OBJECT_UPDATE . '_event':
162		- case self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event':
163		- case self::SUBJECT_OBJECT_RESTORE . '_event':
	159	+ case self::SUBJECT_OBJECT_ADD.'_event':
	160	+ case self::SUBJECT_OBJECT_DELETE.'_event':
	161	+ case self::SUBJECT_OBJECT_UPDATE.'_event':
	162	+ case self::SUBJECT_OBJECT_MOVE_TO_TRASH.'_event':
	163	+ case self::SUBJECT_OBJECT_RESTORE.'_event':
164	164	return [
165	165	'actor' => $this->generateUserParameter($parameters['actor']),
166	166	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
167	167	'event' => $this->generateClassifiedObjectParameter($parameters['object'], $event->getAffectedUser()),
168	168	];
169		- case self::SUBJECT_OBJECT_ADD . '_event_self':
170		- case self::SUBJECT_OBJECT_DELETE . '_event_self':
171		- case self::SUBJECT_OBJECT_UPDATE . '_event_self':
172		- case self::SUBJECT_OBJECT_MOVE_TO_TRASH . '_event_self':
173		- case self::SUBJECT_OBJECT_RESTORE . '_event_self':
	169	+ case self::SUBJECT_OBJECT_ADD.'_event_self':
	170	+ case self::SUBJECT_OBJECT_DELETE.'_event_self':
	171	+ case self::SUBJECT_OBJECT_UPDATE.'_event_self':
	172	+ case self::SUBJECT_OBJECT_MOVE_TO_TRASH.'_event_self':
	173	+ case self::SUBJECT_OBJECT_RESTORE.'_event_self':
174	174	return [
175	175	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
176	176	'event' => $this->generateClassifiedObjectParameter($parameters['object'], $event->getAffectedUser()),
		@@ -180,14 +180,14 @@ discard block
		block discarded – undo
180	180
181	181	if (isset($parameters['sourceCalendar']) && isset($parameters['targetCalendar'])) {
182	182	switch ($subject) {
183		- case self::SUBJECT_OBJECT_MOVE . '_event':
	183	+ case self::SUBJECT_OBJECT_MOVE.'_event':
184	184	return [
185	185	'actor' => $this->generateUserParameter($parameters['actor']),
186	186	'sourceCalendar' => $this->generateCalendarParameter($parameters['sourceCalendar'], $this->l),
187	187	'targetCalendar' => $this->generateCalendarParameter($parameters['targetCalendar'], $this->l),
188	188	'event' => $this->generateClassifiedObjectParameter($parameters['object'], $event->getAffectedUser()),
189	189	];
190		- case self::SUBJECT_OBJECT_MOVE . '_event_self':
	190	+ case self::SUBJECT_OBJECT_MOVE.'_event_self':
191	191	return [
192	192	'sourceCalendar' => $this->generateCalendarParameter($parameters['sourceCalendar'], $this->l),
193	193	'targetCalendar' => $this->generateCalendarParameter($parameters['targetCalendar'], $this->l),
		@@ -202,17 +202,17 @@ discard block
		block discarded – undo
202	202	// Otherwise if people upgrade over multiple releases in a short period,
203	203	// they will get the dead entries in their stream.
204	204	switch ($subject) {
205		- case self::SUBJECT_OBJECT_ADD . '_event':
206		- case self::SUBJECT_OBJECT_DELETE . '_event':
207		- case self::SUBJECT_OBJECT_UPDATE . '_event':
	205	+ case self::SUBJECT_OBJECT_ADD.'_event':
	206	+ case self::SUBJECT_OBJECT_DELETE.'_event':
	207	+ case self::SUBJECT_OBJECT_UPDATE.'_event':
208	208	return [
209	209	'actor' => $this->generateUserParameter($parameters[0]),
210	210	'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
211	211	'event' => $this->generateObjectParameter($parameters[2], $event->getAffectedUser()),
212	212	];
213		- case self::SUBJECT_OBJECT_ADD . '_event_self':
214		- case self::SUBJECT_OBJECT_DELETE . '_event_self':
215		- case self::SUBJECT_OBJECT_UPDATE . '_event_self':
	213	+ case self::SUBJECT_OBJECT_ADD.'_event_self':
	214	+ case self::SUBJECT_OBJECT_DELETE.'_event_self':
	215	+ case self::SUBJECT_OBJECT_UPDATE.'_event_self':
216	216	return [
217	217	'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
218	218	'event' => $this->generateObjectParameter($parameters[2], $event->getAffectedUser()),

		@@ -75,7 +75,7 @@ discard block
		block discarded – undo
75	75	if ($link) {
76	76	$affectedUser = $link['owner'];
77	77	$generatedLink = [
78		- 'objectId' => base64_encode('/remote.php/dav/calendars/' . $link['owner'] . '/' . $link['calendar_uri'] . '/' . $link['object_uri']),
	78	+ 'objectId' => base64_encode('/remote.php/dav/calendars/'.$link['owner'].'/'.$link['calendar_uri'].'/'.$link['object_uri']),
79	79	];
80	80	$this->appManager->expects($this->once())
81	81	->method('isEnabledForUser')
		@@ -107,7 +107,7 @@ discard block
		block discarded – undo
107	107
108	108	public static function generateObjectParameterLinkEncodingDataProvider(): array {
109	109	return [
110		- [ // Shared calendar
	110	+ [// Shared calendar
111	111	[
112	112	'object_uri' => 'someuuid.ics',
113	113	'calendar_uri' => 'personal',
		@@ -115,7 +115,7 @@ discard block
		block discarded – undo
115	115	],
116	116	base64_encode('/remote.php/dav/calendars/sharee/personal_shared_by_sharer/someuuid.ics'),
117	117	],
118		- [ // Shared calendar with umlauts
	118	+ [// Shared calendar with umlauts
119	119	[
120	120	'object_uri' => 'someuuid.ics',
121	121	'calendar_uri' => 'umlaut_äüöß',
		@@ -123,7 +123,7 @@ discard block
		block discarded – undo
123	123	],
124	124	base64_encode('/remote.php/dav/calendars/sharee/umlaut_%c3%a4%c3%bc%c3%b6%c3%9f_shared_by_sharer/someuuid.ics'),
125	125	],
126		- [ // Shared calendar with umlauts and mixed casing
	126	+ [// Shared calendar with umlauts and mixed casing
127	127	[
128	128	'object_uri' => 'someuuid.ics',
129	129	'calendar_uri' => 'Umlaut_äüöß',
		@@ -131,7 +131,7 @@ discard block
		block discarded – undo
131	131	],
132	132	base64_encode('/remote.php/dav/calendars/sharee/Umlaut_%c3%a4%c3%bc%c3%b6%c3%9f_shared_by_sharer/someuuid.ics'),
133	133	],
134		- [ // Owned calendar with umlauts
	134	+ [// Owned calendar with umlauts
135	135	[
136	136	'object_uri' => 'someuuid.ics',
137	137	'calendar_uri' => 'umlaut_äüöß',
		@@ -139,7 +139,7 @@ discard block
		block discarded – undo
139	139	],
140	140	base64_encode('/remote.php/dav/calendars/sharee/umlaut_%c3%a4%c3%bc%c3%b6%c3%9f/someuuid.ics'),
141	141	],
142		- [ // Owned calendar with umlauts and mixed casing
	142	+ [// Owned calendar with umlauts and mixed casing
143	143	[
144	144	'object_uri' => 'someuuid.ics',
145	145	'calendar_uri' => 'Umlaut_äüöß',
		@@ -188,7 +188,7 @@ discard block
		block discarded – undo
188	188	/**
189	189	* @dataProvider dataGenerateObjectParameterThrows
190	190	*/
191		- public function testGenerateObjectParameterThrows(string\|array $eventData, string $exception = InvalidArgumentException::class): void {
	191	+ public function testGenerateObjectParameterThrows(string \| array $eventData, string $exception = InvalidArgumentException::class): void {
192	192	$this->expectException($exception);
193	193
194	194	$this->invokePrivate($this->provider, 'generateObjectParameter', [$eventData, 'no_user']);

nextcloud / server

Push — master ( 14f739...899b20 )

Status

Category

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

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