Completed
Pull Request — master (#1745)
by Thomas
10:36
created
apps/files_sharing/lib/Helper.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -303,6 +303,7 @@
 block discarded – undo
303 303
 	 * get default share folder
304 304
 	 *
305 305
 	 * @param \OC\Files\View
306
+	 * @param View $view
306 307
 	 * @return string
307 308
 	 */
308 309
 	public static function getShareFolder($view = null) {
Please login to merge, or discard this patch.
lib/private/DB/Migrator.php 1 patch
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -273,6 +273,10 @@  discard block
 block discarded – undo
273 273
 		return '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
274 274
 	}
275 275
 
276
+	/**
277
+	 * @param integer $step
278
+	 * @param integer $max
279
+	 */
276 280
 	protected function emit($sql, $step, $max) {
277 281
 		if ($this->noEmit) {
278 282
 			return;
@@ -283,6 +287,10 @@  discard block
 block discarded – undo
283 287
 		$this->dispatcher->dispatch('\OC\DB\Migrator::executeSql', new GenericEvent($sql, [$step+1, $max]));
284 288
 	}
285 289
 
290
+	/**
291
+	 * @param integer $step
292
+	 * @param integer $max
293
+	 */
286 294
 	private function emitCheckStep($tableName, $step, $max) {
287 295
 		if(is_null($this->dispatcher)) {
288 296
 			return;
Please login to merge, or discard this patch.
lib/private/User/Session.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
 	 * @param IRequest $request
301 301
 	 * @throws LoginException
302 302
 	 * @throws PasswordLoginForbiddenException
303
-	 * @return boolean
303
+	 * @return boolean|null
304 304
 	 */
305 305
 	public function logClientIn($user, $password, IRequest $request) {
306 306
 		$isTokenPassword = $this->isTokenPassword($password);
@@ -340,6 +340,9 @@  discard block
 block discarded – undo
340 340
 		return $this->config->getSystemValue('token_auth_enforced', false);
341 341
 	}
342 342
 
343
+	/**
344
+	 * @param string $username
345
+	 */
343 346
 	protected function isTwoFactorEnforced($username) {
344 347
 		Util::emitHook(
345 348
 			'\OCA\Files_Sharing\API\Server2Server',
Please login to merge, or discard this patch.
settings/Controller/CheckSetupController.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -103,6 +103,7 @@  discard block
 block discarded – undo
103 103
 
104 104
 	/**
105 105
 	* Chceks if the ownCloud server can connect to a specific URL using both HTTPS and HTTP
106
+	* @param string $sitename
106 107
 	* @return bool
107 108
 	*/
108 109
 	private function isSiteReachable($sitename) {
@@ -285,7 +286,7 @@  discard block
 block discarded – undo
285 286
 
286 287
 	/**
287 288
 	 * @NoCSRFRequired
288
-	 * @return DataResponse
289
+	 * @return DataDisplayResponse
289 290
 	 */
290 291
 	public function getFailedIntegrityCheckFiles() {
291 292
 		if(!$this->checker->isCodeCheckEnforced()) {
Please login to merge, or discard this patch.
lib/private/TemplateLayout.php 1 patch
Unused Use Statements   -9 removed lines patch added patch discarded remove patch
@@ -35,15 +35,6 @@
 block discarded – undo
35 35
  */
36 36
 namespace OC;
37 37
 
38
-use Assetic\Asset\AssetCollection;
39
-use Assetic\Asset\FileAsset;
40
-use Assetic\AssetWriter;
41
-use Assetic\Filter\CssImportFilter;
42
-use Assetic\Filter\CssMinFilter;
43
-use Assetic\Filter\CssRewriteFilter;
44
-use Assetic\Filter\JSqueezeFilter;
45
-use Assetic\Filter\SeparatorFilter;
46
-
47 38
 class TemplateLayout extends \OC_Template {
48 39
 
49 40
 	private static $versionHash = '';
Please login to merge, or discard this patch.
lib/private/Repair/RepairUnmergedShares.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -219,7 +219,7 @@
 block discarded – undo
219 219
 	 * @param array $groupSharesById
220 220
 	 * @param array $subShares
221 221
 	 *
222
-	 * @return true if the share is valid, false if it needs repair
222
+	 * @return boolean if the share is valid, false if it needs repair
223 223
 	 */
224 224
 	private function isThisShareValid($groupSharesById, $subShares) {
225 225
 		$foundTargets = [];
Please login to merge, or discard this patch.
apps/user_ldap/lib/Wizard.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1104,7 +1104,7 @@
 block discarded – undo
1104 1104
 	}
1105 1105
 
1106 1106
 	/**
1107
-	 * @param array $reqs
1107
+	 * @param string[] $reqs
1108 1108
 	 * @return bool
1109 1109
 	 */
1110 1110
 	private function checkRequirements($reqs) {
Please login to merge, or discard this patch.
lib/private/Files/Cache/Wrapper/CacheJail.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 
72 72
 	/**
73 73
 	 * @param array $entry
74
-	 * @return array
74
+	 * @return string
75 75
 	 */
76 76
 	protected function formatCacheEntry($entry) {
77 77
 		if (isset($entry['path'])) {
@@ -190,6 +190,9 @@  discard block
 block discarded – undo
190 190
 		return $this->cache->getStatus($this->getSourcePath($file));
191 191
 	}
192 192
 
193
+	/**
194
+	 * @param \OCP\Files\Cache\ICacheEntry[] $results
195
+	 */
193 196
 	private function formatSearchResults($results) {
194 197
 		$results = array_filter($results, array($this, 'filterCacheEntry'));
195 198
 		$results = array_values($results);
Please login to merge, or discard this patch.
lib/private/IntegrityCheck/Helpers/FileAccessHelper.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
 	 * Wrapper around file_put_contents($filename, $data)
54 54
 	 *
55 55
 	 * @param string $filename
56
-	 * @param $data
56
+	 * @param string $data
57 57
 	 * @return int|false
58 58
 	 */
59 59
 	public function file_put_contents($filename, $data) {
Please login to merge, or discard this patch.