Completed
Pull Request — master (#27950)
by Tom
12:41
created
apps/dav/lib/Connector/LegacyDAVACL.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -49,6 +49,10 @@
 block discarded – undo
49 49
 		);
50 50
 	}
51 51
 
52
+	/**
53
+	 * @param string $principal
54
+	 * @param boolean $toV2
55
+	 */
52 56
 	private function convertPrincipal($principal, $toV2) {
53 57
 		list(, $name) = URLUtil::splitPath($principal);
54 58
 		if ($toV2) {
Please login to merge, or discard this patch.
apps/dav/lib/CalDAV/CalDavBackend.php 1 patch
Doc Comments   +7 added lines, -1 removed lines patch added patch discarded remove patch
@@ -267,6 +267,9 @@  discard block
 block discarded – undo
267 267
 		return array_values($calendars);
268 268
 	}
269 269
 
270
+	/**
271
+	 * @param string $principalUri
272
+	 */
270 273
 	public function getUsersOwnCalendars($principalUri) {
271 274
 		$principalUri = $this->convertPrincipal($principalUri, true);
272 275
 		$fields = array_values($this->propertyMap);
@@ -1262,7 +1265,7 @@  discard block
 block discarded – undo
1262 1265
 	 * @param string $principalUri
1263 1266
 	 * @param string $uri
1264 1267
 	 * @param array $properties
1265
-	 * @return mixed
1268
+	 * @return integer
1266 1269
 	 */
1267 1270
 	function createSubscription($principalUri, $uri, array $properties) {
1268 1271
 
@@ -1665,6 +1668,9 @@  discard block
 block discarded – undo
1665 1668
 		return $this->sharingBackend->applyShareAcl($resourceId, $acl);
1666 1669
 	}
1667 1670
 
1671
+	/**
1672
+	 * @param boolean $toV2
1673
+	 */
1668 1674
 	private function convertPrincipal($principalUri, $toV2 = null) {
1669 1675
 		if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
1670 1676
 			list(, $name) = URLUtil::splitPath($principalUri);
Please login to merge, or discard this patch.
apps/dav/lib/CardDAV/CardDavBackend.php 1 patch
Doc Comments   +8 added lines, -3 removed lines patch added patch discarded remove patch
@@ -214,7 +214,8 @@  discard block
 block discarded – undo
214 214
 	}
215 215
 
216 216
 	/**
217
-	 * @param $addressBookUri
217
+	 * @param string $addressBookUri
218
+	 * @param string $principal
218 219
 	 * @return array|null
219 220
 	 */
220 221
 	public function getAddressBooksByUri($principal, $addressBookUri) {
@@ -896,6 +897,7 @@  discard block
 block discarded – undo
896 897
 	 *   * readOnly - boolean
897 898
 	 *   * summary - Optional, a description for the share
898 899
 	 *
900
+	 * @param integer $addressBookId
899 901
 	 * @return array
900 902
 	 */
901 903
 	public function getShares($addressBookId) {
@@ -949,7 +951,7 @@  discard block
 block discarded – undo
949 951
 	 * read vCard data into a vCard object
950 952
 	 *
951 953
 	 * @param string $cardData
952
-	 * @return VCard
954
+	 * @return \Sabre\VObject\Parser\Sabre\VObject\Document|null
953 955
 	 */
954 956
 	protected function readCard($cardData) {
955 957
 		return  Reader::read($cardData);
@@ -995,7 +997,7 @@  discard block
 block discarded – undo
995 997
 
996 998
 	/**
997 999
 	 * For shared address books the sharee is set in the ACL of the address book
998
-	 * @param $addressBookId
1000
+	 * @param integer $addressBookId
999 1001
 	 * @param $acl
1000 1002
 	 * @return array
1001 1003
 	 */
@@ -1003,6 +1005,9 @@  discard block
 block discarded – undo
1003 1005
 		return $this->sharingBackend->applyShareAcl($addressBookId, $acl);
1004 1006
 	}
1005 1007
 
1008
+	/**
1009
+	 * @param boolean $toV2
1010
+	 */
1006 1011
 	private function convertPrincipal($principalUri, $toV2 = null) {
1007 1012
 		if ($this->principalBackend->getPrincipalPrefix() === 'principals') {
1008 1013
 			list(, $name) = URLUtil::splitPath($principalUri);
Please login to merge, or discard this patch.
lib/private/User/AccountMapper.php 2 patches
Doc Comments   +14 added lines, -3 removed lines patch added patch discarded remove patch
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
 
42 42
 	/**
43 43
 	 * Delegate to term mapper to avoid needing to inject term mapper
44
-	 * @param $account_id
45
-	 * @param array $terms
44
+	 * @param integer $account_id
45
+	 * @param string[] $terms
46 46
 	 */
47 47
 	public function setTermsForAccount($account_id, array $terms) {
48 48
 		$this->termMapper->setTermsForAccount($account_id, $terms);
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 
51 51
 	/**
52 52
 	 * Delegate to term mapper to avoid needing to inject term mapper
53
-	 * @param $account_id
53
+	 * @param integer $account_id
54 54
 	 * @return AccountTerm[] $terms
55 55
 	 */
56 56
 	public function findByAccountId($account_id) {
@@ -162,6 +162,9 @@  discard block
 block discarded – undo
162 162
 		return $this->findEntities($qb->getSQL(), $qb->getParameters(), $limit, $offset);
163 163
 	}
164 164
 
165
+	/**
166
+	 * @param boolean $hasLoggedIn
167
+	 */
165 168
 	public function getUserCountPerBackend($hasLoggedIn) {
166 169
 		$qb = $this->db->getQueryBuilder();
167 170
 		$qb->select(['backend', $qb->createFunction('count(*) as `count`')])
@@ -184,6 +187,9 @@  discard block
 block discarded – undo
184 187
 		return $return;
185 188
 	}
186 189
 
190
+	/**
191
+	 * @param boolean $hasLoggedIn
192
+	 */
187 193
 	public function getUserCount($hasLoggedIn) {
188 194
 		$qb = $this->db->getQueryBuilder();
189 195
 		$qb->select([$qb->createFunction('count(*) as `count`')])
@@ -200,6 +206,11 @@  discard block
 block discarded – undo
200 206
 		return (int) $data['count'];
201 207
 	}
202 208
 
209
+	/**
210
+	 * @param \Closure $callback
211
+	 * @param string $search
212
+	 * @param boolean $onlySeen
213
+	 */
203 214
 	public function callForAllUsers($callback, $search, $onlySeen) {
204 215
 		$qb = $this->db->getQueryBuilder();
205 216
 		$qb->select(['*'])
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,6 @@
 block discarded – undo
27 27
 use OC\DB\QueryBuilder\Literal;
28 28
 use OCP\AppFramework\Db\Entity;
29 29
 use OCP\AppFramework\Db\Mapper;
30
-use OCP\IConfig;
31 30
 use OCP\IDBConnection;
32 31
 
33 32
 class AccountMapper extends Mapper {
Please login to merge, or discard this patch.
lib/private/App/AppManager.php 1 patch
Doc Comments   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 	/**
123 123
 	 * List all installed apps
124 124
 	 *
125
-	 * @return string[]
125
+	 * @return integer[]
126 126
 	 */
127 127
 	public function getInstalledApps() {
128 128
 		return array_keys($this->getInstalledAppsValues());
@@ -352,6 +352,9 @@  discard block
 block discarded – undo
352 352
 		return in_array($appId, $this->shippedApps);
353 353
 	}
354 354
 
355
+	/**
356
+	 * @param string $appId
357
+	 */
355 358
 	private function isAlwaysEnabled($appId) {
356 359
 		$alwaysEnabled = $this->getAlwaysEnabledApps();
357 360
 		return in_array($appId, $alwaysEnabled);
@@ -380,7 +383,7 @@  discard block
 block discarded – undo
380 383
 	/**
381 384
 	 * @param string $package package path
382 385
 	 * @param bool whether to skip migrations, which would only install the code
383
-	 * @return string|false app id or false in case of error
386
+	 * @return integer app id or false in case of error
384 387
 	 * @since 10.0
385 388
 	 */
386 389
 	public function installApp($package, $skipMigrations = false) {
@@ -397,7 +400,7 @@  discard block
 block discarded – undo
397 400
 
398 401
 	/**
399 402
 	 * @param string $package
400
-	 * @return mixed
403
+	 * @return boolean
401 404
 	 * @since 10.0
402 405
 	 */
403 406
 	public function updateApp($package) {
Please login to merge, or discard this patch.
core/Migrations/Version20170221114437.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 namespace OC\Migrations;
3 3
 
4
-use OC\User\Account;
5 4
 use OC\User\AccountMapper;
6 5
 use OC\User\AccountTermMapper;
7 6
 use OC\User\Database;
Please login to merge, or discard this patch.