Completed
Pull Request — master (#1034)
by Maxence
34s
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/Model/Debug.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -193,14 +193,14 @@
 block discarded – undo
193 193
 	 * @throws InvalidItemException
194 194
 	 */
195 195
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
196
-		if (empty($this->getArray($prefix . 'debug', $data))) {
196
+		if (empty($this->getArray($prefix.'debug', $data))) {
197 197
 			throw new InvalidItemException();
198 198
 		}
199 199
 
200
-		$this->setThread($this->get($prefix . 'thread', $data));
201
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
202
-		$this->setInstance($this->get($prefix . 'instance', $data));
203
-		$this->setTime($this->getInt($prefix . 'time', $data));
200
+		$this->setThread($this->get($prefix.'thread', $data));
201
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
202
+		$this->setInstance($this->get($prefix.'instance', $data));
203
+		$this->setTime($this->getInt($prefix.'time', $data));
204 204
 
205 205
 		/** @var ReferencedDataStore $store */
206 206
 		$store = $this->deserialize($this->getArray('debug', $data), ReferencedDataStore::class);
Please login to merge, or discard this patch.
lib/Command/CirclesDebug.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 		stream_set_blocking(STDIN, false);
130 130
 		readline_callback_handler_install(
131 131
 			'',
132
-			function () {
132
+			function() {
133 133
 			}
134 134
 		);
135 135
 
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 		for ($i = 0; $i < $this->topPanel->getMaxLines(); $i++) {
187 187
 			$lines[] = '%topPanelFrameColor%│</>'
188 188
 					   . $this->incrementString($i, 'topPanelCurrentLine', '%')
189
-					   . '</>' . $this->incrementstring($i, 'lineT', '%');
189
+					   . '</>'.$this->incrementstring($i, 'lineT', '%');
190 190
 
191 191
 			$this->update($this->incrementString($i, 'topPanelCurrentLine'), ' ');
192 192
 			$this->update($this->incrementString($i, 'lineT'), '');
@@ -198,8 +198,8 @@  discard block
 block discarded – undo
198 198
 
199 199
 		for ($i = 0; $i < $this->bottomLeftPanel->getMaxLines(); $i++) {
200 200
 			$lines[] = '%bottomLeftPanelFrameColor%│</>'
201
-					   . $this->incrementString($i, 'bottomLeftPanelCurrentLine', '%') . ' '
202
-					   . $this->incrementString($i, 'keyBL', '%') . ' '
201
+					   . $this->incrementString($i, 'bottomLeftPanelCurrentLine', '%').' '
202
+					   . $this->incrementString($i, 'keyBL', '%').' '
203 203
 					   . $this->incrementString($i, 'lineBL', ':30s%')
204 204
 					   . ' %bottomLeftPanelFrameColor%│</>'
205 205
 
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 		$lines[] = '%bottomLeftPanelFrameColor%└─────────────────────────────────┘</>';
215 215
 
216 216
 //		$this->display->clear();
217
-		$this->display->setFormat(implode("\n", $lines) . "\n");
217
+		$this->display->setFormat(implode("\n", $lines)."\n");
218 218
 		$this->display->start();
219 219
 	}
220 220
 
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
 				$instance = ($this->configService->isLocalInstance($item->getInstance())) ?
244 244
 					'local' : $item->getInstance();
245 245
 
246
-				$line = '<fg=white>' . $instance . '</> - ';
246
+				$line = '<fg=white>'.$instance.'</> - ';
247 247
 				$action = $debug->g(DebugService::ACTION);
248 248
 
249 249
 				preg_match_all('/{((?:[^{}]*|(?R))*)}/x', $action, $match);
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
 
263 263
 					$value = $this->get($path, $debug->jsonSerialize());
264 264
 					$action =
265
-						str_replace('{' . $entry . '}', '<fg=' . $color . '>' . $value . '</>', $action);
265
+						str_replace('{'.$entry.'}', '<fg='.$color.'>'.$value.'</>', $action);
266 266
 				}
267 267
 
268 268
 				$selectableLines++;
@@ -485,7 +485,7 @@  discard block
 block discarded – undo
485 485
 
486 486
 				$this->update(
487 487
 					$this->incrementString($i, 'lineBL'),
488
-					'circle (' . $type . ')'
488
+					'circle ('.$type.')'
489 489
 				);
490 490
 			}
491 491
 		}
@@ -551,10 +551,10 @@  discard block
 block discarded – undo
551 551
 		}
552 552
 
553 553
 		if ($wrapper !== '') {
554
-			$prefix = '%' . $prefix;
554
+			$prefix = '%'.$prefix;
555 555
 		}
556 556
 
557
-		return $prefix . $result . $wrapper;
557
+		return $prefix.$result.$wrapper;
558 558
 	}
559 559
 
560 560
 }
Please login to merge, or discard this patch.