Completed
Pull Request — master (#1618)
by Christoph
88:33 queued 76:40
created
lib/public/AppFramework/Http/Response.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 
227 227
 	/**
228 228
 	 * By default renders no output
229
-	 * @return null
229
+	 * @return string
230 230
 	 * @since 6.0.0
231 231
 	 */
232 232
 	public function render() {
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
 
260 260
 	/**
261 261
 	 * Get the currently used Content-Security-Policy
262
-	 * @return EmptyContentSecurityPolicy|null Used Content-Security-Policy or null if
262
+	 * @return ContentSecurityPolicy|null Used Content-Security-Policy or null if
263 263
 	 *                                    none specified.
264 264
 	 * @since 8.1.0
265 265
 	 */
Please login to merge, or discard this patch.
apps/dav/lib/CalDAV/Publishing/PublishPlugin.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -134,7 +134,7 @@
 block discarded – undo
134 134
 	 * @param RequestInterface $request
135 135
 	 * @param ResponseInterface $response
136 136
 	 *
137
-	 * @return void|bool
137
+	 * @return null|false
138 138
 	 */
139 139
 	public function httpPost(RequestInterface $request, ResponseInterface $response) {
140 140
 		$path = $request->getPath();
Please login to merge, or discard this patch.
apps/dav/lib/CalDAV/CalDavBackend.php 1 patch
Doc Comments   +8 added lines, -2 removed lines patch added patch discarded remove patch
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 	 *
138 138
 	 * By default this excludes the automatically generated birthday calendar
139 139
 	 *
140
-	 * @param $principalUri
140
+	 * @param string $principalUri
141 141
 	 * @param bool $excludeBirthday
142 142
 	 * @return int
143 143
 	 */
@@ -282,6 +282,9 @@  discard block
 block discarded – undo
282 282
 		return array_values($calendars);
283 283
 	}
284 284
 
285
+	/**
286
+	 * @param string $principalUri
287
+	 */
285 288
 	public function getUsersOwnCalendars($principalUri) {
286 289
 		$principalUri = $this->convertPrincipal($principalUri, true);
287 290
 		$fields = array_values($this->propertyMap);
@@ -1174,7 +1177,7 @@  discard block
 block discarded – undo
1174 1177
 	 * @param string $principalUri
1175 1178
 	 * @param string $uri
1176 1179
 	 * @param array $properties
1177
-	 * @return mixed
1180
+	 * @return integer
1178 1181
 	 */
1179 1182
 	function createSubscription($principalUri, $uri, array $properties) {
1180 1183
 
@@ -1533,6 +1536,9 @@  discard block
 block discarded – undo
1533 1536
 		return $this->sharingBackend->applyShareAcl($resourceId, $acl);
1534 1537
 	}
1535 1538
 
1539
+	/**
1540
+	 * @param boolean $toV2
1541
+	 */
1536 1542
 	private function convertPrincipal($principalUri, $toV2) {
1537 1543
 		if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
1538 1544
 			list(, $name) = URLUtil::splitPath($principalUri);
Please login to merge, or discard this patch.
lib/private/Console/Application.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -28,11 +28,9 @@
 block discarded – undo
28 28
 
29 29
 use OC_App;
30 30
 use OCP\Console\ConsoleEvent;
31
-use OCP\Defaults;
32 31
 use OCP\IConfig;
33 32
 use OCP\IRequest;
34 33
 use Symfony\Component\Console\Application as SymfonyApplication;
35
-use Symfony\Component\Console\Input\ArgvInput;
36 34
 use Symfony\Component\Console\Input\InputInterface;
37 35
 use Symfony\Component\Console\Input\InputOption;
38 36
 use Symfony\Component\Console\Output\OutputInterface;
Please login to merge, or discard this patch.