Completed
Pull Request — master (#603)
by John
02:40
created
lib/Model/FederatedUser.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -394,14 +394,14 @@
 block discarded – undo
394 394
 	 * @throws FederatedUserNotFoundException
395 395
 	 */
396 396
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
397
-		if ($this->get($prefix . 'single_id', $data) === '') {
397
+		if ($this->get($prefix.'single_id', $data) === '') {
398 398
 			throw new FederatedUserNotFoundException();
399 399
 		}
400 400
 
401
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
402
-		$this->setUserId($this->get($prefix . 'user_id', $data));
403
-		$this->setUserType($this->getInt($prefix . 'user_type', $data));
404
-		$this->setInstance($this->get($prefix . 'instance', $data));
401
+		$this->setSingleId($this->get($prefix.'single_id', $data));
402
+		$this->setUserId($this->get($prefix.'user_id', $data));
403
+		$this->setUserType($this->getInt($prefix.'user_type', $data));
404
+		$this->setInstance($this->get($prefix.'instance', $data));
405 405
 
406 406
 		$this->getManager()->manageImportFromDatabase($this, $data, $prefix);
407 407
 
Please login to merge, or discard this patch.
lib/Model/Mount.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -190,7 +190,7 @@
 block discarded – undo
190 190
 			return $this->mountPoint;
191 191
 		}
192 192
 
193
-		return '/' . $this->getInitiator()->getUserId() . '/files/' . ltrim($this->mountPoint, '/');
193
+		return '/'.$this->getInitiator()->getUserId().'/files/'.ltrim($this->mountPoint, '/');
194 194
 	}
195 195
 
196 196
 	/**
Please login to merge, or discard this patch.
lib/Model/FileCacheWrapper.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -504,29 +504,29 @@
 block discarded – undo
504 504
 	 * @throws FileCacheNotFoundException
505 505
 	 */
506 506
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
507
-		if ($this->getInt($prefix . 'fileid', $data) === 0) {
507
+		if ($this->getInt($prefix.'fileid', $data) === 0) {
508 508
 			throw new FileCacheNotFoundException();
509 509
 		}
510 510
 
511
-		$this->setId($this->getInt($prefix . 'fileid', $data));
512
-		$this->setPath($this->get($prefix . 'path', $data));
513
-		$this->setPermissions($this->getInt($prefix . 'permissions', $data));
514
-		$this->setStorageId($this->getInt($prefix . 'storage', $data));
515
-		$this->setPathHash($this->get($prefix . 'path_hash', $data));
516
-		$this->setParent($this->getInt($prefix . 'parent', $data));
517
-		$this->setName($this->get($prefix . 'name', $data));
518
-		$this->setMimeType($this->getInt($prefix . 'mimetype', $data));
519
-		$this->setMimePart($this->getInt($prefix . 'mimepart', $data));
520
-		$this->setSize($this->getInt($prefix . 'size', $data));
521
-		$this->setMTime($this->getInt($prefix . 'mtime', $data));
522
-		$this->setStorageMTime($this->getInt($prefix . 'storage_mtime', $data));
523
-		$this->setEncrypted($this->getBool($prefix . 'encrypted', $data));
524
-		$this->setUnencryptedSize($this->getInt($prefix . 'unencrypted_size', $data));
525
-		$this->setEtag($this->get($prefix . 'etag', $data));
526
-		$this->setChecksum($this->get($prefix . 'checksum', $data));
511
+		$this->setId($this->getInt($prefix.'fileid', $data));
512
+		$this->setPath($this->get($prefix.'path', $data));
513
+		$this->setPermissions($this->getInt($prefix.'permissions', $data));
514
+		$this->setStorageId($this->getInt($prefix.'storage', $data));
515
+		$this->setPathHash($this->get($prefix.'path_hash', $data));
516
+		$this->setParent($this->getInt($prefix.'parent', $data));
517
+		$this->setName($this->get($prefix.'name', $data));
518
+		$this->setMimeType($this->getInt($prefix.'mimetype', $data));
519
+		$this->setMimePart($this->getInt($prefix.'mimepart', $data));
520
+		$this->setSize($this->getInt($prefix.'size', $data));
521
+		$this->setMTime($this->getInt($prefix.'mtime', $data));
522
+		$this->setStorageMTime($this->getInt($prefix.'storage_mtime', $data));
523
+		$this->setEncrypted($this->getBool($prefix.'encrypted', $data));
524
+		$this->setUnencryptedSize($this->getInt($prefix.'unencrypted_size', $data));
525
+		$this->setEtag($this->get($prefix.'etag', $data));
526
+		$this->setChecksum($this->get($prefix.'checksum', $data));
527 527
 
528 528
 		// small hack as there is no reason to call a recursive method for a single entry from the table
529
-		$this->setStorage($this->get($prefix . CoreQueryBuilder::STORAGES . '_id', $data));
529
+		$this->setStorage($this->get($prefix.CoreQueryBuilder::STORAGES.'_id', $data));
530 530
 
531 531
 		return $this;
532 532
 	}
Please login to merge, or discard this patch.
lib/Model/Helpers/MemberHelper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 		try {
105 105
 			$level = Member::parseLevelString($levelString);
106 106
 		} catch (ParseMemberLevelException $e) {
107
-			throw new MemberHelperException('method ' . $levelString . ' not found');
107
+			throw new MemberHelperException('method '.$levelString.' not found');
108 108
 		}
109 109
 
110 110
 		$this->mustHaveLevelEqualOrAbove($level);
@@ -122,11 +122,11 @@  discard block
 block discarded – undo
122 122
 		try {
123 123
 			$level = Member::parseLevelString($levelString);
124 124
 		} catch (ParseMemberLevelException $e) {
125
-			throw new MemberHelperException('method ' . $levelString . ' not found');
125
+			throw new MemberHelperException('method '.$levelString.' not found');
126 126
 		}
127 127
 
128 128
 		if ($this->member->getLevel() >= $level) {
129
-			throw new MemberLevelException('Member cannot be ' . $levelString);
129
+			throw new MemberLevelException('Member cannot be '.$levelString);
130 130
 		}
131 131
 	}
132 132
 
Please login to merge, or discard this patch.
lib/Model/Membership.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -259,17 +259,17 @@
 block discarded – undo
259 259
 	 * @throws MembershipNotFoundException
260 260
 	 */
261 261
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
262
-		if ($this->get($prefix . 'single_id', $data) === '') {
262
+		if ($this->get($prefix.'single_id', $data) === '') {
263 263
 			throw new MembershipNotFoundException();
264 264
 		}
265 265
 
266
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
267
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
268
-		$this->setLevel($this->getInt($prefix . 'level', $data));
269
-		$this->setInheritanceFirst($this->get($prefix . 'inheritance_first', $data));
270
-		$this->setInheritanceLast($this->get($prefix . 'inheritance_last', $data));
271
-		$this->setInheritancePath($this->getArray($prefix . 'inheritance_path', $data));
272
-		$this->setInheritanceDepth($this->getInt($prefix . 'inheritance_depth', $data));
266
+		$this->setSingleId($this->get($prefix.'single_id', $data));
267
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
268
+		$this->setLevel($this->getInt($prefix.'level', $data));
269
+		$this->setInheritanceFirst($this->get($prefix.'inheritance_first', $data));
270
+		$this->setInheritanceLast($this->get($prefix.'inheritance_last', $data));
271
+		$this->setInheritancePath($this->getArray($prefix.'inheritance_path', $data));
272
+		$this->setInheritanceDepth($this->getInt($prefix.'inheritance_depth', $data));
273 273
 
274 274
 		return $this;
275 275
 	}
Please login to merge, or discard this patch.
lib/Command/MembersLevel.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@
 block discarded – undo
125 125
 		} catch (FederatedItemException $e) {
126 126
 			if ($input->getOption('status-code')) {
127 127
 				throw new FederatedItemException(
128
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
128
+					' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage()
129 129
 				);
130 130
 			}
131 131
 
Please login to merge, or discard this patch.
lib/Command/CirclesLeave.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@
 block discarded – undo
125 125
 		} catch (FederatedItemException $e) {
126 126
 			if ($input->getOption('status-code')) {
127 127
 				throw new FederatedItemException(
128
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
128
+					' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage()
129 129
 				);
130 130
 			}
131 131
 
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
@@ -125,7 +125,7 @@
 block discarded – undo
125 125
 		} catch (FederatedItemException $e) {
126 126
 			if ($input->getOption('status-code')) {
127 127
 				throw new FederatedItemException(
128
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
128
+					' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage()
129 129
 				);
130 130
 			}
131 131
 
Please login to merge, or discard this patch.
lib/Command/CirclesCreate.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@
 block discarded – undo
125 125
 		} catch (FederatedItemException $e) {
126 126
 			if ($input->getOption('status-code')) {
127 127
 				throw new FederatedItemException(
128
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
128
+					' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage()
129 129
 				);
130 130
 			}
131 131
 
Please login to merge, or discard this patch.