Completed
Pull Request — master (#609)
by Maxence
02:33
created
lib/Db/MemberRequest.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -221,8 +221,8 @@  discard block
 block discarded – undo
221 221
 			$qb->filterDirectMembership(CoreQueryBuilder::MEMBER, $filter);
222 222
 		}
223 223
 
224
-		$qb->orderBy($qb->getDefaultSelectAlias() . '.level', 'desc');
225
-		$qb->addOrderBy($qb->getDefaultSelectAlias() . '.cached_name', 'asc');
224
+		$qb->orderBy($qb->getDefaultSelectAlias().'.level', 'desc');
225
+		$qb->addOrderBy($qb->getDefaultSelectAlias().'.cached_name', 'asc');
226 226
 
227 227
 		return $this->getItemsFromRequest($qb);
228 228
 	}
@@ -246,8 +246,8 @@  discard block
 block discarded – undo
246 246
 		$qb->limitToMembersByInheritance(CoreQueryBuilder::MEMBER, $singleId);
247 247
 
248 248
 		$aliasMembership = $qb->generateAlias(CoreQueryBuilder::MEMBER, CoreQueryBuilder::MEMBERSHIPS);
249
-		$qb->orderBy($aliasMembership . '.inheritance_depth', 'asc')
250
-		   ->addGroupBy($aliasMembership . '.inheritance_depth');
249
+		$qb->orderBy($aliasMembership.'.inheritance_depth', 'asc')
250
+		   ->addGroupBy($aliasMembership.'.inheritance_depth');
251 251
 
252 252
 		return $this->getItemsFromRequest($qb);
253 253
 	}
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
 		$qb = $this->getMemberSelectSql();
284 284
 		$qb->limitToCircleId($circleId);
285 285
 
286
-		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER . '.instance'));
286
+		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER.'.instance'));
287 287
 
288 288
 		return array_map(
289 289
 			function(Member $member): string {
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
339 339
 	 */
340 340
 	public function searchFederatedUsers(string $needle): array {
341 341
 		$qb = $this->getMemberSelectSql();
342
-		$qb->searchInDBField('user_id', '%' . $needle . '%');
342
+		$qb->searchInDBField('user_id', '%'.$needle.'%');
343 343
 
344 344
 		return $this->getItemsFromRequest($qb, true);
345 345
 	}
Please login to merge, or discard this patch.
lib/Model/Federated/FederatedEvent.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 	}
134 134
 
135 135
 	/**
136
-	 * @param mixed $class
136
+	 * @param string $class
137 137
 	 *
138 138
 	 * @return self
139 139
 	 */
@@ -454,7 +454,7 @@  discard block
 block discarded – undo
454 454
 
455 455
 	/**
456 456
 	 * @param string $key
457
-	 * @param array $result
457
+	 * @param \OCA\Circles\Model\ShareWrapper[] $result
458 458
 	 *
459 459
 	 * @return $this
460 460
 	 */
Please login to merge, or discard this patch.
lib/Service/FederatedEventService.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -251,16 +251,16 @@
 block discarded – undo
251 251
 		try {
252 252
 			$test = new ReflectionClass($class);
253 253
 		} catch (ReflectionException $e) {
254
-			throw new FederatedEventException('ReflectionException with ' . $class . ': ' . $e->getMessage());
254
+			throw new FederatedEventException('ReflectionException with '.$class.': '.$e->getMessage());
255 255
 		}
256 256
 
257 257
 		if (!in_array(IFederatedItem::class, $test->getInterfaceNames())) {
258
-			throw new FederatedEventException($class . ' does not implements IFederatedItem');
258
+			throw new FederatedEventException($class.' does not implements IFederatedItem');
259 259
 		}
260 260
 
261 261
 		$item = OC::$server->get($class);
262 262
 		if (!($item instanceof IFederatedItem)) {
263
-			throw new FederatedEventException($class . ' not an IFederatedItem');
263
+			throw new FederatedEventException($class.' not an IFederatedItem');
264 264
 		}
265 265
 
266 266
 		if ($item instanceof IFederatedItemHighSeverity) {
Please login to merge, or discard this patch.
lib/Model/Federated/EventWrapper.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,6 @@
 block discarded – undo
37 37
 use daita\MySmallPhpTools\Model\SimpleDataStore;
38 38
 use daita\MySmallPhpTools\Traits\TArrayTools;
39 39
 use JsonSerializable;
40
-use OCA\Circles\Exceptions\UnknownInterfaceException;
41 40
 
42 41
 
43 42
 /**
Please login to merge, or discard this patch.
lib/Service/EventWrapperService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@
 block discarded – undo
152 152
 	 */
153 153
 	public function retry() {
154 154
 		$tokens = $this->getFailedEvents();
155
-		echo json_encode($tokens) . "\n";
155
+		echo json_encode($tokens)."\n";
156 156
 		foreach ($tokens as $token) {
157 157
 			$this->confirmStatus($token, true);
158 158
 		}
Please login to merge, or discard this patch.
lib/Service/ConfigService.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 			return $value;
176 176
 		}
177 177
 
178
-		if (($value = $this->config->getSystemValue(Application::APP_ID . '.' . $key, '')) !== '') {
178
+		if (($value = $this->config->getSystemValue(Application::APP_ID.'.'.$key, '')) !== '') {
179 179
 			return $value;
180 180
 		}
181 181
 
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
 		}
430 430
 
431 431
 		if (array_key_exists('port', $loopback)) {
432
-			$loopbackCloudId = $loopback['host'] . ':' . $loopback['port'];
432
+			$loopbackCloudId = $loopback['host'].':'.$loopback['port'];
433 433
 		} else {
434 434
 			$loopbackCloudId = $loopback['host'];
435 435
 		}
@@ -458,12 +458,12 @@  discard block
 block discarded – undo
458 458
 			$scheme = $this->getAppValue(self::LOOPBACK_CLOUD_SCHEME);
459 459
 		}
460 460
 
461
-		$base = $scheme . '://' . $instance;
461
+		$base = $scheme.'://'.$instance;
462 462
 		if ($route === '') {
463 463
 			return $base;
464 464
 		}
465 465
 
466
-		return $base . $this->urlGenerator->linkToRoute($route, $args);
466
+		return $base.$this->urlGenerator->linkToRoute($route, $args);
467 467
 	}
468 468
 
469 469
 
@@ -563,7 +563,7 @@  discard block
 block discarded – undo
563 563
 			return '';
564 564
 		}
565 565
 
566
-		return (($showAt) ? '@' : '') . $instance;
566
+		return (($showAt) ? '@' : '').$instance;
567 567
 	}
568 568
 
569 569
 
Please login to merge, or discard this patch.