Completed
Pull Request — master (#842)
by Joas
40s
created
lib/Listeners/Examples/ExampleAddingCircleMember.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -85,35 +85,35 @@
 block discarded – undo
85 85
 
86 86
 		$eventType = ($event->getType() === CircleGenericEvent::INVITED) ? 'invited' : 'joined';
87 87
 
88
-		$info = 'A new member have been added (' . $eventType . ') to a Circle. ';
88
+		$info = 'A new member have been added ('.$eventType.') to a Circle. ';
89 89
 
90
-		$info .= 'userId: ' . $member->getUserId() . '; userType: ' . Member::$TYPE[$member->getUserType()]
91
-				 . '; singleId: ' . $member->getSingleId() . '; memberId: ' . $member->getId()
92
-				 . '; isLocal: ' . json_encode($member->isLocal()) . '; level: '
93
-				 . Member::$DEF_LEVEL[$member->getLevel()] . '; ';
90
+		$info .= 'userId: '.$member->getUserId().'; userType: '.Member::$TYPE[$member->getUserType()]
91
+				 . '; singleId: '.$member->getSingleId().'; memberId: '.$member->getId()
92
+				 . '; isLocal: '.json_encode($member->isLocal()).'; level: '
93
+				 . Member::$DEF_LEVEL[$member->getLevel()].'; ';
94 94
 
95 95
 		$memberships = array_map(
96
-			function (Membership $membership) {
96
+			function(Membership $membership) {
97 97
 				return $membership->getCircleId();
98 98
 			}, $circle->getMemberships()
99 99
 		);
100 100
 
101 101
 		$listMemberships = (count($memberships) > 0) ? implode(', ', $memberships) : 'none';
102
-		$info .= 'circleName: ' . $circle->getDisplayName() . '; circleId: ' . $circle->getSingleId()
103
-				 . '; Circle memberships: ' . $listMemberships . '.';
102
+		$info .= 'circleName: '.$circle->getDisplayName().'; circleId: '.$circle->getSingleId()
103
+				 . '; Circle memberships: '.$listMemberships.'.';
104 104
 
105 105
 		if ($member->getUserType() === Member::TYPE_CIRCLE) {
106 106
 			$basedOn = $member->getBasedOn();
107 107
 			$members = array_map(
108
-				function (Member $member) {
109
-					return $member->getUserId() . ' (' . Member::$TYPE[$member->getUserType()] . ')';
108
+				function(Member $member) {
109
+					return $member->getUserId().' ('.Member::$TYPE[$member->getUserType()].')';
110 110
 				}, $basedOn->getInheritedMembers()
111 111
 			);
112 112
 
113
-			$info .= ' Member is a Circle (singleId: ' . $basedOn->getSingleId()
114
-					 . ') that contains those inherited members: ' . implode(', ', $members);
113
+			$info .= ' Member is a Circle (singleId: '.$basedOn->getSingleId()
114
+					 . ') that contains those inherited members: '.implode(', ', $members);
115 115
 		}
116 116
 
117
-		$this->log(3, $prefix . $info);
117
+		$this->log(3, $prefix.$info);
118 118
 	}
119 119
 }
Please login to merge, or discard this patch.
lib/Listeners/Examples/ExampleMembershipsRemoved.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 		$prefix = '[Example Event] (ExampleMembershipsRemoved) ';
93 93
 
94 94
 		$memberships = array_map(
95
-			function (Membership $membership) {
95
+			function(Membership $membership) {
96 96
 				$inheritance = ($membership->getInheritanceDepth() > 1) ?
97 97
 					'an inherited member' : 'a direct member';
98 98
 				try {
@@ -100,15 +100,15 @@  discard block
 block discarded – undo
100 100
 				} catch (Exception $e) {
101 101
 					$this->e($e);
102 102
 
103
-					return $membership->getSingleId() . ' is not ' . $inheritance . ' of '
104
-						   . $membership->getCircleId() . ' anymore';
103
+					return $membership->getSingleId().' is not '.$inheritance.' of '
104
+						   . $membership->getCircleId().' anymore';
105 105
 				}
106 106
 
107
-				return $federatedUser->getUserId() . ' (' . Member::$TYPE[$federatedUser->getUserType()]
108
-					   . ') is not ' . $inheritance . ' of ' . $membership->getCircleId() . ' anymore';
107
+				return $federatedUser->getUserId().' ('.Member::$TYPE[$federatedUser->getUserType()]
108
+					   . ') is not '.$inheritance.' of '.$membership->getCircleId().' anymore';
109 109
 			}, $event->getMemberships()
110 110
 		);
111 111
 
112
-		$this->log(3, $prefix . implode('. ', $memberships));
112
+		$this->log(3, $prefix.implode('. ', $memberships));
113 113
 	}
114 114
 }
Please login to merge, or discard this patch.
lib/Listeners/Examples/ExampleMembershipsCreated.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 		$prefix = '[Example Event] (ExampleMembershipsCreated) ';
93 93
 
94 94
 		$memberships = array_map(
95
-			function (Membership $membership) {
95
+			function(Membership $membership) {
96 96
 				$inheritance = ($membership->getInheritanceDepth() > 1) ?
97 97
 					'an inherited member' : 'a direct member';
98 98
 				try {
@@ -100,15 +100,15 @@  discard block
 block discarded – undo
100 100
 				} catch (Exception $e) {
101 101
 					$this->e($e);
102 102
 
103
-					return $membership->getSingleId() . ' is now ' . $inheritance . ' of '
103
+					return $membership->getSingleId().' is now '.$inheritance.' of '
104 104
 						   . $membership->getCircleId();
105 105
 				}
106 106
 
107
-				return $federatedUser->getUserId() . ' (' . Member::$TYPE[$federatedUser->getUserType()]
108
-					   . ') is now ' . $inheritance . ' of ' . $membership->getCircleId();
107
+				return $federatedUser->getUserId().' ('.Member::$TYPE[$federatedUser->getUserType()]
108
+					   . ') is now '.$inheritance.' of '.$membership->getCircleId();
109 109
 			}, $event->getMemberships()
110 110
 		);
111 111
 
112
-		$this->log(3, $prefix . implode('. ', $memberships));
112
+		$this->log(3, $prefix.implode('. ', $memberships));
113 113
 	}
114 114
 }
Please login to merge, or discard this patch.
lib/Listeners/Files/RemovingMember.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@
 block discarded – undo
97 97
 		$singleIds = array_merge(
98 98
 			[$circle->getSingleId()],
99 99
 			array_map(
100
-				function (Membership $membership) {
100
+				function(Membership $membership) {
101 101
 					return $membership->getCircleId();
102 102
 				}, $circle->getMemberships()
103 103
 			)
Please login to merge, or discard this patch.
lib/Cron/Maintenance.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -54,9 +54,9 @@
 block discarded – undo
54 54
 
55 55
 	public static $DELAY =
56 56
 		[
57
-			1 => 60,    // every minute
58
-			2 => 300,   // every 5 minutes
59
-			3 => 3600,  // every hour
57
+			1 => 60, // every minute
58
+			2 => 300, // every 5 minutes
59
+			3 => 3600, // every hour
60 60
 			4 => 75400, // every day
61 61
 			5 => 432000 // evey week
62 62
 		];
Please login to merge, or discard this patch.
lib/Model/GlobalScale/GSShare.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 			return $mountPoint;
153 153
 		}
154 154
 
155
-		return '/' . $userId . '/files/' . ltrim($mountPoint, '/');
155
+		return '/'.$userId.'/files/'.ltrim($mountPoint, '/');
156 156
 	}
157 157
 
158 158
 	/**
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
 	public function toMount(string $userId, string $protocol = 'https'): array {
292 292
 		return [
293 293
 			'owner' => $this->getOwner(),
294
-			'remote' => $protocol . '://' . $this->getInstance(),
294
+			'remote' => $protocol.'://'.$this->getInstance(),
295 295
 			'token' => $this->getToken(),
296 296
 			'share_token' => $this->getToken(),
297 297
 			'password' => $this->getPassword(),
Please login to merge, or discard this patch.
lib/AppInfo/Application.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 //use OCA\Files\App as FilesApp;
83 83
 
84 84
 
85
-require_once __DIR__ . '/../../vendor/autoload.php';
85
+require_once __DIR__.'/../../vendor/autoload.php';
86 86
 
87 87
 
88 88
 /**
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 		// It seems that AccountManager use deprecated dispatcher, let's use a deprecated listener
147 147
 		$dispatcher = OC::$server->getEventDispatcher();
148 148
 		$dispatcher->addListener(
149
-			'OC\AccountManager::userUpdated', function (GenericEvent $event) {
149
+			'OC\AccountManager::userUpdated', function(GenericEvent $event) {
150 150
 				/** @var IUser $user */
151 151
 				$user = $event->getSubject();
152 152
 				/** @var DeprecatedListener $deprecatedListener */
Please login to merge, or discard this patch.
lib/Db/MemberRequest.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -252,8 +252,8 @@  discard block
 block discarded – undo
252 252
 			$qb->filterDirectMembership(CoreQueryBuilder::MEMBER, $probe->getFilterMember());
253 253
 		}
254 254
 
255
-		$qb->orderBy($qb->getDefaultSelectAlias() . '.level', 'desc');
256
-		$qb->addOrderBy($qb->getDefaultSelectAlias() . '.cached_name', 'asc');
255
+		$qb->orderBy($qb->getDefaultSelectAlias().'.level', 'desc');
256
+		$qb->addOrderBy($qb->getDefaultSelectAlias().'.cached_name', 'asc');
257 257
 
258 258
 		return $this->getItemsFromRequest($qb);
259 259
 	}
@@ -278,8 +278,8 @@  discard block
 block discarded – undo
278 278
 		$qb->limitToMembersByInheritance(CoreQueryBuilder::MEMBER, $singleId, $level);
279 279
 
280 280
 		$aliasMembership = $qb->generateAlias(CoreQueryBuilder::MEMBER, CoreQueryBuilder::MEMBERSHIPS);
281
-		$qb->orderBy($aliasMembership . '.inheritance_depth', 'asc')
282
-		   ->addGroupBy($aliasMembership . '.inheritance_depth');
281
+		$qb->orderBy($aliasMembership.'.inheritance_depth', 'asc')
282
+		   ->addGroupBy($aliasMembership.'.inheritance_depth');
283 283
 
284 284
 		return $this->getItemsFromRequest($qb);
285 285
 	}
@@ -338,10 +338,10 @@  discard block
 block discarded – undo
338 338
 		$qb = $this->getMemberSelectSql();
339 339
 		$qb->limitToCircleId($circleId);
340 340
 
341
-		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER . '.instance'));
341
+		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER.'.instance'));
342 342
 
343 343
 		return array_map(
344
-			function (Member $member): string {
344
+			function(Member $member): string {
345 345
 				return $member->getInstance();
346 346
 			}, $this->getItemsFromRequest($qb)
347 347
 		);
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 	 */
392 392
 	public function searchFederatedUsers(string $needle): array {
393 393
 		$qb = $this->getMemberSelectSql();
394
-		$qb->searchInDBField('user_id', '%' . $needle . '%');
394
+		$qb->searchInDBField('user_id', '%'.$needle.'%');
395 395
 
396 396
 		return $this->getItemsFromRequest($qb, true);
397 397
 	}
Please login to merge, or discard this patch.
lib/Service/MaintenanceService.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 		$this->federatedUserService->bypassCurrentUserCondition(true);
150 150
 
151 151
 		$this->lockMaintenanceRun();
152
-		$this->debug('running maintenance (' . $level . ')');
152
+		$this->debug('running maintenance ('.$level.')');
153 153
 
154 154
 		switch ($level) {
155 155
 			case 1:
@@ -308,14 +308,14 @@  discard block
 block discarded – undo
308 308
 			  ->includeSystemCircles();
309 309
 
310 310
 		$circles = array_map(
311
-			function (Circle $circle) {
311
+			function(Circle $circle) {
312 312
 				return $circle->getSingleId();
313 313
 			}, $this->circleRequest->getCircles(null, $probe)
314 314
 		);
315 315
 
316 316
 		$shares = array_unique(
317 317
 			array_map(
318
-				function (ShareWrapper $share) {
318
+				function(ShareWrapper $share) {
319 319
 					return $share->getSharedWith();
320 320
 				}, $this->shareWrapperRequest->getShares()
321 321
 			)
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 	 */
361 361
 	private function output(string $message): void {
362 362
 		if (!is_null($this->output)) {
363
-			$this->output->writeln('- ' . $message);
363
+			$this->output->writeln('- '.$message);
364 364
 		}
365 365
 	}
366 366
 }
Please login to merge, or discard this patch.