Completed
Pull Request — master (#692)
by John
37s
created
lib/Service/MiscService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -284,7 +284,7 @@
 block discarded – undo
284 284
 		ob_start();
285 285
 		echo(json_encode($result));
286 286
 		$size = ob_get_length();
287
-		header('Content-Length: ' . $size);
287
+		header('Content-Length: '.$size);
288 288
 		ob_end_flush();
289 289
 		flush();
290 290
 	}
Please login to merge, or discard this patch.
lib/Service/MembersService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -323,7 +323,7 @@
 block discarded – undo
323 323
 			return;
324 324
 		}
325 325
 
326
-		$tmpContact = $this->userId . ':' . $ident;
326
+		$tmpContact = $this->userId.':'.$ident;
327 327
 		$result = MiscService::getContactData($tmpContact);
328 328
 		if (empty($result)) {
329 329
 			throw new NoUserException($this->l10n->t("This contact is not available"));
Please login to merge, or discard this patch.
lib/Model/DavCard.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@
 block discarded – undo
146 146
 	 * @return string
147 147
 	 */
148 148
 	public function getUniqueId(): string {
149
-		return $this->getAddressBookId() . '/' . $this->getCardUri();
149
+		return $this->getAddressBookId().'/'.$this->getCardUri();
150 150
 	}
151 151
 
152 152
 
Please login to merge, or discard this patch.
lib/GlobalScale/GSMount/MountManager.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/Db/GSSharesRequest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -121,11 +121,11 @@
 block discarded – undo
121 121
 
122 122
 	private function leftJoinMountPoint(IQueryBuilder $qb, string $userId) {
123 123
 		$expr = $qb->expr();
124
-		$pf = '' . $this->default_select_alias . '.';
124
+		$pf = ''.$this->default_select_alias.'.';
125 125
 
126 126
 		$on = $expr->andX();
127 127
 		$on->add($expr->eq('mp.user_id', $qb->createNamedParameter($userId)));
128
-		$on->add($expr->eq('mp.share_id', $pf . 'id'));
128
+		$on->add($expr->eq('mp.share_id', $pf.'id'));
129 129
 
130 130
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
131 131
 		$qb->selectAlias('mp.mountPoint', 'gsshares_mountpoint')
Please login to merge, or discard this patch.
lib/GlobalScale/GSMount/MountProvider.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -148,13 +148,13 @@
 block discarded – undo
148 148
 		}
149 149
 
150 150
 		$info = pathinfo($share->getMountPoint());
151
-		$filename = $this->get('dirname', $info) . '/' . $this->get('filename', $info);
151
+		$filename = $this->get('dirname', $info).'/'.$this->get('filename', $info);
152 152
 		$extension = $this->get('extension', $info);
153
-		$extension = ($extension === '') ? '' : '.' . $extension;
153
+		$extension = ($extension === '') ? '' : '.'.$extension;
154 154
 
155 155
 		$n = 2;
156 156
 		while (true) {
157
-			$path = $filename . " ($n)" . $extension;
157
+			$path = $filename." ($n)".$extension;
158 158
 			try {
159 159
 				$fs->get($path);
160 160
 			} catch (NotFoundException $e) {
Please login to merge, or discard this patch.
lib/Command/SyncContact.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -119,9 +119,9 @@  discard block
 block discarded – undo
119 119
 		$tCards = $tBooks = 0;
120 120
 		$knownBooks = [];
121 121
 		foreach ($users as $user) {
122
-			$books = $this->cardDavBackend->getAddressBooksForUser('principals/users/' . $user->getUID());
122
+			$books = $this->cardDavBackend->getAddressBooksForUser('principals/users/'.$user->getUID());
123 123
 			$output->writeln(
124
-				'- User <info>' . $user->getUID() . '</info> have ' . sizeof($books) . ' address books:'
124
+				'- User <info>'.$user->getUID().'</info> have '.sizeof($books).' address books:'
125 125
 			);
126 126
 
127 127
 			$tBooks += sizeof($books);
@@ -137,11 +137,11 @@  discard block
 block discarded – undo
137 137
 
138 138
 				$shared = '';
139 139
 				if ($owner !== $user->getUID()) {
140
-					$shared = ' (shared by <info>' . $owner . '</info>)';
140
+					$shared = ' (shared by <info>'.$owner.'</info>)';
141 141
 				}
142 142
 
143 143
 				$output->writeln(
144
-					'  <comment>*</comment> book #' . $bookId . $shared . ' contains '
144
+					'  <comment>*</comment> book #'.$bookId.$shared.' contains '
145 145
 					. sizeof($cards)
146 146
 					. ' entries'
147 147
 				);
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 		}
152 152
 
153 153
 		$output->writeln('');
154
-		$output->writeln('with a total of ' . $tBooks . ' address books and ' . $tCards . ' contact entries');
154
+		$output->writeln('with a total of '.$tBooks.' address books and '.$tCards.' contact entries');
155 155
 	}
156 156
 
157 157
 
Please login to merge, or discard this patch.
lib/GlobalScale/GlobalSync.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -116,13 +116,13 @@  discard block
 block discarded – undo
116 116
 				}
117 117
 
118 118
 				$this->miscService->log(
119
-					'updating member :' . json_encode($member) . ' from ' . json_encode($knownMember), 2
119
+					'updating member :'.json_encode($member).' from '.json_encode($knownMember), 2
120 120
 				);
121 121
 				$this->membersRequest->updateMemberLevel($member);
122 122
 			} catch (MemberDoesNotExistException $e) {
123 123
 				try {
124 124
 					$this->miscService->log(
125
-						'creating member :' . json_encode($member), 2
125
+						'creating member :'.json_encode($member), 2
126 126
 					);
127 127
 					$this->membersRequest->createMember($member);
128 128
 				} catch (MemberAlreadyExistsException $e) {
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 			try {
141 141
 				$this->getMember($knownItem, $circle->getMembers(), $source);
142 142
 			} catch (MemberDoesNotExistException $e) {
143
-				$this->miscService->log('removing deprecated member :' . json_encode($knownItem), 2);
143
+				$this->miscService->log('removing deprecated member :'.json_encode($knownItem), 2);
144 144
 				$this->membersRequest->removeMember($knownItem);
145 145
 				$this->gsSharesRequest->removeGSSharesFromMember($knownItem);
146 146
 			}
Please login to merge, or discard this patch.
lib/Service/GSUpstreamService.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 			}
151 151
 		} catch (Exception $e) {
152 152
 			$this->miscService->log(
153
-				get_class($e) . ' on new event: ' . $e->getMessage() . ' - ' . json_encode($event), 1
153
+				get_class($e).' on new event: '.$e->getMessage().' - '.json_encode($event), 1
154 154
 			);
155 155
 			throw $e;
156 156
 		}
@@ -246,13 +246,13 @@  discard block
 block discarded – undo
246 246
 		$request->setDataSerialize($event);
247 247
 
248 248
 		$result = $this->retrieveJson($request);
249
-		$this->miscService->log('result ' . json_encode($result), 0);
249
+		$this->miscService->log('result '.json_encode($result), 0);
250 250
 		if ($this->getInt('status', $result) === 0) {
251 251
 			throw new GlobalScaleEventException($this->get('error', $result));
252 252
 		}
253 253
 
254 254
 		$updatedData = $this->getArray('event', $result);
255
-		$this->miscService->log('updatedEvent: ' . json_encode($updatedData), 0);
255
+		$this->miscService->log('updatedEvent: '.json_encode($updatedData), 0);
256 256
 		if (!empty($updatedData)) {
257 257
 			$updated = new GSEvent();
258 258
 			try {
Please login to merge, or discard this patch.