Completed
Pull Request — master (#29865)
by Matthew
12:24
created
apps/provisioning_api/lib/Users.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -449,7 +449,7 @@
 block discarded – undo
449 449
 	 * @param IUser $user user to check access
450 450
 	 * @param IGroup|null $group group to check or null
451 451
 	 *
452
-	 * @return true if the user can manage the group
452
+	 * @return boolean if the user can manage the group
453 453
 	 */
454 454
 	private function canUserManageGroup($user, $group) {
455 455
 		if ($this->groupManager->isAdmin($user->getUID())) {
Please login to merge, or discard this patch.
lib/private/User/User.php 1 patch
Doc Comments   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	 *
73 73
 	 * @param Account $account
74 74
 	 * @param AccountMapper $mapper
75
-	 * @param null $emitter
75
+	 * @param Manager $emitter
76 76
 	 * @param IConfig|null $config
77 77
 	 * @param null $urlGenerator
78 78
 	 * @param EventDispatcher|null $eventDispatcher
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 	/**
98 98
 	 * get the user id
99 99
 	 *
100
-	 * @return string
100
+	 * @return integer
101 101
 	 */
102 102
 	public function getUID() {
103 103
 		return $this->account->getUserId();
@@ -433,6 +433,10 @@  discard block
 block discarded – undo
433 433
 		return $url;
434 434
 	}
435 435
 
436
+	/**
437
+	 * @param string $feature
438
+	 * @param string $value
439
+	 */
436 440
 	public function triggerChange($feature, $value = null) {
437 441
 		if ($this->emitter && in_array($feature, $this->account->getUpdatedFields())) {
438 442
 			$this->emitter->emit('\OC\User', 'changeUser', [$this, $feature, $value]);
Please login to merge, or discard this patch.
lib/private/DB/MigrationService.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -361,7 +361,7 @@
 block discarded – undo
361 361
 
362 362
 	/**
363 363
 	 * @param string $version
364
-	 * @return mixed
364
+	 * @return \Doctrine\DBAL\Schema\Schema
365 365
 	 * @throws \Exception
366 366
 	 */
367 367
 	protected function createInstance($version) {
Please login to merge, or discard this patch.
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.
apps/dav/lib/Upload/ChunkingPlugin.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
 	 *
91 91
 	 * @param string $path source path
92 92
 	 * @param string $destination destination path
93
-	 * @return bool|void false to stop handling, void to skip this handler
93
+	 * @return null|false false to stop handling, void to skip this handler
94 94
 	 */
95 95
 	public function performMove($path, $destination) {
96 96
 		if (!$this->server->tree->nodeExists($destination)) {
Please login to merge, or discard this patch.
lib/private/L10N/L10N.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -171,7 +171,7 @@
 block discarded – undo
171 171
 	 * Returns an associative array with all translations
172 172
 	 *
173 173
 	 * Called by String
174
-	 * @return array
174
+	 * @return string[]
175 175
 	 */
176 176
 	public function getTranslations() {
177 177
 		return $this->translations;
Please login to merge, or discard this patch.
lib/public/Template.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -100,8 +100,8 @@
 block discarded – undo
100 100
 /**
101 101
  * Return the relative date in relation to today. Returns something like "last hour" or "two month ago"
102 102
  * @param int $timestamp unix timestamp
103
- * @param boolean $dateOnly
104
- * @return \OC\L10N\L10NString human readable interpretation of the timestamp
103
+ * @param integer $dateOnly
104
+ * @return string human readable interpretation of the timestamp
105 105
  *
106 106
  * @deprecated 8.0.0 Use \OCP\Template::relative_modified_date() instead
107 107
  */
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\CorsController;
Please login to merge, or discard this patch.
lib/private/User/Session.php 1 patch
Doc Comments   +8 added lines, -2 removed lines patch added patch discarded remove patch
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
 	 * @param IRequest $request
304 304
 	 * @throws LoginException
305 305
 	 * @throws PasswordLoginForbiddenException
306
-	 * @return boolean
306
+	 * @return boolean|null
307 307
 	 */
308 308
 	public function logClientIn($user, $password, IRequest $request) {
309 309
 		$isTokenPassword = $this->isTokenPassword($password);
@@ -346,6 +346,9 @@  discard block
 block discarded – undo
346 346
 		return $this->config->getSystemValue('token_auth_enforced', false);
347 347
 	}
348 348
 
349
+	/**
350
+	 * @param string $username
351
+	 */
349 352
 	protected function isTwoFactorEnforced($username) {
350 353
 		Util::emitHook(
351 354
 			'\OCA\Files_Sharing\API\Server2Server',
@@ -857,6 +860,9 @@  discard block
 block discarded – undo
857 860
 		}
858 861
 	}
859 862
 
863
+	/**
864
+	 * @param IRequest $request
865
+	 */
860 866
 	public function verifyAuthHeaders($request) {
861 867
 		foreach ($this->getAuthModules(true) as $module) {
862 868
 			$user = $module->auth($request);
@@ -876,7 +882,7 @@  discard block
 block discarded – undo
876 882
 	}
877 883
 
878 884
 	/**
879
-	 * @param $includeBuiltIn
885
+	 * @param boolean $includeBuiltIn
880 886
 	 * @return \Generator | IAuthModule[]
881 887
 	 * @throws Exception
882 888
 	 */
Please login to merge, or discard this patch.