View GitHub Repository server

Schedule Inspection
Subscribe
Completed
Push — stable13 ( 9d3a4b...5f029e )
by Morris
105:36 queued 79:13
created
Status
Category
Toggle Patches
lib/private/Remote/Api/ApiBase.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -60,7 +60,7 @@  discard block
 
 block discarded – undo
60 60 
 	 * @throws \InvalidArgumentException
61 61 
 	 */
62 62 
 	protected function request($method, $url, array $body = [], array $query = [], array $headers = []) {
63 
-		$fullUrl = trim($this->instance->getFullUrl(), '/') . '/' . $url;
63 
+		$fullUrl = trim($this->instance->getFullUrl(), '/').'/'.$url;
64 64 
 		$options = [
65 65 
 			'query' => $query,
66 66 
 			'headers' => $this->addDefaultHeaders($headers),
 
@@ -89,7 +89,7 @@  discard block
 
 block discarded – undo
89 89 
 				$response = $client->options($fullUrl, $options);
90 90 
 				break;
91 91 
 			default:
92 
-				throw new \InvalidArgumentException('Invalid method ' . $method);
92 
+				throw new \InvalidArgumentException('Invalid method '.$method);
93 93 
 		}
94 94
95 95 
 		return $response->getBody();
Please login to merge, or discard this patch.
apps/dav/lib/CalDAV/BirthdayCalendar/EnablePlugin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -78,7 +78,7 @@
 
 block discarded – undo
78 78 
 	 *
79 79 
 	 * @return string
80 80 
 	 */
81 
-	public function getPluginName()	{
81 
+	public function getPluginName() {
82 82 
 		return 'nc-enable-birthday-calendar';
83 83 
 	}
84 84
Please login to merge, or discard this patch.
lib/private/Remote/Api/OCS.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -43,7 +43,7 @@  discard block
 
 block discarded – undo
43 43 
 	 */
44 44 
 	protected function request($method, $url, array $body = [], array $query = [], array $headers = []) {
45 45 
 		try {
46 
-			$response = json_decode(parent::request($method, 'ocs/v2.php/' . $url, $body, $query, $headers), true);
46 
+			$response = json_decode(parent::request($method, 'ocs/v2.php/'.$url, $body, $query, $headers), true);
47 47 
 		} catch (ClientException $e) {
48 48 
 			if ($e->getResponse()->getStatusCode() === 404) {
49 49 
 				throw new NotFoundException();
 
@@ -63,7 +63,7 @@  discard block
 
 block discarded – undo
63 63 
 			throw new NotFoundException();
64 64 
 		}
65 65 
 		if ($response['ocs']['meta']['status'] !== 'ok') {
66 
-			throw new \Exception('Unknown ocs error ' . $response['ocs']['meta']['message']);
66 
+			throw new \Exception('Unknown ocs error '.$response['ocs']['meta']['message']);
67 67 
 		}
68 68
69 69 
 		return $response['ocs']['data'];
 
@@ -78,13 +78,13 @@  discard block
 
 block discarded – undo
78 78 
 	private function checkResponseArray(array $data, $type, array $keys) {
79 79 
 		foreach ($keys as $key) {
80 80 
 			if (!array_key_exists($key, $data)) {
81 
-				throw new \Exception('Invalid ' . $type . ' response, expected field ' . $key . ' not found');
81 
+				throw new \Exception('Invalid '.$type.' response, expected field '.$key.' not found');
82 82 
 			}
83 83 
 		}
84 84 
 	}
85 85
86 86 
 	public function getUser($userId) {
87 
-		$result = $this->request('get', 'cloud/users/' . $userId);
87 
+		$result = $this->request('get', 'cloud/users/'.$userId);
88 88 
 		$this->checkResponseArray($result, 'user', User::EXPECTED_KEYS);
89 89 
 		return new User($result);
90 90 
 	}
Please login to merge, or discard this patch.
apps/dav/lib/Command/SyncBirthdayCalendar.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -109,7 +109,7 @@
 
 block discarded – undo
109 109 
 		$output->writeln('');
110 110 
 	}
111 111
112 
-	protected function verifyEnabled () {
112 
+	protected function verifyEnabled() {
113 113 
 		$isEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
114 114
115 115 
 		if ($isEnabled !== 'yes') {
Please login to merge, or discard this patch.
apps/dav/lib/CalDAV/CalendarObject.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -72,19 +72,19 @@  discard block
 
 block discarded – undo
72 72 
 	private static function createConfidentialObject(Component\VCalendar $vObject) {
73 73 
 		/** @var Component $vElement */
74 74 
 		$vElement = null;
75 
-		if(isset($vObject->VEVENT)) {
75 
+		if (isset($vObject->VEVENT)) {
76 76 
 			$vElement = $vObject->VEVENT;
77 77 
 		}
78 
-		if(isset($vObject->VJOURNAL)) {
78 
+		if (isset($vObject->VJOURNAL)) {
79 79 
 			$vElement = $vObject->VJOURNAL;
80 80 
 		}
81 
-		if(isset($vObject->VTODO)) {
81 
+		if (isset($vObject->VTODO)) {
82 82 
 			$vElement = $vObject->VTODO;
83 83 
 		}
84 
-		if(!is_null($vElement)) {
84 
+		if (!is_null($vElement)) {
85 85 
 			foreach ($vElement->children() as &$property) {
86 86 
 				/** @var Property $property */
87 
-				switch($property->name) {
87 
+				switch ($property->name) {
88 88 
 					case 'CREATED':
89 89 
 					case 'DTSTART':
90 90 
 					case 'RRULE':
 
@@ -112,7 +112,7 @@  discard block
 
 block discarded – undo
112 112 
 	private function removeVAlarms(Component\VCalendar $vObject) {
113 113 
 		$subcomponents = $vObject->getComponents();
114 114
115 
-		foreach($subcomponents as $subcomponent) {
115 
+		foreach ($subcomponents as $subcomponent) {
116 116 
 			unset($subcomponent->VALARM);
117 117 
 		}
118 118 
 	}
Please login to merge, or discard this patch.
apps/files_sharing/composer/composer/autoload_classmap.php 1 patch
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch 
@@ -6,52 +6,52 @@
 
 block discarded – undo
6 6 
 $baseDir = $vendorDir;
7 7
8 8 
 return array(
9 
-    'OCA\\Files_Sharing\\Activity\\Filter' => $baseDir . '/../lib/Activity/Filter.php',
10 
-    'OCA\\Files_Sharing\\Activity\\Providers\\Base' => $baseDir . '/../lib/Activity/Providers/Base.php',
11 
-    'OCA\\Files_Sharing\\Activity\\Providers\\Downloads' => $baseDir . '/../lib/Activity/Providers/Downloads.php',
12 
-    'OCA\\Files_Sharing\\Activity\\Providers\\Groups' => $baseDir . '/../lib/Activity/Providers/Groups.php',
13 
-    'OCA\\Files_Sharing\\Activity\\Providers\\PublicLinks' => $baseDir . '/../lib/Activity/Providers/PublicLinks.php',
14 
-    'OCA\\Files_Sharing\\Activity\\Providers\\RemoteShares' => $baseDir . '/../lib/Activity/Providers/RemoteShares.php',
15 
-    'OCA\\Files_Sharing\\Activity\\Providers\\Users' => $baseDir . '/../lib/Activity/Providers/Users.php',
16 
-    'OCA\\Files_Sharing\\Activity\\Settings\\PublicLinks' => $baseDir . '/../lib/Activity/Settings/PublicLinks.php',
17 
-    'OCA\\Files_Sharing\\Activity\\Settings\\RemoteShare' => $baseDir . '/../lib/Activity/Settings/RemoteShare.php',
18 
-    'OCA\\Files_Sharing\\Activity\\Settings\\Shared' => $baseDir . '/../lib/Activity/Settings/Shared.php',
19 
-    'OCA\\Files_Sharing\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
20 
-    'OCA\\Files_Sharing\\Cache' => $baseDir . '/../lib/Cache.php',
21 
-    'OCA\\Files_Sharing\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
22 
-    'OCA\\Files_Sharing\\Collaboration\\ShareRecipientSorter' => $baseDir . '/../lib/Collaboration/ShareRecipientSorter.php',
23 
-    'OCA\\Files_Sharing\\Command\\CleanupRemoteStorages' => $baseDir . '/../lib/Command/CleanupRemoteStorages.php',
24 
-    'OCA\\Files_Sharing\\Controller\\ExternalSharesController' => $baseDir . '/../lib/Controller/ExternalSharesController.php',
25 
-    'OCA\\Files_Sharing\\Controller\\PublicPreviewController' => $baseDir . '/../lib/Controller/PublicPreviewController.php',
26 
-    'OCA\\Files_Sharing\\Controller\\RemoteController' => $baseDir . '/../lib/Controller/RemoteController.php',
27 
-    'OCA\\Files_Sharing\\Controller\\ShareAPIController' => $baseDir . '/../lib/Controller/ShareAPIController.php',
28 
-    'OCA\\Files_Sharing\\Controller\\ShareController' => $baseDir . '/../lib/Controller/ShareController.php',
29 
-    'OCA\\Files_Sharing\\Controller\\ShareInfoController' => $baseDir . '/../lib/Controller/ShareInfoController.php',
30 
-    'OCA\\Files_Sharing\\Controller\\ShareesAPIController' => $baseDir . '/../lib/Controller/ShareesAPIController.php',
31 
-    'OCA\\Files_Sharing\\DeleteOrphanedSharesJob' => $baseDir . '/../lib/DeleteOrphanedSharesJob.php',
32 
-    'OCA\\Files_Sharing\\Exceptions\\BrokenPath' => $baseDir . '/../lib/Exceptions/BrokenPath.php',
33 
-    'OCA\\Files_Sharing\\Exceptions\\S2SException' => $baseDir . '/../lib/Exceptions/S2SException.php',
34 
-    'OCA\\Files_Sharing\\ExpireSharesJob' => $baseDir . '/../lib/ExpireSharesJob.php',
35 
-    'OCA\\Files_Sharing\\External\\Cache' => $baseDir . '/../lib/External/Cache.php',
36 
-    'OCA\\Files_Sharing\\External\\Manager' => $baseDir . '/../lib/External/Manager.php',
37 
-    'OCA\\Files_Sharing\\External\\Mount' => $baseDir . '/../lib/External/Mount.php',
38 
-    'OCA\\Files_Sharing\\External\\MountProvider' => $baseDir . '/../lib/External/MountProvider.php',
39 
-    'OCA\\Files_Sharing\\External\\Scanner' => $baseDir . '/../lib/External/Scanner.php',
40 
-    'OCA\\Files_Sharing\\External\\Storage' => $baseDir . '/../lib/External/Storage.php',
41 
-    'OCA\\Files_Sharing\\External\\Watcher' => $baseDir . '/../lib/External/Watcher.php',
42 
-    'OCA\\Files_Sharing\\Helper' => $baseDir . '/../lib/Helper.php',
43 
-    'OCA\\Files_Sharing\\Hooks' => $baseDir . '/../lib/Hooks.php',
44 
-    'OCA\\Files_Sharing\\ISharedStorage' => $baseDir . '/../lib/ISharedStorage.php',
45 
-    'OCA\\Files_Sharing\\Middleware\\OCSShareAPIMiddleware' => $baseDir . '/../lib/Middleware/OCSShareAPIMiddleware.php',
46 
-    'OCA\\Files_Sharing\\Middleware\\ShareInfoMiddleware' => $baseDir . '/../lib/Middleware/ShareInfoMiddleware.php',
47 
-    'OCA\\Files_Sharing\\Middleware\\SharingCheckMiddleware' => $baseDir . '/../lib/Middleware/SharingCheckMiddleware.php',
48 
-    'OCA\\Files_Sharing\\Migration\\OwncloudGuestShareType' => $baseDir . '/../lib/Migration/OwncloudGuestShareType.php',
49 
-    'OCA\\Files_Sharing\\Migration\\SetPasswordColumn' => $baseDir . '/../lib/Migration/SetPasswordColumn.php',
50 
-    'OCA\\Files_Sharing\\MountProvider' => $baseDir . '/../lib/MountProvider.php',
51 
-    'OCA\\Files_Sharing\\Scanner' => $baseDir . '/../lib/Scanner.php',
52 
-    'OCA\\Files_Sharing\\ShareBackend\\File' => $baseDir . '/../lib/ShareBackend/File.php',
53 
-    'OCA\\Files_Sharing\\ShareBackend\\Folder' => $baseDir . '/../lib/ShareBackend/Folder.php',
54 
-    'OCA\\Files_Sharing\\SharedMount' => $baseDir . '/../lib/SharedMount.php',
55 
-    'OCA\\Files_Sharing\\SharedStorage' => $baseDir . '/../lib/SharedStorage.php',
56 
-    'OCA\\Files_Sharing\\Updater' => $baseDir . '/../lib/Updater.php',
9 
+    'OCA\\Files_Sharing\\Activity\\Filter' => $baseDir.'/../lib/Activity/Filter.php',
10 
+    'OCA\\Files_Sharing\\Activity\\Providers\\Base' => $baseDir.'/../lib/Activity/Providers/Base.php',
11 
+    'OCA\\Files_Sharing\\Activity\\Providers\\Downloads' => $baseDir.'/../lib/Activity/Providers/Downloads.php',
12 
+    'OCA\\Files_Sharing\\Activity\\Providers\\Groups' => $baseDir.'/../lib/Activity/Providers/Groups.php',
13 
+    'OCA\\Files_Sharing\\Activity\\Providers\\PublicLinks' => $baseDir.'/../lib/Activity/Providers/PublicLinks.php',
14 
+    'OCA\\Files_Sharing\\Activity\\Providers\\RemoteShares' => $baseDir.'/../lib/Activity/Providers/RemoteShares.php',
15 
+    'OCA\\Files_Sharing\\Activity\\Providers\\Users' => $baseDir.'/../lib/Activity/Providers/Users.php',
16 
+    'OCA\\Files_Sharing\\Activity\\Settings\\PublicLinks' => $baseDir.'/../lib/Activity/Settings/PublicLinks.php',
17 
+    'OCA\\Files_Sharing\\Activity\\Settings\\RemoteShare' => $baseDir.'/../lib/Activity/Settings/RemoteShare.php',
18 
+    'OCA\\Files_Sharing\\Activity\\Settings\\Shared' => $baseDir.'/../lib/Activity/Settings/Shared.php',
19 
+    'OCA\\Files_Sharing\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
20 
+    'OCA\\Files_Sharing\\Cache' => $baseDir.'/../lib/Cache.php',
21 
+    'OCA\\Files_Sharing\\Capabilities' => $baseDir.'/../lib/Capabilities.php',
22 
+    'OCA\\Files_Sharing\\Collaboration\\ShareRecipientSorter' => $baseDir.'/../lib/Collaboration/ShareRecipientSorter.php',
23 
+    'OCA\\Files_Sharing\\Command\\CleanupRemoteStorages' => $baseDir.'/../lib/Command/CleanupRemoteStorages.php',
24 
+    'OCA\\Files_Sharing\\Controller\\ExternalSharesController' => $baseDir.'/../lib/Controller/ExternalSharesController.php',
25 
+    'OCA\\Files_Sharing\\Controller\\PublicPreviewController' => $baseDir.'/../lib/Controller/PublicPreviewController.php',
26 
+    'OCA\\Files_Sharing\\Controller\\RemoteController' => $baseDir.'/../lib/Controller/RemoteController.php',
27 
+    'OCA\\Files_Sharing\\Controller\\ShareAPIController' => $baseDir.'/../lib/Controller/ShareAPIController.php',
28 
+    'OCA\\Files_Sharing\\Controller\\ShareController' => $baseDir.'/../lib/Controller/ShareController.php',
29 
+    'OCA\\Files_Sharing\\Controller\\ShareInfoController' => $baseDir.'/../lib/Controller/ShareInfoController.php',
30 
+    'OCA\\Files_Sharing\\Controller\\ShareesAPIController' => $baseDir.'/../lib/Controller/ShareesAPIController.php',
31 
+    'OCA\\Files_Sharing\\DeleteOrphanedSharesJob' => $baseDir.'/../lib/DeleteOrphanedSharesJob.php',
32 
+    'OCA\\Files_Sharing\\Exceptions\\BrokenPath' => $baseDir.'/../lib/Exceptions/BrokenPath.php',
33 
+    'OCA\\Files_Sharing\\Exceptions\\S2SException' => $baseDir.'/../lib/Exceptions/S2SException.php',
34 
+    'OCA\\Files_Sharing\\ExpireSharesJob' => $baseDir.'/../lib/ExpireSharesJob.php',
35 
+    'OCA\\Files_Sharing\\External\\Cache' => $baseDir.'/../lib/External/Cache.php',
36 
+    'OCA\\Files_Sharing\\External\\Manager' => $baseDir.'/../lib/External/Manager.php',
37 
+    'OCA\\Files_Sharing\\External\\Mount' => $baseDir.'/../lib/External/Mount.php',
38 
+    'OCA\\Files_Sharing\\External\\MountProvider' => $baseDir.'/../lib/External/MountProvider.php',
39 
+    'OCA\\Files_Sharing\\External\\Scanner' => $baseDir.'/../lib/External/Scanner.php',
40 
+    'OCA\\Files_Sharing\\External\\Storage' => $baseDir.'/../lib/External/Storage.php',
41 
+    'OCA\\Files_Sharing\\External\\Watcher' => $baseDir.'/../lib/External/Watcher.php',
42 
+    'OCA\\Files_Sharing\\Helper' => $baseDir.'/../lib/Helper.php',
43 
+    'OCA\\Files_Sharing\\Hooks' => $baseDir.'/../lib/Hooks.php',
44 
+    'OCA\\Files_Sharing\\ISharedStorage' => $baseDir.'/../lib/ISharedStorage.php',
45 
+    'OCA\\Files_Sharing\\Middleware\\OCSShareAPIMiddleware' => $baseDir.'/../lib/Middleware/OCSShareAPIMiddleware.php',
46 
+    'OCA\\Files_Sharing\\Middleware\\ShareInfoMiddleware' => $baseDir.'/../lib/Middleware/ShareInfoMiddleware.php',
47 
+    'OCA\\Files_Sharing\\Middleware\\SharingCheckMiddleware' => $baseDir.'/../lib/Middleware/SharingCheckMiddleware.php',
48 
+    'OCA\\Files_Sharing\\Migration\\OwncloudGuestShareType' => $baseDir.'/../lib/Migration/OwncloudGuestShareType.php',
49 
+    'OCA\\Files_Sharing\\Migration\\SetPasswordColumn' => $baseDir.'/../lib/Migration/SetPasswordColumn.php',
50 
+    'OCA\\Files_Sharing\\MountProvider' => $baseDir.'/../lib/MountProvider.php',
51 
+    'OCA\\Files_Sharing\\Scanner' => $baseDir.'/../lib/Scanner.php',
52 
+    'OCA\\Files_Sharing\\ShareBackend\\File' => $baseDir.'/../lib/ShareBackend/File.php',
53 
+    'OCA\\Files_Sharing\\ShareBackend\\Folder' => $baseDir.'/../lib/ShareBackend/Folder.php',
54 
+    'OCA\\Files_Sharing\\SharedMount' => $baseDir.'/../lib/SharedMount.php',
55 
+    'OCA\\Files_Sharing\\SharedStorage' => $baseDir.'/../lib/SharedStorage.php',
56 
+    'OCA\\Files_Sharing\\Updater' => $baseDir.'/../lib/Updater.php',
57 57 
 );
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
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 
 		}
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
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 
 		}
Please login to merge, or discard this patch.
apps/admin_audit/composer/autoload.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -2,6 +2,6 @@
 
 block discarded – undo
2 2
3 3 
 // autoload.php @generated by Composer
4 4
5 
-require_once __DIR__ . '/composer/autoload_real.php';
5 
+require_once __DIR__.'/composer/autoload_real.php';
6 6
7 7 
 return ComposerAutoloaderInitAdminAudit::getLoader();
Please login to merge, or discard this patch.