Completed
Branch contacts (f6e612)
by Maxence
18:41
created
lib/Migration/ImportOwncloudCustomGroups.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -148,7 +148,7 @@
 block discarded – undo
148 148
 				continue;
149 149
 			}
150 150
 
151
-			$level = (int) $row['role'] === 1 ? Member::LEVEL_OWNER : Member::LEVEL_MEMBER;
151
+			$level = (int)$row['role'] === 1 ? Member::LEVEL_OWNER : Member::LEVEL_MEMBER;
152 152
 
153 153
 			if ($level === Member::LEVEL_OWNER) {
154 154
 				if (isset($this->circleHasAdmin[$this->circlesById[$row['group_id']]])) {
Please login to merge, or discard this patch.
lib/Migration/GenerateUniqueIdOnCreatedCircle.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@
 block discarded – undo
93 93
 
94 94
 			$update = $this->connection->getQueryBuilder();
95 95
 			$update->update('circles_circles')
96
-				   ->set('unique_id', $update->createNamedParameter('d' . $uniqueId))
96
+				   ->set('unique_id', $update->createNamedParameter('d'.$uniqueId))
97 97
 				   ->where(
98 98
 					   $update->expr()
99 99
 							  ->eq('id', $update->createNamedParameter($itemId))
Please login to merge, or discard this patch.
lib/Db/CirclesRequest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -185,7 +185,7 @@
 block discarded – undo
185 185
 	 *
186 186
 	 * @throws CircleAlreadyExistsException
187 187
 	 */
188
-	public function createCircle(Circle &$circle, $userId) {
188
+	public function createCircle(Circle & $circle, $userId) {
189 189
 
190 190
 		if (!$this->isCircleUnique($circle, $userId)) {
191 191
 			throw new CircleAlreadyExistsException(
Please login to merge, or discard this patch.
lib/AppInfo/Application.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 	 *
90 90
 	 * @param $container
91 91
 	 */
92
-	private function registerServices(IAppContainer &$container) {
92
+	private function registerServices(IAppContainer & $container) {
93 93
 
94 94
 		$container->registerService(
95 95
 			'MiscService', function(IAppContainer $c) {
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 	 *
184 184
 	 * @param $container
185 185
 	 */
186
-	private static function registerControllers(IAppContainer &$container) {
186
+	private static function registerControllers(IAppContainer & $container) {
187 187
 
188 188
 		$container->registerService(
189 189
 			'SettingsController', function(IAppContainer $c) {
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 	 *
269 269
 	 * @param IAppContainer $container
270 270
 	 */
271
-	private static function registerDatabaseRequesters(IAppContainer &$container) {
271
+	private static function registerDatabaseRequesters(IAppContainer & $container) {
272 272
 
273 273
 		$container->registerService(
274 274
 			'CirclesRequest', function(IAppContainer $c) {
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
 	 *
308 308
 	 * @param $container
309 309
 	 */
310
-	private static function registerCores(IAppContainer &$container) {
310
+	private static function registerCores(IAppContainer & $container) {
311 311
 
312 312
 		$container->registerService(
313 313
 			'Logger', function(IAppContainer $c) {
Please login to merge, or discard this patch.
lib/Service/GroupsService.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
 	 *
191 191
 	 * @throws \Exception
192 192
 	 */
193
-	private function editGroupLevel(Circle $circle, Member &$group, $level) {
193
+	private function editGroupLevel(Circle $circle, Member & $group, $level) {
194 194
 		try {
195 195
 			$isMod = $circle->getHigherViewer();
196 196
 			$isMod->hasToBeAdmin();
Please login to merge, or discard this patch.
lib/ShareByCircleProvider.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -569,7 +569,7 @@  discard block
 block discarded – undo
569 569
 	 * @param IShare $share
570 570
 	 * @param $data
571 571
 	 */
572
-	private function assignShareObjectPropertiesFromParent(IShare &$share, $data) {
572
+	private function assignShareObjectPropertiesFromParent(IShare & $share, $data) {
573 573
 		if (isset($data['f_permissions'])) {
574 574
 			$entryData = $data;
575 575
 			$entryData['permissions'] = $entryData['f_permissions'];
@@ -588,7 +588,7 @@  discard block
 block discarded – undo
588 588
 	 * @param IShare $share
589 589
 	 * @param $data
590 590
 	 */
591
-	private function assignShareObjectSharesProperties(IShare &$share, $data) {
591
+	private function assignShareObjectSharesProperties(IShare & $share, $data) {
592 592
 		$shareTime = new \DateTime();
593 593
 		$shareTime->setTimestamp((int)$data['stime']);
594 594
 
Please login to merge, or discard this patch.
lib/Service/FederatedService.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
 	 * @return string
313 313
 	 */
314 314
 	private function generateLinkRemoteURL($remote) {
315
-		return $this->generateRemoteHost($remote) . self::REMOTE_URL_LINK;
315
+		return $this->generateRemoteHost($remote).self::REMOTE_URL_LINK;
316 316
 	}
317 317
 
318 318
 
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
 	 * @return string
323 323
 	 */
324 324
 	private function generatePayloadDeliveryURL($remote) {
325
-		return $this->generateRemoteHost($remote) . self::REMOTE_URL_PAYLOAD;
325
+		return $this->generateRemoteHost($remote).self::REMOTE_URL_PAYLOAD;
326 326
 	}
327 327
 
328 328
 
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
 		if ((!$this->configService->isNonSSLLinksAllowed() || strpos($remote, 'http://') !== 0)
336 336
 			&& strpos($remote, 'https://') !== 0
337 337
 		) {
338
-			$remote = 'https://' . $remote;
338
+			$remote = 'https://'.$remote;
339 339
 		}
340 340
 
341 341
 		return rtrim($remote, '/');
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
 	 * @return boolean
353 353
 	 * @throws Exception
354 354
 	 */
355
-	private function requestLink(Circle $circle, FederatedLink &$link) {
355
+	private function requestLink(Circle $circle, FederatedLink & $link) {
356 356
 		$args = [
357 357
 			'apiVersion' => Circles::version(),
358 358
 			'token'      => $link->getToken(true),
@@ -609,7 +609,7 @@  discard block
 block discarded – undo
609 609
 	 * @return bool
610 610
 	 * @throws Exception
611 611
 	 */
612
-	public function updateLinkRemote(FederatedLink &$link) {
612
+	public function updateLinkRemote(FederatedLink & $link) {
613 613
 		$args = [
614 614
 			'apiVersion' => Circles::version(),
615 615
 			'token'      => $link->getToken(true),
@@ -647,7 +647,7 @@  discard block
 block discarded – undo
647 647
 	 *
648 648
 	 * @throws Exception
649 649
 	 */
650
-	public function initiateLink(Circle $circle, FederatedLink &$link) {
650
+	public function initiateLink(Circle $circle, FederatedLink & $link) {
651 651
 
652 652
 		try {
653 653
 			$this->checkLinkRequestValidity($circle, $link);
@@ -697,7 +697,7 @@  discard block
 block discarded – undo
697 697
 	 * @return bool
698 698
 	 * @throws Exception
699 699
 	 */
700
-	public function receiveFrame($token, $uniqueId, SharingFrame &$frame) {
700
+	public function receiveFrame($token, $uniqueId, SharingFrame & $frame) {
701 701
 		try {
702 702
 			$link = $this->circlesRequest->getLinkFromToken((string)$token, (string)$uniqueId);
703 703
 		} catch (Exception $e) {
@@ -821,7 +821,7 @@  discard block
 block discarded – undo
821 821
 
822 822
 			} catch (Exception $e) {
823 823
 				$this->miscService->log(
824
-					'Issue while sending sharing frame to ' . $link->getAddress() . ' - '
824
+					'Issue while sending sharing frame to '.$link->getAddress().' - '
825 825
 					. $e->getMessage()
826 826
 				);
827 827
 			}
Please login to merge, or discard this patch.
lib/Activity/BaseProvider.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 	 * @return IEvent
75 75
 	 */
76 76
 	protected function parseCircleEvent(
77
-		IEvent &$event, Circle $circle, $remote, $ownEvent, $othersEvent
77
+		IEvent & $event, Circle $circle, $remote, $ownEvent, $othersEvent
78 78
 	) {
79 79
 		$data = [
80 80
 			'author' => $this->generateViewerParameter($circle),
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 	 * @return IEvent
103 103
 	 */
104 104
 	protected function parseMemberEvent(
105
-		IEvent &$event, Circle $circle, Member $member, $ownEvent, $othersEvent
105
+		IEvent & $event, Circle $circle, Member $member, $ownEvent, $othersEvent
106 106
 	) {
107 107
 		$data = [
108 108
 			'circle' => $this->generateCircleParameter($circle),
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 	 *
129 129
 	 * @return IEvent
130 130
 	 */
131
-	protected function parseLinkEvent(IEvent &$event, Circle $circle, FederatedLink $remote, $line
131
+	protected function parseLinkEvent(IEvent & $event, Circle $circle, FederatedLink $remote, $line
132 132
 	) {
133 133
 		$data = [
134 134
 			'circle' => $this->generateCircleParameter($circle),
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 	 * @return IEvent
152 152
 	 */
153 153
 	protected function parseCircleMemberEvent(
154
-		IEvent &$event, Circle $circle, Member $member, $ownEvent, $othersEvent
154
+		IEvent & $event, Circle $circle, Member $member, $ownEvent, $othersEvent
155 155
 	) {
156 156
 		$data = [
157 157
 			'author' => $this->generateViewerParameter($circle),
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 	 * @return IEvent
183 183
 	 */
184 184
 	protected function parseCircleMemberAdvancedEvent(
185
-		IEvent &$event, Circle $circle, Member $member, $ownEvent, $targetEvent, $othersEvent
185
+		IEvent & $event, Circle $circle, Member $member, $ownEvent, $targetEvent, $othersEvent
186 186
 	) {
187 187
 		$data = [
188 188
 			'author' => $this->generateViewerParameter($circle),
@@ -205,13 +205,13 @@  discard block
 block discarded – undo
205 205
 	/**
206 206
 	 * @param IEvent $event
207 207
 	 */
208
-	protected function generateParsedSubject(IEvent &$event) {
208
+	protected function generateParsedSubject(IEvent & $event) {
209 209
 		$subject = $event->getRichSubject();
210 210
 		$params = $event->getRichSubjectParameters();
211 211
 		$ak = array_keys($params);
212 212
 		foreach ($ak as $k) {
213 213
 			if (is_array($params[$k])) {
214
-				$subject = str_replace('{' . $k . '}', $params[$k]['parsed'], $subject);
214
+				$subject = str_replace('{'.$k.'}', $params[$k]['parsed'], $subject);
215 215
 			}
216 216
 		}
217 217
 
@@ -278,8 +278,8 @@  discard block
 block discarded – undo
278 278
 		return [
279 279
 			'type'   => 'circle',
280 280
 			'id'     => $link->getUniqueId(),
281
-			'name'   => $link->getToken() . '@' . $link->getAddress(),
282
-			'parsed' => $link->getToken() . '@' . $link->getAddress()
281
+			'name'   => $link->getToken().'@'.$link->getAddress(),
282
+			'parsed' => $link->getToken().'@'.$link->getAddress()
283 283
 		];
284 284
 	}
285 285
 
Please login to merge, or discard this patch.
lib/Activity/Provider.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	}
71 71
 
72 72
 
73
-	private function setIcon(IEvent &$event, Circle $circle) {
73
+	private function setIcon(IEvent & $event, Circle $circle) {
74 74
 		$event->setIcon(
75 75
 			CirclesService::getCircleIcon(
76 76
 				$circle->getType(),
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 *
88 88
 	 * @return IEvent
89 89
 	 */
90
-	private function parseAsMember(IEvent &$event, Circle $circle, $params) {
90
+	private function parseAsMember(IEvent & $event, Circle $circle, $params) {
91 91
 		if ($event->getType() !== 'circles_as_member') {
92 92
 			return $event;
93 93
 		}
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 	 * @return IEvent
125 125
 	 * @throws Exception
126 126
 	 */
127
-	private function parseAsModerator(IEvent &$event, Circle $circle, $params) {
127
+	private function parseAsModerator(IEvent & $event, Circle $circle, $params) {
128 128
 		if ($event->getType() !== 'circles_as_moderator') {
129 129
 			return $event;
130 130
 		}
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 	 *
156 156
 	 * @return IEvent
157 157
 	 */
158
-	private function parseMemberAsMember(IEvent &$event, Circle $circle) {
158
+	private function parseMemberAsMember(IEvent & $event, Circle $circle) {
159 159
 		$params = $event->getSubjectParameters();
160 160
 		$member = Member::fromJSON($params['member']);
161 161
 
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 	 *
188 188
 	 * @return IEvent
189 189
 	 */
190
-	private function parseSubjectMemberJoin(IEvent &$event, Circle $circle, Member $member) {
190
+	private function parseSubjectMemberJoin(IEvent & $event, Circle $circle, Member $member) {
191 191
 		if ($circle->getType() === Circle::CIRCLES_CLOSED) {
192 192
 			return $this->parseCircleMemberEvent(
193 193
 				$event, $circle, $member,
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 	 *
215 215
 	 * @return IEvent
216 216
 	 */
217
-	private function parseSubjectMemberAdd(IEvent &$event, Circle $circle, Member $member) {
217
+	private function parseSubjectMemberAdd(IEvent & $event, Circle $circle, Member $member) {
218 218
 		if ($circle->getType() === Circle::CIRCLES_CLOSED) {
219 219
 			return $this->parseCircleMemberAdvancedEvent(
220 220
 				$event, $circle, $member,
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 	 *
245 245
 	 * @return IEvent
246 246
 	 */
247
-	private function parseSubjectMemberLeft(IEvent &$event, Circle $circle, Member $member) {
247
+	private function parseSubjectMemberLeft(IEvent & $event, Circle $circle, Member $member) {
248 248
 		if ($circle->getType() === Circle::CIRCLES_CLOSED
249 249
 			&& $member->getLevel() === Member::LEVEL_NONE) {
250 250
 			return $this->parseSubjectNonMemberLeftClosedCircle($event, $circle, $member);
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 	 * @return IEvent
271 271
 	 */
272 272
 	private function parseSubjectNonMemberLeftClosedCircle(
273
-		IEvent &$event, Circle $circle, Member $member
273
+		IEvent & $event, Circle $circle, Member $member
274 274
 	) {
275 275
 		if ($member->getStatus() === Member::STATUS_INVITED) {
276 276
 			return $this->parseCircleMemberEvent(
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
 	 *
300 300
 	 * @return IEvent
301 301
 	 */
302
-	private function parseSubjectMemberRemove(IEvent &$event, Circle $circle, Member $member) {
302
+	private function parseSubjectMemberRemove(IEvent & $event, Circle $circle, Member $member) {
303 303
 		if ($circle->getType() === Circle::CIRCLES_CLOSED
304 304
 			&& $member->getLevel() === Member::LEVEL_NONE) {
305 305
 			return $this->parseSubjectNonMemberRemoveClosedCircle($event, $circle, $member);
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
 	 * @return IEvent
328 328
 	 */
329 329
 	private function parseSubjectNonMemberRemoveClosedCircle(
330
-		IEvent &$event, Circle $circle, Member $member
330
+		IEvent & $event, Circle $circle, Member $member
331 331
 	) {
332 332
 		if ($member->getStatus() === Member::STATUS_REQUEST) {
333 333
 			return $this->parseCircleMemberAdvancedEvent(
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
353 353
 	 *
354 354
 	 * @return IEvent
355 355
 	 */
356
-	private function parseGroupAsModerator(IEvent &$event, Circle $circle) {
356
+	private function parseGroupAsModerator(IEvent & $event, Circle $circle) {
357 357
 
358 358
 		$params = $event->getSubjectParameters();
359 359
 		$group = Member::fromJSON($params['group']);
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
 	 *
401 401
 	 * @return IEvent
402 402
 	 */
403
-	private function parseMemberAsModerator(IEvent &$event, Circle $circle) {
403
+	private function parseMemberAsModerator(IEvent & $event, Circle $circle) {
404 404
 
405 405
 		$params = $event->getSubjectParameters();
406 406
 		$member = Member::fromJSON($params['member']);
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
449 449
 	 *
450 450
 	 * @return IEvent
451 451
 	 */
452
-	private function parseLinkAsModerator(IEvent &$event, Circle $circle) {
452
+	private function parseLinkAsModerator(IEvent & $event, Circle $circle) {
453 453
 
454 454
 		$params = $event->getSubjectParameters();
455 455
 		$remote = FederatedLink::fromJSON($params['link']);
Please login to merge, or discard this patch.