Completed
Pull Request — stable10 (#6492)
by Morris
11:41
created
apps/files_sharing/lib/API/Sharees.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -335,7 +335,7 @@
 block discarded – undo
335 335
 	 * split user and remote from federated cloud id
336 336
 	 *
337 337
 	 * @param string $address federated share address
338
-	 * @return array [user, remoteURL]
338
+	 * @return string[] [user, remoteURL]
339 339
 	 * @throws \Exception
340 340
 	 */
341 341
 	public function splitUserRemote($address) {
Please login to merge, or discard this patch.
apps/files_sharing/lib/Migration.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -130,7 +130,6 @@
 block discarded – undo
130 130
 	/**
131 131
 	 * Get $n re-shares from the database
132 132
 	 *
133
-	 * @param int $n The max number of shares to fetch
134 133
 	 * @return \Doctrine\DBAL\Driver\Statement
135 134
 	 */
136 135
 	private function getReShares() {
Please login to merge, or discard this patch.
apps/files_trashbin/lib/Storage.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@
 block discarded – undo
110 110
 	 * check if it is a file located in data/user/files only files in the
111 111
 	 * 'files' directory should be moved to the trash
112 112
 	 *
113
-	 * @param $path
113
+	 * @param string $path
114 114
 	 * @return bool
115 115
 	 */
116 116
 	protected function shouldMoveToTrash($path){
Please login to merge, or discard this patch.
apps/files_trashbin/lib/Trashbin.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -671,7 +671,7 @@  discard block
 block discarded – undo
671 671
 	 * if the size limit for the trash bin is reached, we delete the oldest
672 672
 	 * files in the trash bin until we meet the limit again
673 673
 	 *
674
-	 * @param array $files
674
+	 * @param \OCP\Files\FileInfo[] $files
675 675
 	 * @param string $user
676 676
 	 * @param int $availableSpace available disc space
677 677
 	 * @return int size of deleted files
@@ -699,7 +699,7 @@  discard block
 block discarded – undo
699 699
 	/**
700 700
 	 * delete files older then max storage time
701 701
 	 *
702
-	 * @param array $files list of files sorted by mtime
702
+	 * @param \OCP\Files\FileInfo[] $files list of files sorted by mtime
703 703
 	 * @param string $user
704 704
 	 * @return integer[] size of deleted files and number of deleted files
705 705
 	 */
Please login to merge, or discard this patch.
apps/testing/locking/provisioning.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@
 block discarded – undo
80 80
 
81 81
 	/**
82 82
 	 * @param array $parameters
83
-	 * @return int
83
+	 * @return string
84 84
 	 */
85 85
 	protected function getPath($parameters) {
86 86
 		$node = \OC::$server->getRootFolder()
Please login to merge, or discard this patch.
apps/updatenotification/lib/Notification/Notifier.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -102,6 +102,9 @@
 block discarded – undo
102 102
 		return \OC_App::getAppVersions();
103 103
 	}
104 104
 
105
+	/**
106
+	 * @param string $appId
107
+	 */
105 108
 	protected function getAppInfo($appId) {
106 109
 		return \OC_App::getAppInfo($appId);
107 110
 	}
Please login to merge, or discard this patch.
apps/user_ldap/lib/Command/SetConfig.php 1 patch
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -74,8 +74,6 @@
 block discarded – undo
74 74
 	/**
75 75
 	 * save the configuration value as provided
76 76
 	 * @param string $configID
77
-	 * @param string $configKey
78
-	 * @param string $configValue
79 77
 	 */
80 78
 	protected function setValue($configID, $key, $value) {
81 79
 		$configHolder = new Configuration($configID);
Please login to merge, or discard this patch.
apps/user_ldap/lib/Jobs/UpdateGroups.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@
 block discarded – undo
77 77
 	}
78 78
 
79 79
 	/**
80
-	 * @return int
80
+	 * @return string
81 81
 	 */
82 82
 	static private function getRefreshInterval() {
83 83
 		//defaults to every hour
Please login to merge, or discard this patch.
core/Controller/LostController.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -146,6 +146,7 @@  discard block
 block discarded – undo
146 146
 	/**
147 147
 	 * @param string $userId
148 148
 	 * @param string $userId
149
+	 * @param string $token
149 150
 	 * @throws \Exception
150 151
 	 */
151 152
 	private function checkPasswordResetToken($token, $userId) {
@@ -167,7 +168,7 @@  discard block
 block discarded – undo
167 168
 	}
168 169
 
169 170
 	/**
170
-	 * @param $message
171
+	 * @param string $message
171 172
 	 * @param array $additional
172 173
 	 * @return array
173 174
 	 */
Please login to merge, or discard this patch.