Completed
Pull Request — master (#9895)
by Björn
168:09 queued 150:46
created
apps/cloud_federation_api/lib/Controller/RequestHandlerController.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -247,8 +247,7 @@
 block discarded – undo
247 247
 			return new JSONResponse($e->getReturnMessage(), Http::STATUS_BAD_REQUEST);
248 248
 		} catch (AuthenticationFailedException $e) {
249 249
 			return new JSONResponse(["message" => "RESOURCE_NOT_FOUND"], Http::STATUS_FORBIDDEN);
250
-		}
251
-		catch (\Exception $e) {
250
+		} catch (\Exception $e) {
252 251
 			return new JSONResponse(
253 252
 				['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()],
254 253
 				Http::STATUS_BAD_REQUEST
Please login to merge, or discard this patch.
apps/federatedfilesharing/lib/Controller/RequestHandlerController.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -450,7 +450,7 @@
 block discarded – undo
450 450
 	/**
451 451
 	 * translate Nextcloud permissions to OCM Permissions
452 452
 	 *
453
-	 * @param $ncPermissions
453
+	 * @param integer $ncPermissions
454 454
 	 * @return array
455 455
 	 */
456 456
 	protected function ncPermissions2ocmPermissions($ncPermissions) {
Please login to merge, or discard this patch.
apps/files_sharing/lib/External/Storage.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -407,7 +407,7 @@
 block discarded – undo
407 407
 	/**
408 408
 	 * calculate default permissions in case no permissions are provided
409 409
 	 *
410
-	 * @param $path
410
+	 * @param string $path
411 411
 	 * @return int
412 412
 	 */
413 413
 	protected function getDefaultPermissions($path) {
Please login to merge, or discard this patch.
apps/dav/lib/Connector/Sabre/FilesPlugin.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -450,7 +450,7 @@
 block discarded – undo
450 450
 	/**
451 451
 	 * translate Nextcloud permissions to OCM Permissions
452 452
 	 *
453
-	 * @param $ncPermissions
453
+	 * @param integer $ncPermissions
454 454
 	 * @return array
455 455
 	 */
456 456
 	protected function ncPermissions2ocmPermissions($ncPermissions) {
Please login to merge, or discard this patch.
apps/federatedfilesharing/templates/settings-admin.php 1 patch
Braces   +24 added lines, -6 removed lines patch added patch discarded remove patch
@@ -18,14 +18,20 @@  discard block
 block discarded – undo
18 18
 
19 19
 	<p>
20 20
 		<input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" class="checkbox"
21
-			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
21
+			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) {
22
+    print_unescaped('checked="checked"');
23
+}
24
+?> />
22 25
 		<label for="outgoingServer2serverShareEnabled">
23 26
 			<?php p($l->t('Allow users on this server to send shares to other servers'));?>
24 27
 		</label>
25 28
 	</p>
26 29
 	<p>
27 30
 		<input type="checkbox" name="incoming_server2server_share_enabled" id="incomingServer2serverShareEnabled" class="checkbox"
28
-			   value="1" <?php if ($_['incomingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
31
+			   value="1" <?php if ($_['incomingServer2serverShareEnabled']) {
32
+    print_unescaped('checked="checked"');
33
+}
34
+?> />
29 35
 		<label for="incomingServer2serverShareEnabled">
30 36
 			<?php p($l->t('Allow users on this server to receive shares from other servers'));?>
31 37
 		</label><br/>
@@ -33,14 +39,20 @@  discard block
 block discarded – undo
33 39
 	<?php if($_['federatedGroupSharingSupported']): ?>
34 40
 	<p>
35 41
 		<input type="checkbox" name="outgoing_server2server_group_share_enabled" id="outgoingServer2serverGroupShareEnabled" class="checkbox"
36
-			   value="1" <?php if ($_['outgoingServer2serverGroupShareEnabled']) print_unescaped('checked="checked"'); ?> />
42
+			   value="1" <?php if ($_['outgoingServer2serverGroupShareEnabled']) {
43
+    print_unescaped('checked="checked"');
44
+}
45
+?> />
37 46
 		<label for="outgoingServer2serverGroupShareEnabled">
38 47
 			<?php p($l->t('Allow users on this server to send shares to groups on other servers'));?>
39 48
 		</label>
40 49
 	</p>
41 50
 	<p>
42 51
 		<input type="checkbox" name="incoming_server2server_group_share_enabled" id="incomingServer2serverGroupShareEnabled" class="checkbox"
43
-			   value="1" <?php if ($_['incomingServer2serverGroupShareEnabled']) print_unescaped('checked="checked"'); ?> />
52
+			   value="1" <?php if ($_['incomingServer2serverGroupShareEnabled']) {
53
+    print_unescaped('checked="checked"');
54
+}
55
+?> />
44 56
 		<label for="incomingServer2serverGroupShareEnabled">
45 57
 			<?php p($l->t('Allow users on this server to receive group shares from other servers'));?>
46 58
 		</label><br/>
@@ -48,14 +60,20 @@  discard block
 block discarded – undo
48 60
 	<?php endif; ?>
49 61
 	<p>
50 62
 		<input type="checkbox" name="lookupServerEnabled" id="lookupServerEnabled" class="checkbox"
51
-			   value="1" <?php if ($_['lookupServerEnabled']) print_unescaped('checked="checked"'); ?> />
63
+			   value="1" <?php if ($_['lookupServerEnabled']) {
64
+    print_unescaped('checked="checked"');
65
+}
66
+?> />
52 67
 		<label for="lookupServerEnabled">
53 68
 			<?php p($l->t('Search global and public address book for users'));?>
54 69
 		</label><br/>
55 70
 	</p>
56 71
 	<p>
57 72
 		<input type="checkbox" name="lookupServerUploadEnabled" id="lookupServerUploadEnabled" class="checkbox"
58
-			   value="1" <?php if ($_['lookupServerUploadEnabled']) print_unescaped('checked="checked"'); ?> />
73
+			   value="1" <?php if ($_['lookupServerUploadEnabled']) {
74
+    print_unescaped('checked="checked"');
75
+}
76
+?> />
59 77
 		<label for="lookupServerUploadEnabled">
60 78
 			<?php p($l->t('Allow users to publish their data to a global and public address book'));?>
61 79
 		</label><br/>
Please login to merge, or discard this patch.
apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php 1 patch
Doc Comments   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 	 * share received from another server
151 151
 	 *
152 152
 	 * @param ICloudFederationShare $share
153
-	 * @return string provider specific unique ID of the share
153
+	 * @return integer provider specific unique ID of the share
154 154
 	 *
155 155
 	 * @throws ProviderCouldNotAddShareException
156 156
 	 * @throws \OCP\AppFramework\QueryException
@@ -325,11 +325,11 @@  discard block
 block discarded – undo
325 325
 	/**
326 326
 	 * notify user about new federated share
327 327
 	 *
328
-	 * @param $shareWith
329
-	 * @param $shareId
330
-	 * @param $ownerFederatedId
331
-	 * @param $sharedByFederatedId
332
-	 * @param $name
328
+	 * @param string $shareWith
329
+	 * @param integer $shareId
330
+	 * @param string $ownerFederatedId
331
+	 * @param string $sharedByFederatedId
332
+	 * @param string $name
333 333
 	 */
334 334
 	private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name) {
335 335
 		$notification = $this->notificationManager->createNotification();
@@ -821,7 +821,7 @@  discard block
 block discarded – undo
821 821
 	/**
822 822
 	 * get the supported share types, e.g. "user", "group", etc.
823 823
 	 *
824
-	 * @return array
824
+	 * @return string[]
825 825
 	 *
826 826
 	 * @since 14.0.0
827 827
 	 */
Please login to merge, or discard this patch.
apps/files_sharing/lib/External/Manager.php 1 patch
Doc Comments   +7 added lines, -4 removed lines patch added patch discarded remove patch
@@ -210,12 +210,12 @@  discard block
 block discarded – undo
210 210
 	 * @param $password
211 211
 	 * @param $name
212 212
 	 * @param $owner
213
-	 * @param $user
213
+	 * @param string $user
214 214
 	 * @param $mountPoint
215 215
 	 * @param $hash
216
-	 * @param $accepted
216
+	 * @param integer $accepted
217 217
 	 * @param $remoteId
218
-	 * @param $parent
218
+	 * @param integer $parent
219 219
 	 * @param $shareType
220 220
 	 */
221 221
 	private function writeShareToDb($remote, $token, $password, $name, $owner, $user, $mountPoint, $hash, $accepted, $remoteId, $parent, $shareType) {
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
 	 *
409 409
 	 * @param string $remoteDomain
410 410
 	 * @param string $token
411
-	 * @param $remoteId id of the share
411
+	 * @param integer $remoteId id of the share
412 412
 	 * @param string $feedback
413 413
 	 * @return bool
414 414
 	 */
@@ -505,6 +505,9 @@  discard block
 block discarded – undo
505 505
 		return $result;
506 506
 	}
507 507
 
508
+	/**
509
+	 * @param string $mountPoint
510
+	 */
508 511
 	public function removeShare($mountPoint) {
509 512
 
510 513
 		$mountPointObj = $this->mountManager->find($mountPoint);
Please login to merge, or discard this patch.