Completed
Push — master ( 136da8...9a3545 )
by Maxence
04:40 queued 02:18
created
lib/Command/CirclesMemberships.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -213,10 +213,10 @@  discard block
 block discarded – undo
213 213
 			return 0;
214 214
 		}
215 215
 
216
-		$output->writeln('Id: <info>' . $federatedUser->getUserId() . '</info>');
217
-		$output->writeln('Instance: <info>' . $federatedUser->getInstance() . '</info>');
218
-		$output->writeln('Type: <info>' . Member::$TYPE[$federatedUser->getUserType()] . '</info>');
219
-		$output->writeln('SingleId: <info>' . $federatedUser->getSingleId() . '</info>');
216
+		$output->writeln('Id: <info>'.$federatedUser->getUserId().'</info>');
217
+		$output->writeln('Instance: <info>'.$federatedUser->getInstance().'</info>');
218
+		$output->writeln('Type: <info>'.Member::$TYPE[$federatedUser->getUserType()].'</info>');
219
+		$output->writeln('SingleId: <info>'.$federatedUser->getSingleId().'</info>');
220 220
 
221 221
 		$output->writeln('');
222 222
 		$output->writeln('Memberships:');
@@ -225,14 +225,14 @@  discard block
 block discarded – undo
225 225
 		if ($count === 0) {
226 226
 			$output->writeln('(database not updated)');
227 227
 		} else {
228
-			$output->writeln('(' . $count . ' entries generated/updated in the database)');
228
+			$output->writeln('('.$count.' entries generated/updated in the database)');
229 229
 		}
230 230
 
231 231
 		foreach ($federatedUser->getMemberships() as $membership) {
232 232
 			$this->memberships[$membership->getCircleId()] = $membership;
233 233
 			$output->writeln(
234
-				'- <info>' . $membership->getCircleId() . '</info> ('
235
-				. Member::$DEF_LEVEL[$membership->getLevel()] . ')'
234
+				'- <info>'.$membership->getCircleId().'</info> ('
235
+				. Member::$DEF_LEVEL[$membership->getLevel()].')'
236 236
 			);
237 237
 		}
238 238
 
@@ -305,9 +305,9 @@  discard block
 block discarded – undo
305 305
 				if ($lineNumber === 2) {
306 306
 					return '';
307 307
 				}
308
-				$line .= '<info>' . $federatedUser->getSingleId() . '</info>';
308
+				$line .= '<info>'.$federatedUser->getSingleId().'</info>';
309 309
 				if (!$this->configService->isLocalInstance($federatedUser->getInstance())) {
310
-					$line .= '@' . $federatedUser->getInstance();
310
+					$line .= '@'.$federatedUser->getInstance();
311 311
 				}
312 312
 
313 313
 				return $line;
@@ -319,28 +319,28 @@  discard block
 block discarded – undo
319 319
 				$circle = $member->getCircle();
320 320
 
321 321
 				if ($lineNumber === 1) {
322
-					$line .= '<info>' . $circle->getSingleId() . '</info>';
322
+					$line .= '<info>'.$circle->getSingleId().'</info>';
323 323
 					if (!$this->configService->isLocalInstance($circle->getInstance())) {
324
-						$line .= '@' . $circle->getInstance();
324
+						$line .= '@'.$circle->getInstance();
325 325
 					}
326
-					$line .= ' (' . ($this->input->getOption('display-name') ?
327
-							$circle->getDisplayName() : $circle->getName()) . ')';
328
-					$line .= ' <info>MemberId</info>: ' . $member->getId();
329
-					$line .= ' <info>Level</info>: ' . Member::$DEF_LEVEL[$member->getLevel()];
326
+					$line .= ' ('.($this->input->getOption('display-name') ?
327
+							$circle->getDisplayName() : $circle->getName()).')';
328
+					$line .= ' <info>MemberId</info>: '.$member->getId();
329
+					$line .= ' <info>Level</info>: '.Member::$DEF_LEVEL[$member->getLevel()];
330 330
 
331 331
 					$knownMembership = $this->memberships[$member->getCircleId()];
332 332
 					if ($member->getLevel() !== $knownMembership->getLevel()) {
333
-						$line .= ' (' . Member::$DEF_LEVEL[$knownMembership->getLevel()] . ')';
333
+						$line .= ' ('.Member::$DEF_LEVEL[$knownMembership->getLevel()].')';
334 334
 					}
335 335
 				}
336 336
 				if ($lineNumber === 2) {
337 337
 					$owner = $circle->getOwner();
338
-					$line .= '<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance();
338
+					$line .= '<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance();
339 339
 					if ($owner->hasBasedOn()) {
340
-						$line .= ' (' . Circle::$DEF_SOURCE[$owner->getBasedOn()->getSource()] . ') ';
340
+						$line .= ' ('.Circle::$DEF_SOURCE[$owner->getBasedOn()->getSource()].') ';
341 341
 					}
342 342
 					$type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG));
343
-					$line .= ($type === '') ? '' : '<info>Config</info>: ' . $type;
343
+					$line .= ($type === '') ? '' : '<info>Config</info>: '.$type;
344 344
 				}
345 345
 
346 346
 				return $line;
@@ -397,7 +397,7 @@  discard block
 block discarded – undo
397 397
 			);
398 398
 		}
399 399
 
400
-		$output->writeln($count . ' memberships updated');
400
+		$output->writeln($count.' memberships updated');
401 401
 	}
402 402
 
403 403
 }
Please login to merge, or discard this patch.
lib/Service/SyncService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -280,7 +280,7 @@
 block discarded – undo
280 280
 	 */
281 281
 	public function groupDeleted(string $groupId): void {
282 282
 		$circle = new Circle();
283
-		$circle->setName('group:' . $groupId)
283
+		$circle->setName('group:'.$groupId)
284 284
 			   ->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
285 285
 			   ->setSource(Member::TYPE_GROUP);
286 286
 
Please login to merge, or discard this patch.
lib/Controller/LocalController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -194,7 +194,7 @@
 block discarded – undo
194 194
 					throw new OCSException('works only from local instance', 404);
195 195
 				}
196 196
 
197
-				$userId = $currentUser->getUserId() . '/' . $userId;
197
+				$userId = $currentUser->getUserId().'/'.$userId;
198 198
 			}
199 199
 
200 200
 			$federatedUser = $this->federatedUserService->generateFederatedUser($userId, $type);
Please login to merge, or discard this patch.
lib/Listeners/Files/MemberAdded.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -74,8 +74,8 @@
 block discarded – undo
74 74
 			$result[$instance] = $item->gData('files');
75 75
 		}
76 76
 
77
-		\OC::$server->getLogger()->log(3, 'FILES: ' . json_encode($result));
78
-		\OC::$server->getLogger()->log(3, 'MAILS: ' . json_encode($federatedUsers));
77
+		\OC::$server->getLogger()->log(3, 'FILES: '.json_encode($result));
78
+		\OC::$server->getLogger()->log(3, 'MAILS: '.json_encode($federatedUsers));
79 79
 	}
80 80
 
81 81
 }
Please login to merge, or discard this patch.
lib/MountManager/CircleMountManager.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@
 block discarded – undo
109 109
 	 * @return string
110 110
 	 */
111 111
 	protected function stripPath($path) {
112
-		$prefix = '/' . $this->userId . '/files';
112
+		$prefix = '/'.$this->userId.'/files';
113 113
 
114 114
 		return rtrim(substr($path, strlen($prefix)), '/');
115 115
 	}
Please login to merge, or discard this patch.
lib/Model/Mount.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -190,7 +190,7 @@
 block discarded – undo
190 190
 			return $this->mountPoint;
191 191
 		}
192 192
 
193
-		return '/' . $this->getInitiator()->getUserId() . '/files/' . ltrim($this->mountPoint, '/');
193
+		return '/'.$this->getInitiator()->getUserId().'/files/'.ltrim($this->mountPoint, '/');
194 194
 	}
195 195
 
196 196
 	/**
Please login to merge, or discard this patch.
lib/Model/FileCacheWrapper.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -504,29 +504,29 @@
 block discarded – undo
504 504
 	 * @throws FileCacheNotFoundException
505 505
 	 */
506 506
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
507
-		if ($this->getInt($prefix . 'fileid', $data) === 0) {
507
+		if ($this->getInt($prefix.'fileid', $data) === 0) {
508 508
 			throw new FileCacheNotFoundException();
509 509
 		}
510 510
 
511
-		$this->setId($this->getInt($prefix . 'fileid', $data));
512
-		$this->setPath($this->get($prefix . 'path', $data));
513
-		$this->setPermissions($this->getInt($prefix . 'permissions', $data));
514
-		$this->setStorageId($this->getInt($prefix . 'storage', $data));
515
-		$this->setPathHash($this->get($prefix . 'path_hash', $data));
516
-		$this->setParent($this->getInt($prefix . 'parent', $data));
517
-		$this->setName($this->get($prefix . 'name', $data));
518
-		$this->setMimeType($this->getInt($prefix . 'mimetype', $data));
519
-		$this->setMimePart($this->getInt($prefix . 'mimepart', $data));
520
-		$this->setSize($this->getInt($prefix . 'size', $data));
521
-		$this->setMTime($this->getInt($prefix . 'mtime', $data));
522
-		$this->setStorageMTime($this->getInt($prefix . 'storage_mtime', $data));
523
-		$this->setEncrypted($this->getBool($prefix . 'encrypted', $data));
524
-		$this->setUnencryptedSize($this->getInt($prefix . 'unencrypted_size', $data));
525
-		$this->setEtag($this->get($prefix . 'etag', $data));
526
-		$this->setChecksum($this->get($prefix . 'checksum', $data));
511
+		$this->setId($this->getInt($prefix.'fileid', $data));
512
+		$this->setPath($this->get($prefix.'path', $data));
513
+		$this->setPermissions($this->getInt($prefix.'permissions', $data));
514
+		$this->setStorageId($this->getInt($prefix.'storage', $data));
515
+		$this->setPathHash($this->get($prefix.'path_hash', $data));
516
+		$this->setParent($this->getInt($prefix.'parent', $data));
517
+		$this->setName($this->get($prefix.'name', $data));
518
+		$this->setMimeType($this->getInt($prefix.'mimetype', $data));
519
+		$this->setMimePart($this->getInt($prefix.'mimepart', $data));
520
+		$this->setSize($this->getInt($prefix.'size', $data));
521
+		$this->setMTime($this->getInt($prefix.'mtime', $data));
522
+		$this->setStorageMTime($this->getInt($prefix.'storage_mtime', $data));
523
+		$this->setEncrypted($this->getBool($prefix.'encrypted', $data));
524
+		$this->setUnencryptedSize($this->getInt($prefix.'unencrypted_size', $data));
525
+		$this->setEtag($this->get($prefix.'etag', $data));
526
+		$this->setChecksum($this->get($prefix.'checksum', $data));
527 527
 
528 528
 		// small hack as there is no reason to call a recursive method for a single entry from the table
529
-		$this->setStorage($this->get($prefix . CoreQueryBuilder::STORAGES . '_id', $data));
529
+		$this->setStorage($this->get($prefix.CoreQueryBuilder::STORAGES.'_id', $data));
530 530
 
531 531
 		return $this;
532 532
 	}
Please login to merge, or discard this patch.
lib/Model/Helpers/MemberHelper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 		try {
105 105
 			$level = Member::parseLevelString($levelString);
106 106
 		} catch (ParseMemberLevelException $e) {
107
-			throw new MemberHelperException('method ' . $levelString . ' not found');
107
+			throw new MemberHelperException('method '.$levelString.' not found');
108 108
 		}
109 109
 
110 110
 		$this->mustHaveLevelEqualOrAbove($level);
@@ -122,11 +122,11 @@  discard block
 block discarded – undo
122 122
 		try {
123 123
 			$level = Member::parseLevelString($levelString);
124 124
 		} catch (ParseMemberLevelException $e) {
125
-			throw new MemberHelperException('method ' . $levelString . ' not found');
125
+			throw new MemberHelperException('method '.$levelString.' not found');
126 126
 		}
127 127
 
128 128
 		if ($this->member->getLevel() >= $level) {
129
-			throw new MemberLevelException('Member cannot be ' . $levelString);
129
+			throw new MemberLevelException('Member cannot be '.$levelString);
130 130
 		}
131 131
 	}
132 132
 
Please login to merge, or discard this patch.
lib/Model/Membership.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -259,17 +259,17 @@
 block discarded – undo
259 259
 	 * @throws MembershipNotFoundException
260 260
 	 */
261 261
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
262
-		if ($this->get($prefix . 'single_id', $data) === '') {
262
+		if ($this->get($prefix.'single_id', $data) === '') {
263 263
 			throw new MembershipNotFoundException();
264 264
 		}
265 265
 
266
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
267
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
268
-		$this->setLevel($this->getInt($prefix . 'level', $data));
269
-		$this->setInheritanceFirst($this->get($prefix . 'inheritance_first', $data));
270
-		$this->setInheritanceLast($this->get($prefix . 'inheritance_last', $data));
271
-		$this->setInheritancePath($this->getArray($prefix . 'inheritance_path', $data));
272
-		$this->setInheritanceDepth($this->getInt($prefix . 'inheritance_depth', $data));
266
+		$this->setSingleId($this->get($prefix.'single_id', $data));
267
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
268
+		$this->setLevel($this->getInt($prefix.'level', $data));
269
+		$this->setInheritanceFirst($this->get($prefix.'inheritance_first', $data));
270
+		$this->setInheritanceLast($this->get($prefix.'inheritance_last', $data));
271
+		$this->setInheritancePath($this->getArray($prefix.'inheritance_path', $data));
272
+		$this->setInheritanceDepth($this->getInt($prefix.'inheritance_depth', $data));
273 273
 
274 274
 		return $this;
275 275
 	}
Please login to merge, or discard this patch.