Completed
Push — master ( a32ba7...f7592a )
by Maxence
05:20
created
lib/Db/CircleProviderRequest.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,10 +34,10 @@
 block discarded – undo
34 34
 
35 35
 
36 36
 	/**
37
-	 * @param $userId
37
+	 * @param string $userId
38 38
 	 * @param $circleUniqueIds
39
-	 * @param $limit
40
-	 * @param $offset
39
+	 * @param integer $limit
40
+	 * @param integer $offset
41 41
 	 *
42 42
 	 * @return array
43 43
 	 */
Please login to merge, or discard this patch.
lib/Db/CircleProviderRequestBuilder.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
77 77
 		$qb->andWhere(
78 78
 			$expr->in(
79
-				$pf . 'share_with',
79
+				$pf.'share_with',
80 80
 				$qb->createNamedParameter($circleUniqueIds, IQueryBuilder::PARAM_STR_ARRAY)
81 81
 			)
82 82
 		);
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 		$expr = $qb->expr();
94 94
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
95 95
 
96
-		$qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($shareId)));
96
+		$qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($shareId)));
97 97
 	}
98 98
 
99 99
 
@@ -142,8 +142,8 @@  discard block
 block discarded – undo
142 142
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
143 143
 		$qb->andWhere(
144 144
 			$expr->orX(
145
-				$expr->eq($pf . 'parent', $qb->createNamedParameter($circleId)),
146
-				$expr->eq($pf . 'id', $qb->createNamedParameter($circleId))
145
+				$expr->eq($pf.'parent', $qb->createNamedParameter($circleId)),
146
+				$expr->eq($pf.'id', $qb->createNamedParameter($circleId))
147 147
 			)
148 148
 		);
149 149
 	}
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
166 166
 		$qb->andWhere(
167 167
 			$expr->in(
168
-				$pf . 'file_source',
168
+				$pf.'file_source',
169 169
 				$qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY)
170 170
 			)
171 171
 		);
@@ -198,13 +198,13 @@  discard block
 block discarded – undo
198 198
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
199 199
 
200 200
 		if ($reShares === false) {
201
-			$qb->andWhere($expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId)));
201
+			$qb->andWhere($expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId)));
202 202
 		} else {
203 203
 			/** @noinspection PhpMethodParametersCountMismatchInspection */
204 204
 			$qb->andWhere(
205 205
 				$expr->orX(
206
-					$expr->eq($pf . 'uid_owner', $qb->createNamedParameter($userId)),
207
-					$expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId))
206
+					$expr->eq($pf.'uid_owner', $qb->createNamedParameter($userId)),
207
+					$expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId))
208 208
 				)
209 209
 			);
210 210
 		}
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 
227 227
 		$tmpOrX = $expr->eq(
228 228
 			's.share_with',
229
-			$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')')
229
+			$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')')
230 230
 		);
231 231
 
232 232
 		if ($shareId === -1) {
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 			'c', CoreRequestBuilder::TABLE_MEMBERS, 'mo', $expr->andX(
258 258
 			$expr->eq(
259 259
 				'mo.circle_id',
260
-        $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')')
260
+        $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')')
261 261
 			), $expr->eq('mo.user_type', $qb->createNamedParameter(Member::TYPE_USER)),
262 262
 			$expr->eq('mo.level', $qb->createNamedParameter(Member::LEVEL_OWNER))
263 263
 		)
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
 			$expr->eq(
308 308
 				'm.circle_id',
309 309
 				$qb->createFunction(
310
-					'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
310
+					'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
311 311
 				)
312 312
 			)
313 313
 		);
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 			$expr->andX(
334 334
 				$expr->eq(
335 335
 					'g.circle_id',
336
-					$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')')
336
+					$qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')')
337 337
 				)
338 338
 			)
339 339
 		);
Please login to merge, or discard this patch.
lib/Db/SharesRequestBuilder.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,6 @@
 block discarded – undo
46 46
 	 * SharesRequestBuilder constructor.
47 47
 	 *
48 48
 	 * {@inheritdoc}
49
-	 * @param MembersRequest $membersRequest
50 49
 	 */
51 50
 	public function __construct(
52 51
 		IL10N $l10n, IDBConnection $connection, ConfigService $configService,
Please login to merge, or discard this patch.
lib/Service/MembersService.php 1 patch
Doc Comments   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 	 * @param $ident
110 110
 	 * @param int $type
111 111
 	 *
112
-	 * @return array
112
+	 * @return Member[]
113 113
 	 * @throws \Exception
114 114
 	 */
115 115
 	public function addMember($circleUniqueId, $ident, $type) {
@@ -258,8 +258,8 @@  discard block
 block discarded – undo
258 258
 	/**
259 259
 	 * Verify if a local account is valid.
260 260
 	 *
261
-	 * @param $ident
262
-	 * @param $type
261
+	 * @param string $ident
262
+	 * @param integer $type
263 263
 	 *
264 264
 	 * @throws NoUserException
265 265
 	 */
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
 	 * Verify if a mail have a valid format.
281 281
 	 *
282 282
 	 * @param $ident
283
-	 * @param $type
283
+	 * @param integer $type
284 284
 	 *
285 285
 	 * @throws EmailAccountInvalidFormatException
286 286
 	 */
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 	 * Verify if a contact exist in current user address books.
302 302
 	 *
303 303
 	 * @param $ident
304
-	 * @param $type
304
+	 * @param integer $type
305 305
 	 *
306 306
 	 * @throws NoUserException
307 307
 	 */
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
 	 * @param int $type
386 386
 	 * @param int $level
387 387
 	 *
388
-	 * @return array
388
+	 * @return Member[]
389 389
 	 * @throws \Exception
390 390
 	 */
391 391
 	public function levelMember($circleUniqueId, $name, $type, $level) {
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
 	/**
417 417
 	 * @param Circle $circle
418 418
 	 * @param Member $member
419
-	 * @param $level
419
+	 * @param integer $level
420 420
 	 *
421 421
 	 * @throws Exception
422 422
 	 */
@@ -489,9 +489,9 @@  discard block
 block discarded – undo
489 489
 	/**
490 490
 	 * @param string $circleUniqueId
491 491
 	 * @param string $name
492
-	 * @param $type
492
+	 * @param integer $type
493 493
 	 *
494
-	 * @return array
494
+	 * @return Member[]
495 495
 	 * @throws \Exception
496 496
 	 */
497 497
 	public function removeMember($circleUniqueId, $name, $type) {
Please login to merge, or discard this patch.
lib/Service/CirclesService.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -487,24 +487,24 @@
 block discarded – undo
487 487
 		switch ($type) {
488 488
 			case Circle::CIRCLES_PERSONAL:
489 489
 				return $urlGen->getAbsoluteURL(
490
-					$urlGen->imagePath(Application::APP_NAME, 'personal' . $ext)
490
+					$urlGen->imagePath(Application::APP_NAME, 'personal'.$ext)
491 491
 				);
492 492
 			case Circle::CIRCLES_CLOSED:
493 493
 				return $urlGen->getAbsoluteURL(
494
-					$urlGen->imagePath(Application::APP_NAME, 'closed' . $ext)
494
+					$urlGen->imagePath(Application::APP_NAME, 'closed'.$ext)
495 495
 				);
496 496
 			case Circle::CIRCLES_SECRET:
497 497
 				return $urlGen->getAbsoluteURL(
498
-					$urlGen->imagePath(Application::APP_NAME, 'secret' . $ext)
498
+					$urlGen->imagePath(Application::APP_NAME, 'secret'.$ext)
499 499
 				);
500 500
 			case Circle::CIRCLES_PUBLIC:
501 501
 				return $urlGen->getAbsoluteURL(
502
-					$urlGen->imagePath(Application::APP_NAME, 'public' . $ext)
502
+					$urlGen->imagePath(Application::APP_NAME, 'public'.$ext)
503 503
 				);
504 504
 		}
505 505
 
506 506
 		return $urlGen->getAbsoluteURL(
507
-			$urlGen->imagePath(Application::APP_NAME, 'black_circle' . $ext)
507
+			$urlGen->imagePath(Application::APP_NAME, 'black_circle'.$ext)
508 508
 		);
509 509
 	}
510 510
 
Please login to merge, or discard this patch.