Completed
Push — master ( 3aeedd...be0cda )
by Maxence
03:35 queued 11s
created
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.
lib/Command/CirclesJoin.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/CirclesEdit.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/Model/Circle.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
 
359 359
 
360 360
 	/**
361
-	 * @param ?Member $owner
361
+	 * @param Member $owner
362 362
 	 *
363 363
 	 * @return self
364 364
 	 */
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
 
415 415
 
416 416
 	/**
417
-	 * @param array $members
417
+	 * @param Member[] $members
418 418
 	 * @param bool $detailed
419 419
 	 *
420 420
 	 * @return self
Please login to merge, or discard this patch.
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -84,26 +84,26 @@  discard block
 block discarded – undo
84 84
 
85 85
 
86 86
 	// specific value
87
-	const CFG_CIRCLE = 0;        // only for code readability. Circle is locked by default.
88
-	const CFG_SINGLE = 1;        // Circle with only one single member.
89
-	const CFG_PERSONAL = 2;      // Personal circle, only the owner can see it.
87
+	const CFG_CIRCLE = 0; // only for code readability. Circle is locked by default.
88
+	const CFG_SINGLE = 1; // Circle with only one single member.
89
+	const CFG_PERSONAL = 2; // Personal circle, only the owner can see it.
90 90
 
91 91
 	// bitwise
92
-	const CFG_SYSTEM = 4;            // System Circle (not managed by the official front-end). Meaning some config are limited
93
-	const CFG_VISIBLE = 8;           // Visible to everyone, if not visible, people have to know its name to be able to find it
94
-	const CFG_OPEN = 16;             // Circle is open, people can join
95
-	const CFG_INVITE = 32;           // Adding a member generate an invitation that needs to be accepted
96
-	const CFG_REQUEST = 64;          // Request to join Circles needs to be confirmed by a moderator
97
-	const CFG_FRIEND = 128;          // Members of the circle can invite their friends
98
-	const CFG_PROTECTED = 256;       // Password protected to join/request
99
-	const CFG_NO_OWNER = 512;        // no owner, only members
100
-	const CFG_HIDDEN = 1024;         // hidden from listing, but available as a share entity
101
-	const CFG_BACKEND = 2048;            // Fully hidden, only backend Circles
102
-	const CFG_LOCAL = 4096;              // Local even on GlobalScale
103
-	const CFG_ROOT = 8192;               // Circle cannot be inside another Circle
104
-	const CFG_CIRCLE_INVITE = 16384;     // Circle must confirm when invited in another circle
105
-	const CFG_FEDERATED = 32768;         // Federated
106
-	const CFG_MOUNTPOINT = 65536;        // Generate a Files folder for this Circle
92
+	const CFG_SYSTEM = 4; // System Circle (not managed by the official front-end). Meaning some config are limited
93
+	const CFG_VISIBLE = 8; // Visible to everyone, if not visible, people have to know its name to be able to find it
94
+	const CFG_OPEN = 16; // Circle is open, people can join
95
+	const CFG_INVITE = 32; // Adding a member generate an invitation that needs to be accepted
96
+	const CFG_REQUEST = 64; // Request to join Circles needs to be confirmed by a moderator
97
+	const CFG_FRIEND = 128; // Members of the circle can invite their friends
98
+	const CFG_PROTECTED = 256; // Password protected to join/request
99
+	const CFG_NO_OWNER = 512; // no owner, only members
100
+	const CFG_HIDDEN = 1024; // hidden from listing, but available as a share entity
101
+	const CFG_BACKEND = 2048; // Fully hidden, only backend Circles
102
+	const CFG_LOCAL = 4096; // Local even on GlobalScale
103
+	const CFG_ROOT = 8192; // Circle cannot be inside another Circle
104
+	const CFG_CIRCLE_INVITE = 16384; // Circle must confirm when invited in another circle
105
+	const CFG_FEDERATED = 32768; // Federated
106
+	const CFG_MOUNTPOINT = 65536; // Generate a Files folder for this Circle
107 107
 
108 108
 	public static $DEF_CFG_MAX = 131071;
109 109
 
@@ -742,23 +742,23 @@  discard block
 block discarded – undo
742 742
 	 * @throws CircleNotFoundException
743 743
 	 */
744 744
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
745
-		if ($this->get($prefix . 'unique_id', $data) === '') {
745
+		if ($this->get($prefix.'unique_id', $data) === '') {
746 746
 			throw new CircleNotFoundException();
747 747
 		}
748 748
 
749
-		$this->setSingleId($this->get($prefix . 'unique_id', $data))
750
-			 ->setName($this->get($prefix . 'name', $data))
751
-			 ->setDisplayName($this->get($prefix . 'display_name', $data))
752
-			 ->setSanitizedName($this->get($prefix . 'sanitized_name', $data))
753
-			 ->setConfig($this->getInt($prefix . 'config', $data))
754
-			 ->setSource($this->getInt($prefix . 'source', $data))
755
-			 ->setInstance($this->get($prefix . 'instance', $data))
756
-			 ->setSettings($this->getArray($prefix . 'settings', $data))
757
-			 ->setContactAddressBook($this->getInt($prefix . 'contact_addressbook', $data))
758
-			 ->setContactGroupName($this->get($prefix . 'contact_groupname', $data))
759
-			 ->setDescription($this->get($prefix . 'description', $data));
760
-
761
-		$creation = $this->get($prefix . 'creation', $data);
749
+		$this->setSingleId($this->get($prefix.'unique_id', $data))
750
+			 ->setName($this->get($prefix.'name', $data))
751
+			 ->setDisplayName($this->get($prefix.'display_name', $data))
752
+			 ->setSanitizedName($this->get($prefix.'sanitized_name', $data))
753
+			 ->setConfig($this->getInt($prefix.'config', $data))
754
+			 ->setSource($this->getInt($prefix.'source', $data))
755
+			 ->setInstance($this->get($prefix.'instance', $data))
756
+			 ->setSettings($this->getArray($prefix.'settings', $data))
757
+			 ->setContactAddressBook($this->getInt($prefix.'contact_addressbook', $data))
758
+			 ->setContactGroupName($this->get($prefix.'contact_groupname', $data))
759
+			 ->setDescription($this->get($prefix.'description', $data));
760
+
761
+		$creation = $this->get($prefix.'creation', $data);
762 762
 		$this->setCreation(DateTime::createFromFormat('Y-m-d H:i:s', $creation)->getTimestamp());
763 763
 
764 764
 		$this->getManager()->manageImportFromDatabase($this, $data, $prefix);
Please login to merge, or discard this patch.
lib/Db/CircleProviderRequest.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -40,10 +40,10 @@
 block discarded – undo
40 40
 
41 41
 
42 42
 	/**
43
-	 * @param $userId
43
+	 * @param string $userId
44 44
 	 * @param $circleUniqueIds
45
-	 * @param $limit
46
-	 * @param $offset
45
+	 * @param integer $limit
46
+	 * @param integer $offset
47 47
 	 *
48 48
 	 * @return array
49 49
 	 * @throws GSStatusException
Please login to merge, or discard this patch.