Completed
Pull Request — master (#586)
by Maxence
02:27
created
lib/Command/CirclesCreate.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@
 block discarded – undo
125 125
 		} catch (FederatedItemException $e) {
126 126
 			if ($input->getOption('status-code')) {
127 127
 				throw new FederatedItemException(
128
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
128
+					' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage()
129 129
 				);
130 130
 			}
131 131
 
Please login to merge, or discard this patch.
lib/Command/CirclesJoin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@
 block discarded – undo
125 125
 		} catch (FederatedItemException $e) {
126 126
 			if ($input->getOption('status-code')) {
127 127
 				throw new FederatedItemException(
128
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
128
+					' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage()
129 129
 				);
130 130
 			}
131 131
 
Please login to merge, or discard this patch.
lib/Command/CirclesEdit.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@
 block discarded – undo
125 125
 		} catch (FederatedItemException $e) {
126 126
 			if ($input->getOption('status-code')) {
127 127
 				throw new FederatedItemException(
128
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
128
+					' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage()
129 129
 				);
130 130
 			}
131 131
 
Please login to merge, or discard this patch.
lib/Command/CirclesReport.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 
203 203
 		$interactiveShell->setCommands($commands);
204 204
 		$interactiveShell->run(
205
-			'Circles Report [<info>' . $report->getSource() . '</info>]:<comment>%PATH%</comment>$'
205
+			'Circles Report [<info>'.$report->getSource().'</info>]:<comment>%PATH%</comment>$'
206 206
 		);
207 207
 	}
208 208
 
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 	 * @return string[]
215 215
 	 */
216 216
 	public function fillCommandList(string $source, string $field): array {
217
-		echo $source . ' ' . $field . "\n";
217
+		echo $source.' '.$field."\n";
218 218
 
219 219
 		return ['abcd', 'abdde', 'erfg'];
220 220
 	}
@@ -390,7 +390,7 @@  discard block
 block discarded – undo
390 390
 	 * @return string
391 391
 	 */
392 392
 	private function obfuscateId(string $id): string {
393
-		return substr($id, 0, 5) . '.' . md5(substr($id, 5));
393
+		return substr($id, 0, 5).'.'.md5(substr($id, 5));
394 394
 	}
395 395
 
396 396
 }
Please login to merge, or discard this patch.
lib/Db/CircleProviderRequest.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -40,10 +40,10 @@
 block discarded – undo
40 40
 
41 41
 
42 42
 	/**
43
-	 * @param $userId
43
+	 * @param string $userId
44 44
 	 * @param $circleUniqueIds
45
-	 * @param $limit
46
-	 * @param $offset
45
+	 * @param integer $limit
46
+	 * @param integer $offset
47 47
 	 *
48 48
 	 * @return array
49 49
 	 * @throws GSStatusException
Please login to merge, or discard this patch.
lib/Db/GSSharesRequestBuilder.php 1 patch
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,6 @@
 block discarded – undo
35 35
 
36 36
 
37 37
 /** * @deprecated
38
-
39 38
  * Class GSSharesRequestBuilder
40 39
  *
41 40
  * @package OCA\Circles\Db
Please login to merge, or discard this patch.
lib/Db/MemberRequest.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -216,8 +216,8 @@  discard block
 block discarded – undo
216 216
 			$qb->filterDirectMembership(CoreQueryBuilder::MEMBER, $filter);
217 217
 		}
218 218
 
219
-		$qb->orderBy($qb->getDefaultSelectAlias() . '.level', 'desc');
220
-		$qb->addOrderBy($qb->getDefaultSelectAlias() . '.cached_name', 'asc');
219
+		$qb->orderBy($qb->getDefaultSelectAlias().'.level', 'desc');
220
+		$qb->addOrderBy($qb->getDefaultSelectAlias().'.cached_name', 'asc');
221 221
 
222 222
 		return $this->getItemsFromRequest($qb);
223 223
 	}
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 		$qb->limitToMembersByInheritance(CoreQueryBuilder::MEMBER, $singleId);
242 242
 
243 243
 		$aliasMembership = $qb->generateAlias(CoreQueryBuilder::MEMBER, CoreQueryBuilder::MEMBERSHIPS);
244
-		$qb->orderBy($aliasMembership . '.inheritance_depth', 'asc');
244
+		$qb->orderBy($aliasMembership.'.inheritance_depth', 'asc');
245 245
 //		$qb->groupBy(CoreQueryBuilder::MEMBER . '.single_id');
246 246
 
247 247
 		return $this->getItemsFromRequest($qb);
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 		$qb = $this->getMemberSelectSql();
279 279
 		$qb->limitToCircleId($circleId);
280 280
 
281
-		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER . '.instance'));
281
+		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER.'.instance'));
282 282
 //		$qb->groupBy(CoreQueryBuilder::MEMBER . '.instance');
283 283
 
284 284
 		return array_map(
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
 	 */
335 335
 	public function searchFederatedUsers(string $needle): array {
336 336
 		$qb = $this->getMemberSelectSql();
337
-		$qb->searchInDBField('user_id', '%' . $needle . '%');
337
+		$qb->searchInDBField('user_id', '%'.$needle.'%');
338 338
 //		$qb->groupBy('single_id');
339 339
 
340 340
 		return $this->getItemsFromRequest($qb, true);
Please login to merge, or discard this patch.
lib/Db/CircleRequestBuilder.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@
 block discarded – undo
77 77
 		$qb = $this->getQueryBuilder();
78 78
 		$qb->generateSelect(self::TABLE_CIRCLE, self::$tables[self::TABLE_CIRCLE], $alias, true)
79 79
 		   ->generateGroupBy(self::$tables[self::TABLE_CIRCLE], $alias)
80
-		   ->orderBy($alias . '.creation', 'asc');
80
+		   ->orderBy($alias.'.creation', 'asc');
81 81
 
82 82
 		return $qb;
83 83
 	}
Please login to merge, or discard this patch.
lib/Db/RemoteRequest.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -182,10 +182,10 @@  discard block
 block discarded – undo
182 182
 			$qb->leftJoin(
183 183
 				CoreQueryBuilder::REMOTE, self::TABLE_MEMBER, $aliasMember,
184 184
 				$expr->andX(
185
-					$expr->eq($aliasMember . '.circle_id', $qb->createNamedParameter($circle->getSingleId())),
186
-					$expr->eq($aliasMember . '.instance', CoreQueryBuilder::REMOTE . '.instance'),
185
+					$expr->eq($aliasMember.'.circle_id', $qb->createNamedParameter($circle->getSingleId())),
186
+					$expr->eq($aliasMember.'.instance', CoreQueryBuilder::REMOTE.'.instance'),
187 187
 					$expr->gte(
188
-						$aliasMember . '.level',
188
+						$aliasMember.'.level',
189 189
 						$qb->createNamedParameter(Member::LEVEL_MEMBER, IQueryBuilder::PARAM_INT)
190 190
 					)
191 191
 				)
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
 
194 194
 			$external = $expr->andX();
195 195
 			$external->add($qb->exprLimitToDBField('type', RemoteInstance::TYPE_EXTERNAL, true, false));
196
-			$external->add($expr->isNotNull($aliasMember . '.instance'));
196
+			$external->add($expr->isNotNull($aliasMember.'.instance'));
197 197
 			$orX->add($external);
198 198
 		}
199 199
 
Please login to merge, or discard this patch.