remove $gid from PosixGroup

Author: simonLeary42

resources/lib/PosixGroup.php

@@ -12,11 +12,9 @@
 class PosixGroup
 {
     protected LDAPEntry $entry;
-    public string $gid;
 
-    public function __construct(LDAPEntry $entry, string $gid)
+    public function __construct(LDAPEntry $entry)
     {
-        $this->gid = $gid;
         $this->entry = $entry;
     }
 
@@ -37,11 +35,6 @@ public function equals(PosixGroup $other_group): bool
         return $this->getDN() == $other_group->getDN();
     }
 
-    public function __toString(): string
-    {
-        return $this->gid;
-    }
-
     public function exists(): bool
     {
         return $this->entry->exists();

resources/lib/UnityGroup.php

@@ -11,6 +11,7 @@
 class UnityGroup extends PosixGroup
 {
     public const string PI_PREFIX = "pi_";
+    public string $gid;
     private UnityLDAP $LDAP;
     private UnitySQL $SQL;
     private UnityMailer $MAILER;
@@ -23,14 +24,18 @@ public function __construct(
         UnityMailer $MAILER,
         UnityWebhook $WEBHOOK,
     ) {
-        $gid = trim($gid);
-        parent::__construct($LDAP->getPIGroupEntry($gid), $gid);
+        parent::__construct($LDAP->getPIGroupEntry(trim($gid)));
         $this->LDAP = $LDAP;
         $this->SQL = $SQL;
         $this->MAILER = $MAILER;
         $this->WEBHOOK = $WEBHOOK;
     }
 
+    public function __toString(): string
+    {
+        return $this->gid;
+    }
+
     public function requestGroup(bool $send_mail_to_admins, bool $send_mail = true): void
     {
         if ($this->exists()) {

resources/lib/UnityOrg.php

@@ -5,6 +5,7 @@
 
 class UnityOrg extends PosixGroup
 {
+    public string $gid;
     private UnityLDAP $LDAP;
     private UnitySQL $SQL;
     private UnityMailer $MAILER;
@@ -17,14 +18,18 @@ public function __construct(
         UnityMailer $MAILER,
         UnityWebhook $WEBHOOK,
     ) {
-        $gid = trim($gid);
-        parent::__construct($LDAP->getOrgGroupEntry($gid), $gid);
+        parent::__construct($LDAP->getOrgGroupEntry(trim($gid)));
         $this->LDAP = $LDAP;
         $this->SQL = $SQL;
         $this->MAILER = $MAILER;
         $this->WEBHOOK = $WEBHOOK;
     }
 
+    public function __toString(): string
+    {
+        return $this->gid;
+    }
+
     public function init(): void
     {
         \ensure(!$this->entry->exists());