Completed
Pull Request — master (#24036)
by Roeland
19:57
created
apps/files_sharing/api/sharees.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -327,7 +327,7 @@
 block discarded – undo
327 327
 	 * split user and remote from federated cloud id
328 328
 	 *
329 329
 	 * @param string $address federated share address
330
-	 * @return array [user, remoteURL]
330
+	 * @return string[] [user, remoteURL]
331 331
 	 * @throws \Exception
332 332
 	 */
333 333
 	public function splitUserRemote($address) {
Please login to merge, or discard this patch.
lib/private/allconfig.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@
 block discarded – undo
111 111
 	 * Looks up a system wide defined value
112 112
 	 *
113 113
 	 * @param string $key the key of the value, under which it was saved
114
-	 * @param mixed $default the default value to be returned if the value isn't set
114
+	 * @param string $default the default value to be returned if the value isn't set
115 115
 	 * @return mixed the value or $default
116 116
 	 */
117 117
 	public function getSystemValue($key, $default = '') {
Please login to merge, or discard this patch.
lib/private/appframework/http.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
 
111 111
 	/**
112 112
 	 * Gets the correct header
113
-	 * @param Http::CONSTANT $status the constant from the Http class
113
+	 * @param integer $status the constant from the Http class
114 114
 	 * @param \DateTime $lastModified formatted last modified date
115 115
 	 * @param string $ETag the etag
116 116
 	 * @return string
Please login to merge, or discard this patch.
lib/private/appframework/utility/controllermethodreflector.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 
47 47
 
48 48
 	/**
49
-	 * @param object $object an object or classname
49
+	 * @param \OCP\AppFramework\Controller $object an object or classname
50 50
 	 * @param string $method the method which we want to inspect
51 51
 	 */
52 52
 	public function reflect($object, $method){
Please login to merge, or discard this patch.
lib/private/datetimeformatter.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 	/**
94 94
 	 * Formats the date of the given timestamp
95 95
 	 *
96
-	 * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
96
+	 * @param integer	$timestamp	Either a Unix timestamp or DateTime object
97 97
 	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
98 98
 	 * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
99 99
 	 * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 	/**
193 193
 	 * Gives the relative past time of the timestamp
194 194
 	 *
195
-	 * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
195
+	 * @param integer	$timestamp	Either a Unix timestamp or DateTime object
196 196
 	 * @param int|\DateTime	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
197 197
 	 * @return string	Dates returned are:
198 198
 	 * 				< 60 sec	=> seconds ago
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
 	/**
229 229
 	 * Formats the date and time of the given timestamp
230 230
 	 *
231
-	 * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
231
+	 * @param integer $timestamp	Either a Unix timestamp or DateTime object
232 232
 	 * @param string		$formatDate		See formatDate() for description
233 233
 	 * @param string		$formatTime		See formatTime() for description
234 234
 	 * @param \DateTimeZone	$timeZone	The timezone to use
Please login to merge, or discard this patch.
lib/private/memcache/arraycache.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@
 block discarded – undo
120 120
 	 * Set a value in the cache if it's not already stored
121 121
 	 *
122 122
 	 * @param string $key
123
-	 * @param mixed $value
123
+	 * @param integer $value
124 124
 	 * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
125 125
 	 * @return bool
126 126
 	 */
Please login to merge, or discard this patch.
lib/private/repair/collation.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
 	}
68 68
 
69 69
 	/**
70
-	 * @param \Doctrine\DBAL\Connection $connection
70
+	 * @param \OC\DB\Connection $connection
71 71
 	 * @return string[]
72 72
 	 */
73 73
 	protected function getAllNonUTF8BinTables($connection) {
Please login to merge, or discard this patch.
lib/private/template/functions.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
  * make preview_icon available as a simple function
184 184
  * Returns the path to the preview of the image.
185 185
  * @param string $path path of file
186
- * @return link to the preview
186
+ * @return string to the preview
187 187
  *
188 188
  * For further information have a look at OC_Helper::previewIcon
189 189
  */
@@ -193,6 +193,7 @@  discard block
 block discarded – undo
193 193
 
194 194
 /**
195 195
  * @param string $path
196
+ * @param string $token
196 197
  */
197 198
 function publicPreview_icon ( $path, $token ) {
198 199
 	return OC_Helper::publicPreviewIcon( $path, $token );
Please login to merge, or discard this patch.
lib/private/user.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -238,6 +238,7 @@
 block discarded – undo
238 238
 
239 239
 	/**
240 240
 	 * Sets user id for session and triggers emit
241
+	 * @param string $uid
241 242
 	 */
242 243
 	public static function setUserId($uid) {
243 244
 		$userSession = \OC::$server->getUserSession();
Please login to merge, or discard this patch.