Completed
Push — master ( 851e4f...27b477 )
by Roeland
02:24 queued 12s
created
lib/Controller/FederationController.php 1 patch
Unused Use Statements   -3 removed lines patch added patch discarded remove patch
@@ -26,11 +26,8 @@
 block discarded – undo
26 26
 use \OCP\AppFramework\OCSController;
27 27
 use OCA\Richdocuments\Db\WopiMapper;
28 28
 use OCP\AppFramework\Http\DataResponse;
29
-use OCP\AppFramework\OCS\OCSNotFoundException;
30
-use OCP\Files\NotFoundException;
31 29
 use OCP\IConfig;
32 30
 use OCP\IRequest;
33
-use OCP\Share\Exceptions\ShareNotFound;
34 31
 use OCP\Share\IManager;
35 32
 
36 33
 class FederationController extends OCSController {
Please login to merge, or discard this patch.
lib/Service/FederationService.php 2 patches
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -126,6 +126,7 @@
 block discarded – undo
126 126
 
127 127
 	/**
128 128
 	 * @param File $item
129
+	 * @param \OCA\Richdocuments\Db\Direct $direct
129 130
 	 * @return string|null
130 131
 	 * @throws NotFoundException
131 132
 	 * @throws InvalidPathException
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,6 @@
 block discarded – undo
27 27
 use OCA\Federation\TrustedServers;
28 28
 use OCA\Files_Sharing\External\Storage as SharingExternalStorage;
29 29
 use OCA\Richdocuments\TokenManager;
30
-use OCP\AppFramework\Http\RedirectResponse;
31 30
 use OCP\AppFramework\QueryException;
32 31
 use OCP\Files\File;
33 32
 use OCP\Files\InvalidPathException;
Please login to merge, or discard this patch.
lib/AppConfig.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,6 +40,9 @@  discard block
 block discarded – undo
40 40
 		$this->config = $config;
41 41
 	}
42 42
 
43
+	/**
44
+	 * @return string
45
+	 */
43 46
 	public function getAppNamespace($key) {
44 47
 		if (strpos($key, 'watermark_') === 0) {
45 48
 			return self::WATERMARK_APP_NAMESPACE;
@@ -61,7 +64,7 @@  discard block
 block discarded – undo
61 64
 	}
62 65
 
63 66
 	/**
64
-	 * @param $key
67
+	 * @param string $key
65 68
 	 * @return array
66 69
 	 */
67 70
 	public function getAppValueArray($key) {
Please login to merge, or discard this patch.
lib/Controller/WopiController.php 1 patch
Doc Comments   +7 added lines patch added patch discarded remove patch
@@ -215,6 +215,9 @@  discard block
 block discarded – undo
215 215
 		return new JSONResponse($response);
216 216
 	}
217 217
 
218
+	/**
219
+	 * @param Wopi $wopi
220
+	 */
218 221
 	private function setFederationFileInfo($wopi, $response) {
219 222
 		$remoteUserId = $wopi->getGuestDisplayname();
220 223
 		$cloudID = \OC::$server->getCloudIdManager()->resolveCloudId($remoteUserId);
@@ -235,6 +238,10 @@  discard block
 block discarded – undo
235 238
 		return $response;
236 239
 	}
237 240
 
241
+	/**
242
+	 * @param boolean $isPublic
243
+	 * @param string $userId
244
+	 */
238 245
 	private function shouldWatermark($isPublic, $userId, $fileId, Wopi $wopi) {
239 246
 		if ($this->config->getAppValue(AppConfig::WATERMARK_APP_NAMESPACE, 'watermark_enabled', 'no') === 'no') {
240 247
 			return false;
Please login to merge, or discard this patch.