Completed
Pull Request — master (#551)
by Maxence
02:18
created
lib/Service/FederatedShareService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@
 block discarded – undo
110 110
 		/** @var FederatedShare $share */
111 111
 		$share = $data->gObj('federatedShare', FederatedShare::class);
112 112
 		if ($share->getLockStatus() === ItemLock::STATUS_INSTANCE_LOCKED) {
113
-			throw new FederatedShareAlreadyLockedException('item already locked by ' . $share->getInstance());
113
+			throw new FederatedShareAlreadyLockedException('item already locked by '.$share->getInstance());
114 114
 		}
115 115
 
116 116
 		return $share;
Please login to merge, or discard this patch.
lib/Model/Member.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -557,29 +557,29 @@  discard block
 block discarded – undo
557 557
 	 * @throws MemberNotFoundException
558 558
 	 */
559 559
 	public function importFromDatabase(array $data, string $prefix = ''): INC21QueryRow {
560
-		if (!array_key_exists($prefix . 'member_id', $data)) {
560
+		if (!array_key_exists($prefix.'member_id', $data)) {
561 561
 			throw new MemberNotFoundException();
562 562
 		}
563 563
 
564
-		$this->setId($this->get($prefix . 'member_id', $data));
565
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
566
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
567
-		$this->setUserId($this->get($prefix . 'user_id', $data));
568
-		$this->setUserType($this->getInt($prefix . 'user_type', $data));
569
-		$this->setInstance($this->get($prefix . 'instance', $data));
570
-		$this->setLevel($this->getInt($prefix . 'level', $data));
571
-		$this->setStatus($this->get($prefix . 'status', $data));
572
-		$this->setDisplayName($this->get($prefix . 'cached_name', $data));
573
-		$this->setNote($this->get($prefix . 'note', $data));
574
-		$this->setContactId($this->get($prefix . 'contact_id', $data));
575
-		$this->setContactMeta($this->get($prefix . 'contact_meta', $data));
576
-
577
-		$cachedUpdate = $this->get($prefix . 'cached_update', $data);
564
+		$this->setId($this->get($prefix.'member_id', $data));
565
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
566
+		$this->setSingleId($this->get($prefix.'single_id', $data));
567
+		$this->setUserId($this->get($prefix.'user_id', $data));
568
+		$this->setUserType($this->getInt($prefix.'user_type', $data));
569
+		$this->setInstance($this->get($prefix.'instance', $data));
570
+		$this->setLevel($this->getInt($prefix.'level', $data));
571
+		$this->setStatus($this->get($prefix.'status', $data));
572
+		$this->setDisplayName($this->get($prefix.'cached_name', $data));
573
+		$this->setNote($this->get($prefix.'note', $data));
574
+		$this->setContactId($this->get($prefix.'contact_id', $data));
575
+		$this->setContactMeta($this->get($prefix.'contact_meta', $data));
576
+
577
+		$cachedUpdate = $this->get($prefix.'cached_update', $data);
578 578
 		if ($cachedUpdate !== '') {
579 579
 			$this->setDisplayUpdate(DateTime::createFromFormat('Y-m-d H:i:s', $cachedUpdate)->getTimestamp());
580 580
 		}
581 581
 
582
-		$joined = $this->get($prefix . 'joined', $data);
582
+		$joined = $this->get($prefix.'joined', $data);
583 583
 		if ($joined !== '') {
584 584
 			$this->setJoined(DateTime::createFromFormat('Y-m-d H:i:s', $joined)->getTimestamp());
585 585
 		}
@@ -608,7 +608,7 @@  discard block
 block discarded – undo
608 608
 
609 609
 		if (!$level) {
610 610
 			$all = implode(', ', array_values(self::$DEF_LEVEL));
611
-			throw new ParseMemberLevelException('Available levels: ' . $all);
611
+			throw new ParseMemberLevelException('Available levels: '.$all);
612 612
 		}
613 613
 
614 614
 		return (int)$level;
@@ -626,7 +626,7 @@  discard block
 block discarded – undo
626 626
 
627 627
 		if (!$type) {
628 628
 			$all = implode(', ', array_values(self::$DEF_TYPE));
629
-			throw new UserTypeNotFoundException('Available types: ' . $all);
629
+			throw new UserTypeNotFoundException('Available types: '.$all);
630 630
 		}
631 631
 
632 632
 		return (int)$type;
Please login to merge, or discard this patch.