Completed
Pull Request — master (#23986)
by Roeland
08:02
created
lib/private/Server.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -856,7 +856,7 @@
 block discarded – undo
856 856
 	 * Get the certificate manager for the user
857 857
 	 *
858 858
 	 * @param string $userId (optional) if not specified the current loggedin user is used
859
-	 * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in
859
+	 * @return null|CertificateManager | null if $uid is null and no user is logged in
860 860
 	 */
861 861
 	public function getCertificateManager($userId = null) {
862 862
 		if (is_null($userId)) {
Please login to merge, or discard this patch.
apps/dav/lib/upload/assemblystream.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 
101 101
 	/**
102 102
 	 * @param string $data
103
-	 * @return int
103
+	 * @return boolean
104 104
 	 */
105 105
 	public function stream_write($data) {
106 106
 		return false;
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 	}
207 207
 
208 208
 	/**
209
-	 * @param $pos
209
+	 * @param integer $pos
210 210
 	 * @return IFile | null
211 211
 	 */
212 212
 	private function getNodeForPosition($pos) {
Please login to merge, or discard this patch.
apps/dav/lib/connector/sabre/sharetypelist.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
 	 * The deserialize method is called during xml parsing.
61 61
 	 *
62 62
 	 * @param Reader $reader
63
-	 * @return mixed
63
+	 * @return ShareTypeList
64 64
 	 */
65 65
 	static function xmlDeserialize(Reader $reader) {
66 66
 		$shareTypes = [];
Please login to merge, or discard this patch.
apps/files/controller/apicontroller.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,6 @@
 block discarded – undo
35 35
 use OCA\Files\Service\TagService;
36 36
 use OCP\IPreview;
37 37
 use OCP\Share\IManager;
38
-use OCP\Files\FileInfo;
39 38
 use OCP\Files\Node;
40 39
 use OCP\IUserSession;
41 40
 
Please login to merge, or discard this patch.
apps/files/service/tagservice.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,6 @@
 block discarded – undo
24 24
 
25 25
 namespace OCA\Files\Service;
26 26
 
27
-use OC\Files\FileInfo;
28 27
 use OCP\Files\Node;
29 28
 
30 29
 /**
Please login to merge, or discard this patch.
apps/dav/lib/carddav/carddavbackend.php 1 patch
Doc Comments   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -866,6 +866,7 @@  discard block
 block discarded – undo
866 866
 	 *   * readOnly - boolean
867 867
 	 *   * summary - Optional, a description for the share
868 868
 	 *
869
+	 * @param integer $addressBookId
869 870
 	 * @return array
870 871
 	 */
871 872
 	public function getShares($addressBookId) {
@@ -965,7 +966,7 @@  discard block
 block discarded – undo
965 966
 
966 967
 	/**
967 968
 	 * For shared address books the sharee is set in the ACL of the address book
968
-	 * @param $addressBookId
969
+	 * @param integer $addressBookId
969 970
 	 * @param $acl
970 971
 	 * @return array
971 972
 	 */
@@ -973,6 +974,9 @@  discard block
 block discarded – undo
973 974
 		return $this->sharingBackend->applyShareAcl($addressBookId, $acl);
974 975
 	}
975 976
 
977
+	/**
978
+	 * @param boolean $toV2
979
+	 */
976 980
 	private function convertPrincipal($principalUri, $toV2) {
977 981
 		if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
978 982
 			list(, $name) = URLUtil::splitPath($principalUri);
Please login to merge, or discard this patch.
lib/private/Share20/Manager.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -25,7 +25,6 @@  discard block
 block discarded – undo
25 25
 use OCP\IUserManager;
26 26
 use OCP\Share\IManager;
27 27
 use OCP\Share\IProviderFactory;
28
-use OC\Share20\Exception\BackendError;
29 28
 use OCP\IConfig;
30 29
 use OCP\IL10N;
31 30
 use OCP\ILogger;
@@ -35,7 +34,6 @@  discard block
 block discarded – undo
35 34
 use OCP\IGroupManager;
36 35
 use OCP\Files\File;
37 36
 use OCP\Files\Folder;
38
-
39 37
 use OCP\Share\Exceptions\ShareNotFound;
40 38
 use OCP\Share\Exceptions\GenericShareException;
41 39
 
Please login to merge, or discard this patch.
apps/dav/lib/files/browsererrorpageplugin.php 1 patch
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -86,8 +86,6 @@
 block discarded – undo
86 86
 
87 87
 	/**
88 88
 	 * @codeCoverageIgnore
89
-	 * @param \Exception $ex
90
-	 * @param int $httpCode
91 89
 	 * @return bool|string
92 90
 	 */
93 91
 	public function generateBody(\Exception $exception) {
Please login to merge, or discard this patch.
lib/private/encryption/util.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,6 @@
 block discarded – undo
30 30
 use OC\Files\Filesystem;
31 31
 use OC\Files\View;
32 32
 use OCP\Encryption\IEncryptionModule;
33
-use OCP\Files\Storage;
34 33
 use OCP\IConfig;
35 34
 
36 35
 class Util {
Please login to merge, or discard this patch.