Completed
Pull Request — master (#28605)
by Piotr
23:34 queued 10:27
created
lib/private/legacy/template.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -319,6 +319,7 @@
 block discarded – undo
319 319
 		* @param string $error_msg The error message to show
320 320
 		* @param string $hint An optional hint message - needs to be properly escaped
321 321
 		* @param int HTTP Status Code
322
+		* @param integer $httpStatusCode
322 323
 		*/
323 324
 	public static function printErrorPage( $error_msg, $hint = '', $httpStatusCode = null ) {
324 325
 		if ($error_msg === $hint) {
Please login to merge, or discard this patch.
settings/Application.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,6 @@
 block discarded – undo
31 31
 
32 32
 namespace OC\Settings;
33 33
 
34
-use OC\Files\View;
35 34
 use OC\Server;
36 35
 use OC\AppFramework\Utility\TimeFactory;
37 36
 use OC\Settings\Controller\SettingsPageController;
Please login to merge, or discard this patch.
lib/private/Files/Stream/Encryption.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -140,6 +140,7 @@
 block discarded – undo
140 140
 	 * @param int $headerSize
141 141
 	 * @param bool $signed
142 142
 	 * @param string $wrapper stream wrapper class
143
+	 * @param string $sourceFileOfRename
143 144
 	 * @return resource
144 145
 	 *
145 146
 	 * @throws \BadMethodCallException
Please login to merge, or discard this patch.
apps/dav/lib/Connector/Sabre/Node.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -197,7 +197,7 @@
 block discarded – undo
197 197
 	/**
198 198
 	 * Returns the size of the node, in bytes
199 199
 	 *
200
-	 * @return integer
200
+	 * @return string
201 201
 	 */
202 202
 	public function getSize() {
203 203
 		return $this->info->getSize();
Please login to merge, or discard this patch.
lib/private/Files/Node/Node.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -191,7 +191,7 @@
 block discarded – undo
191 191
 	}
192 192
 
193 193
 	/**
194
-	 * @return int
194
+	 * @return string
195 195
 	 * @throws InvalidPathException
196 196
 	 * @throws NotFoundException
197 197
 	 */
Please login to merge, or discard this patch.