Completed
Pull Request — master (#459)
by Maxence
01:52
created
lib/Service/GSUpstreamService.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -354,7 +354,7 @@
 block discarded – undo
354 354
 
355 355
 
356 356
 	/**
357
-	 * @param array $circles
357
+	 * @param Circle[] $circles
358 358
 	 */
359 359
 	public function synchronizeCircles(array $circles): void {
360 360
 		$event = new GSEvent(GSEvent::GLOBAL_SYNC, true);
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -145,12 +145,12 @@  discard block
 block discarded – undo
145 145
 			} else {
146 146
 //				$gs->verify($event); // needed ? as we check event on the 'master' of the circle
147 147
 				$this->confirmEvent($event);
148
-				$this->miscService->log('confirmed: ' . json_encode($event));
148
+				$this->miscService->log('confirmed: '.json_encode($event));
149 149
 //				$gs->manage($event); // needed ? as we manage it throw the confirmEvent
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
 		}
@@ -239,13 +239,13 @@  discard block
 block discarded – undo
239 239
 		$request->setDataSerialize($event);
240 240
 
241 241
 		$result = $this->retrieveJson($request);
242
-		$this->miscService->log('result ' . json_encode($result));
242
+		$this->miscService->log('result '.json_encode($result));
243 243
 		if ($this->getInt('status', $result) === 0) {
244 244
 			throw new GlobalScaleEventException($this->get('error', $result));
245 245
 		}
246 246
 
247 247
 		$updatedData = $this->getArray('event', $result);
248
-		$this->miscService->log('updatedEvent: ' . json_encode($updatedData));
248
+		$this->miscService->log('updatedEvent: '.json_encode($updatedData));
249 249
 		if (!empty($updatedData)) {
250 250
 			$updated = new GSEvent();
251 251
 			try {
Please login to merge, or discard this patch.
lib/Service/GlobalScaleService.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -167,12 +167,12 @@  discard block
 block discarded – undo
167 167
 		try {
168 168
 			$gs = OC::$server->query($class);
169 169
 			if (!$gs instanceof AGlobalScaleEvent) {
170
-				throw new GlobalScaleEventException($class . ' not an AGlobalScaleEvent');
170
+				throw new GlobalScaleEventException($class.' not an AGlobalScaleEvent');
171 171
 			}
172 172
 
173 173
 			return $gs;
174 174
 		} catch (QueryException $e) {
175
-			throw new GlobalScaleEventException('AGlobalScaleEvent ' . $class . ' not found');
175
+			throw new GlobalScaleEventException('AGlobalScaleEvent '.$class.' not found');
176 176
 		}
177 177
 	}
178 178
 
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 			$key = $this->configService->getSystemValue('instanceid');
189 189
 		}
190 190
 
191
-		return md5('gskey:' . $key);
191
+		return md5('gskey:'.$key);
192 192
 	}
193 193
 
194 194
 	/**
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 				$instances = $this->retrieveJson($request);
234 234
 			} catch (RequestContentException | RequestNetworkException | RequestResultSizeException | RequestServerException | RequestResultNotJsonException $e) {
235 235
 				$this->miscService->log(
236
-					'Issue while retrieving instances from lookup: ' . get_class($e) . ' ' . $e->getMessage()
236
+					'Issue while retrieving instances from lookup: '.get_class($e).' '.$e->getMessage()
237 237
 				);
238 238
 
239 239
 				return [];
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 		$className = $event->getType();
261 261
 		if (substr($className, 0, 25) !== '\OCA\Circles\GlobalScale\\' || strpos($className, '.')) {
262 262
 			throw new GlobalScaleEventException(
263
-				$className . ' does not seems to be a secured AGlobalScaleEvent'
263
+				$className.' does not seems to be a secured AGlobalScaleEvent'
264 264
 			);
265 265
 		}
266 266
 
Please login to merge, or discard this patch.
lib/Service/ConfigService.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -244,12 +244,12 @@
 block discarded – undo
244 244
 	}
245 245
 
246 246
 		/**
247
-	 * Get a value by key
248
-	 *
249
-	 * @param string $key
250
-	 *
251
-	 * @return string
252
-	 */
247
+		 * Get a value by key
248
+		 *
249
+		 * @param string $key
250
+		 *
251
+		 * @return string
252
+		 */
253 253
 	public function getSystemValue($key) {
254 254
 		$defaultValue = null;
255 255
 
Please login to merge, or discard this patch.
lib/GlobalScale/MemberAdd.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 			$this->sendMailExistingShares($template, $author, $recipient);
178 178
 			$this->sendPasswordExistingShares($author, $recipient, $password);
179 179
 		} catch (Exception $e) {
180
-			$this->miscService->log('Failed to send mail about existing share ' . $e->getMessage());
180
+			$this->miscService->log('Failed to send mail about existing share '.$e->getMessage());
181 181
 		}
182 182
 	}
183 183
 
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
328 328
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
329 329
 
330
-		$this->miscService->log("Sending password mail about existing files to '" . $email . "'", 0);
330
+		$this->miscService->log("Sending password mail about existing files to '".$email."'", 0);
331 331
 
332 332
 		$plainBodyPart = $this->l10n->t(
333 333
 			"%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n",
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
370 370
 		if ($authorEmail !== null) {
371 371
 			$message->setReplyTo([$authorEmail => $authorName]);
372
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
372
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
373 373
 		} else {
374 374
 			$emailTemplate->addFooter();
375 375
 		}
Please login to merge, or discard this patch.
lib/Search/GlobalScaleUsers.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@
 block discarded – undo
98 98
 		RequestServerException |
99 99
 		RequestResultNotJsonException $e
100 100
 		) {
101
-			$this->miscService->log('Issue while retrieving instances from lookup: ' . get_class($e) . ' ' . $e->getMessage());
101
+			$this->miscService->log('Issue while retrieving instances from lookup: '.get_class($e).' '.$e->getMessage());
102 102
 
103 103
 			return [];
104 104
 		}
Please login to merge, or discard this patch.