Completed
Pull Request — master (#1034)
by Maxence
57s
created
lib/Model/SyncedItemLock.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -203,14 +203,14 @@
 block discarded – undo
203 203
 	 * @throws ShareTokenNotFoundException
204 204
 	 */
205 205
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
206
-		if ($this->get($prefix . 'token', $data) === '') {
206
+		if ($this->get($prefix.'token', $data) === '') {
207 207
 			throw new ShareTokenNotFoundException();
208 208
 		}
209 209
 
210
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
211
-		$this->setUpdateType($this->get($prefix . 'update_type', $data));
212
-		$this->setUpdateTypeId($this->get($prefix . 'update_type_id', $data));
213
-		$this->setTime($this->getInt($prefix . 'time', $data));
210
+		$this->setSingleId($this->get($prefix.'single_id', $data));
211
+		$this->setUpdateType($this->get($prefix.'update_type', $data));
212
+		$this->setUpdateTypeId($this->get($prefix.'update_type_id', $data));
213
+		$this->setTime($this->getInt($prefix.'time', $data));
214 214
 
215 215
 		return $this;
216 216
 	}
Please login to merge, or discard this patch.
lib/FederatedItems/FederatedSync/ShareCreation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@
 block discarded – undo
116 116
 //	If it does, compare with appId, itemType, itemId and confirm instance=instance1.
117 117
 //	instance3 send a signed request to instance1 to retrieve content of the shared item, based on itemSingleId, appId, itemType, itemId, circleId.
118 118
 
119
-		echo '___ ' . json_encode($syncedItem);
119
+		echo '___ '.json_encode($syncedItem);
120 120
 
121 121
 
122 122
 	}
Please login to merge, or discard this patch.
lib/Service/FederatedSyncService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@
 block discarded – undo
132 132
 			$syncedItem
133 133
 		);
134 134
 
135
-		echo 'reached !? ' . json_encode($data) . "\n";
135
+		echo 'reached !? '.json_encode($data)."\n";
136 136
 	}
137 137
 
138 138
 }
Please login to merge, or discard this patch.
lib/Model/SyncedItem.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -260,18 +260,18 @@
 block discarded – undo
260 260
 	 * @throws SyncedItemNotFoundException
261 261
 	 */
262 262
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
263
-		if ($this->get($prefix . 'single_id', $data) === '') {
263
+		if ($this->get($prefix.'single_id', $data) === '') {
264 264
 			throw new SyncedItemNotFoundException();
265 265
 		}
266 266
 
267
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
268
-		$this->setInstance($this->get($prefix . 'instance', $data));
269
-		$this->setInstance($this->get($prefix . 'instance', $data));
270
-		$this->setAppId($this->get($prefix . 'app_id', $data));
271
-		$this->setItemType($this->get($prefix . 'item_type', $data));
272
-		$this->setItemId($this->get($prefix . 'item_id', $data));
273
-		$this->setChecksum($this->get($prefix . 'checksum', $data));
274
-		$this->setDeleted($this->getBool($prefix . 'deleted', $data));
267
+		$this->setSingleId($this->get($prefix.'single_id', $data));
268
+		$this->setInstance($this->get($prefix.'instance', $data));
269
+		$this->setInstance($this->get($prefix.'instance', $data));
270
+		$this->setAppId($this->get($prefix.'app_id', $data));
271
+		$this->setItemType($this->get($prefix.'item_type', $data));
272
+		$this->setItemId($this->get($prefix.'item_id', $data));
273
+		$this->setChecksum($this->get($prefix.'checksum', $data));
274
+		$this->setDeleted($this->getBool($prefix.'deleted', $data));
275 275
 
276 276
 		if ($this->getInstance() === '') {
277 277
 			$this->setInstance($this->getManager()->getLocalInstance());
Please login to merge, or discard this patch.
lib/Model/SyncedShare.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -133,12 +133,12 @@
 block discarded – undo
133 133
 	 * @throws SyncedShareNotFoundException
134 134
 	 */
135 135
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
136
-		if ($this->get($prefix . 'single_id', $data) === '') {
136
+		if ($this->get($prefix.'single_id', $data) === '') {
137 137
 			throw new SyncedShareNotFoundException();
138 138
 		}
139 139
 
140
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
141
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
140
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
141
+		$this->setSingleId($this->get($prefix.'single_id', $data));
142 142
 
143 143
 		return $this;
144 144
 	}
Please login to merge, or discard this patch.
lib/Tools/Model/ReferencedDataStore.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 		try {
235 235
 			$reflection = new ReflectionClass($class);
236 236
 		} catch (ReflectionException $e) {
237
-			throw new InvalidItemException('reflection issue with ' . $class);
237
+			throw new InvalidItemException('reflection issue with '.$class);
238 238
 		}
239 239
 
240 240
 		if (!$reflection->implementsInterface(IDeserializable::class)) {
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
 	 * @return string
355 355
 	 */
356 356
 	private function getRef(string $key, string $ref): string {
357
-		return $this->get($key . '.' . $ref, $this->ref);
357
+		return $this->get($key.'.'.$ref, $this->ref);
358 358
 	}
359 359
 
360 360
 	/**
Please login to merge, or discard this patch.
lib/Controller/RemoteController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -255,7 +255,7 @@
 block discarded – undo
255 255
 
256 256
 			return new DataResponse($this->serialize($test));
257 257
 		} catch (Exception $e) {
258
-			\OC::$server->getLogger()->log(3, '___e: ' . $e->getMessage() . ' ' . get_class($e));
258
+			\OC::$server->getLogger()->log(3, '___e: '.$e->getMessage().' '.get_class($e));
259 259
 			return $this->exceptionResponse($e, Http::STATUS_UNAUTHORIZED);
260 260
 		}
261 261
 	}
Please login to merge, or discard this patch.
lib/Model/Debug.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -218,15 +218,15 @@
 block discarded – undo
218 218
 	 * @throws InvalidItemException
219 219
 	 */
220 220
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
221
-		if (empty($this->getArray($prefix . 'debug', $data))) {
221
+		if (empty($this->getArray($prefix.'debug', $data))) {
222 222
 			throw new InvalidItemException();
223 223
 		}
224 224
 
225
-		$this->setId($this->getInt($prefix . 'id', $data));
226
-		$this->setThread($this->get($prefix . 'thread', $data));
227
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
228
-		$this->setInstance($this->get($prefix . 'instance', $data));
229
-		$this->setTime($this->getInt($prefix . 'time', $data));
225
+		$this->setId($this->getInt($prefix.'id', $data));
226
+		$this->setThread($this->get($prefix.'thread', $data));
227
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
228
+		$this->setInstance($this->get($prefix.'instance', $data));
229
+		$this->setTime($this->getInt($prefix.'time', $data));
230 230
 
231 231
 		/** @var ReferencedDataStore $store */
232 232
 		$store = $this->deserialize($this->getArray('debug', $data), ReferencedDataStore::class);
Please login to merge, or discard this patch.
lib/Command/CirclesDebug.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 		stream_set_blocking(STDIN, false);
133 133
 		readline_callback_handler_install(
134 134
 			'',
135
-			function () {
135
+			function() {
136 136
 			}
137 137
 		);
138 138
 
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 
199 199
 		for ($i = 0; $i < $this->bottomLeftPanel->getMaxLines(); $i++) {
200 200
 			$lines[] = '<fg=white>│</>'
201
-					   . $this->incrementString($i, 'bottomLeftPanelCurrentLine', '%') . ' '
201
+					   . $this->incrementString($i, 'bottomLeftPanelCurrentLine', '%').' '
202 202
 					   . $this->incrementString($i, 'lineBL', ':30s%')
203 203
 					   . ' </><fg=white>│</> '
204 204
 					   . $this->incrementString($i, 'lineBR', '%');
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 		$lines[] = '<fg=white>└────────────────────────────────┘</>';
212 212
 
213 213
 //		$this->display->clear();
214
-		$this->display->setFormat(implode("\n", $lines) . "\n");
214
+		$this->display->setFormat(implode("\n", $lines)."\n");
215 215
 		$this->display->start();
216 216
 	}
217 217
 
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
 				$instance = ($this->configService->isLocalInstance($item->getInstance())) ?
266 266
 					'local' : $item->getInstance();
267 267
 
268
-				$line = '<fg=white>' . $instance . '</> - ';
268
+				$line = '<fg=white>'.$instance.'</> - ';
269 269
 				$action = $debug->g(DebugService::ACTION);
270 270
 
271 271
 				preg_match_all('/{((?:[^{}]*|(?R))*)}/x', $action, $match);
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
 
285 285
 					$value = $this->get($path, $debug->jsonSerialize());
286 286
 					$action =
287
-						str_replace('{' . $entry . '}', '<fg=' . $color . '>' . $value . '</>', $action);
287
+						str_replace('{'.$entry.'}', '<fg='.$color.'>'.$value.'</>', $action);
288 288
 				}
289 289
 
290 290
 				$selectableLines++;
@@ -436,7 +436,7 @@  discard block
 block discarded – undo
436 436
 	 * @param string $key
437 437
 	 */
438 438
 	public function keyActionTopPanel(string $key): void {
439
-		\OC::$server->getLogger()->log(3, '___ ' . $key);
439
+		\OC::$server->getLogger()->log(3, '___ '.$key);
440 440
 		switch ($key) {
441 441
 			case 'a':
442 442
 				$done = $this->topPanel->keyUp();
@@ -538,7 +538,7 @@  discard block
 block discarded – undo
538 538
 
539 539
 				$this->update(
540 540
 					$this->incrementString($i, 'lineBL'),
541
-					($i + 1) . '. ' . $name . ' (' . $type . ')'
541
+					($i + 1).'. '.$name.' ('.$type.')'
542 542
 				);
543 543
 			}
544 544
 		}
@@ -644,10 +644,10 @@  discard block
 block discarded – undo
644 644
 		}
645 645
 
646 646
 		if ($wrapper !== '') {
647
-			$prefix = '%' . $prefix;
647
+			$prefix = '%'.$prefix;
648 648
 		}
649 649
 
650
-		return $prefix . $result . $wrapper;
650
+		return $prefix.$result.$wrapper;
651 651
 	}
652 652
 
653 653
 }
Please login to merge, or discard this patch.