Completed
Pull Request — master (#376)
by Roeland
01:51
created
lib/Service/DavService.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 	public function onDeleteCard(GenericEvent $event) {
159 159
 		$davCard = $this->generateDavCard($event, true);
160 160
 
161
-		$this->miscService->log('Deleting Card: ' . json_encode($davCard), 1);
161
+		$this->miscService->log('Deleting Card: '.json_encode($davCard), 1);
162 162
 		$this->membersRequest->removeMembersByContactId($davCard->getUniqueId(), Member::TYPE_USER);
163 163
 		$this->manageDeprecatedCircles($davCard->getAddressBookId());
164 164
 		$this->manageDeprecatedMembers($davCard);
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 	 *
215 215
 	 */
216 216
 	private function manageDavCard(DavCard $davCard) {
217
-		$this->miscService->log('Updating Card: ' . json_encode($davCard), 1);
217
+		$this->miscService->log('Updating Card: '.json_encode($davCard), 1);
218 218
 		$this->manageCircles($davCard);
219 219
 		$this->manageContact($davCard);
220 220
 	}
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
 			}
333 333
 		}
334 334
 
335
-		$davCard->setUserId($davCard->getOwner() . ':' . $davCard->getContactId());
335
+		$davCard->setUserId($davCard->getOwner().':'.$davCard->getContactId());
336 336
 
337 337
 		return DavCard::TYPE_CONTACT;
338 338
 	}
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 			}
392 392
 
393 393
 			$user = $this->userManager->get($davCard->getOwner());
394
-			$circle = new Circle($this->configService->contactsBackendType(), $group . ' - ' . $user->getDisplayName());
394
+			$circle = new Circle($this->configService->contactsBackendType(), $group.' - '.$user->getDisplayName());
395 395
 			$circle->setContactAddressBook($davCard->getAddressBookId());
396 396
 			$circle->setContactGroupName($group);
397 397
 
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
490 490
 		$this->manageDeprecatedCircles();
491 491
 		$users = $this->userManager->search('');
492 492
 		foreach ($users as $user) {
493
-			$books = $this->cardDavBackend->getAddressBooksForUser('principals/users/' . $user->getUID());
493
+			$books = $this->cardDavBackend->getAddressBooksForUser('principals/users/'.$user->getUID());
494 494
 			foreach ($books as $book) {
495 495
 				$this->migrateBook($book['id']);
496 496
 			}
Please login to merge, or discard this patch.
lib/Migration/Version0017Date20200202112903.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -273,7 +273,7 @@
 block discarded – undo
273 273
 			}
274 274
 
275 275
 			$ak = array_keys($default);
276
-			foreach($ak as $k) {
276
+			foreach ($ak as $k) {
277 277
 //				if (!array_key_exists($k, $row)) {
278 278
 					$copy->setValue($k, $copy->createNamedParameter($default[$k]));
279 279
 //				}
Please login to merge, or discard this patch.
lib/Controller/SharesController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	 */
132 132
 	public function create($circleUniqueId, $source, $type, $payload) {
133 133
 
134
-		$this->miscService->log('Creating circle share: ' . $circleUniqueId, 0);
134
+		$this->miscService->log('Creating circle share: '.$circleUniqueId, 0);
135 135
 
136 136
 		try {
137 137
 			$share = new SharingFrame($source, $type);
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 
140 140
 			$this->sharingFrameService->createFrame($circleUniqueId, $share);
141 141
 		} catch (\Exception $e) {
142
-			$this->miscService->log('Failed to create circle - ' . $e->getMessage(), 3);
142
+			$this->miscService->log('Failed to create circle - '.$e->getMessage(), 3);
143 143
 			return $this->fail(
144 144
 				[
145 145
 					'circle_id' => $circleUniqueId,
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 			);
152 152
 		}
153 153
 
154
-		$this->miscService->log('Created circle: share ' . $circleUniqueId, 0);
154
+		$this->miscService->log('Created circle: share '.$circleUniqueId, 0);
155 155
 
156 156
 		return $this->success(
157 157
 			[
Please login to merge, or discard this patch.
lib/Command/CirclesDetails.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
 
87 87
 		$circle = $this->circlesRequest->forceGetCircle($circleId);
88 88
 
89
-		echo json_encode($circle, JSON_PRETTY_PRINT) . "\n";
89
+		echo json_encode($circle, JSON_PRETTY_PRINT)."\n";
90 90
 
91 91
 		return 0;
92 92
 	}
Please login to merge, or discard this patch.
lib/Command/MembersCreate.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 		];
120 120
 
121 121
 		if (!key_exists(strtolower($level), $levels)) {
122
-			throw new Exception('unknown level: ' . json_encode(array_keys($levels)));
122
+			throw new Exception('unknown level: '.json_encode(array_keys($levels)));
123 123
 		}
124 124
 
125 125
 		$level = $levels[strtolower($level)];
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 		$this->membersService->levelMember($circleId, $userId, Member::TYPE_USER, $level, true);
129 129
 
130 130
 		$member = $this->membersRequest->forceGetMember($circleId, $userId, Member::TYPE_USER);
131
-		echo json_encode($member, JSON_PRETTY_PRINT) . "\n";
131
+		echo json_encode($member, JSON_PRETTY_PRINT)."\n";
132 132
 
133 133
 		return 0;
134 134
 	}
Please login to merge, or discard this patch.
lib/Command/MembersLevel.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 		];
112 112
 
113 113
 		if (!key_exists(strtolower($level), $levels)) {
114
-			throw new Exception('unknown level: ' . json_encode(array_keys($levels)));
114
+			throw new Exception('unknown level: '.json_encode(array_keys($levels)));
115 115
 		}
116 116
 
117 117
 		$level = $levels[strtolower($level)];
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 		$member = $this->membersRequest->forceGetMember(
125 125
 			$member->getCircleId(), $member->getUserId(), Member::TYPE_USER
126 126
 		);
127
-		echo json_encode($member, JSON_PRETTY_PRINT) . "\n";
127
+		echo json_encode($member, JSON_PRETTY_PRINT)."\n";
128 128
 
129 129
 		return 0;
130 130
 	}
Please login to merge, or discard this patch.
lib/Command/CirclesList.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
 		$circles = $this->getCircles($owner, $viewer);
98 98
 
99 99
 		if ($json) {
100
-			echo json_encode($circles, JSON_PRETTY_PRINT) . "\n";
100
+			echo json_encode($circles, JSON_PRETTY_PRINT)."\n";
101 101
 
102 102
 			return 0;
103 103
 		}
Please login to merge, or discard this patch.
lib/Command/MembersList.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
 		$members = $this->membersRequest->forceGetMembers($circleId);
101 101
 
102 102
 		if ($json) {
103
-			echo json_encode($members, JSON_PRETTY_PRINT) . "\n";
103
+			echo json_encode($members, JSON_PRETTY_PRINT)."\n";
104 104
 
105 105
 			return 0;
106 106
 		}
Please login to merge, or discard this patch.
lib/Command/CirclesCreate.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 		];
126 126
 
127 127
 		if (!key_exists(strtolower($type), $types)) {
128
-			throw new CircleTypeNotValidException('unknown type: ' . json_encode(array_keys($types)));
128
+			throw new CircleTypeNotValidException('unknown type: '.json_encode(array_keys($types)));
129 129
 		}
130 130
 
131 131
 		$type = $types[strtolower($type)];
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 		$circle = $this->circlesService->createCircle($type, $name, $ownerId);
134 134
 		$circle = $this->circlesRequest->forceGetCircle($circle->getUniqueId());
135 135
 
136
-		echo json_encode($circle, JSON_PRETTY_PRINT) . "\n";
136
+		echo json_encode($circle, JSON_PRETTY_PRINT)."\n";
137 137
 
138 138
 		return 0;
139 139
 	}
Please login to merge, or discard this patch.