WIP

Signed-off-by: Nguyen Van Nguyen <[email protected]>
zimbra-api · Aug 10, 2022 · 15f62ae · 15f62ae
1 parent 90c8f9b
commit 15f62ae
Show file tree

Hide file tree

Showing 48 changed files with 126 additions and 639 deletions.
diff --git a/src/Common/Struct/ContactInterface.php b/src/Common/Struct/ContactInterface.php
@@ -41,11 +41,8 @@ function setDlist(string $dlist): self;
     function setReference(string $reference): self;
     function setTooManyMembers(bool $tooManyMembers): self;
     function setMetadatas(array $metadatas): self;
-    function addMetadata(CustomMetadataInterface $metadata): self;
     function setAttrs(array $attrs): self;
-    function addAttr(ContactAttr $attr): self;
     function setContactGroupMembers(array $contactGroupMembers): self;
-    function addContactGroupMember(ContactGroupMemberInterface $contactGroupMember): self;
 
     function getId(): string;
     function getSortField(): ?string;

diff --git a/src/Common/Struct/MessageCommonInterface.php b/src/Common/Struct/MessageCommonInterface.php
@@ -32,7 +32,6 @@ function setRevision(int $revision): self;
     function setChangeDate(int $changeDate): self;
     function setModifiedSequence(int $modifiedSequence): self;
     function setMetadatas(array $metadatas): self;
-    function addMetadata(CustomMetadataInterface $metadata): self;
 
     function getSize(): ?int;
     function getDate(): ?int;

diff --git a/src/Common/Struct/MessageInfoInterface.php b/src/Common/Struct/MessageInfoInterface.php
@@ -38,7 +38,6 @@ function setSubject(string $subject): self;
     function setMessageIdHeader(string $messageIdHeader): self;
     function setInReplyTo(string $inReplyTo): self;
     function setHeaders(array $headers): self;
-    function addHeader(KeyValuePair $header): self;
 
     function getId(): ?string;
     function getCalendarIntendedFor(): ?string;
@@ -57,7 +56,6 @@ function getInReplyTo(): ?string;
     function getHeaders(): array;
 
     function setEmailInterfaces(array $emails): self;
-    function addEmailInterface(EmailInfoInterface $email): self;
     function setInviteInterface(InviteInfoInterface $invite): self;
     function getEmailInterfaces(): array;
     function getInvitInterface(): ?InviteInfoInterface;

diff --git a/src/Mail/Message/CreateDataSourceResponse.php b/src/Mail/Message/CreateDataSourceResponse.php
@@ -130,45 +130,31 @@ class CreateDataSourceResponse extends SoapResponse
      * @return self
      */
     public function __construct(?Id $dataSource = NULL)
-    {
-        if ($dataSource instanceof Id) {
-            $this->setDataSource($dataSource);
-        }
-    }
-
-    /**
-     * Set dataSource
-     *
-     * @param  Id $dataSource
-     * @return self
-     */
-    public function setDataSource(Id $dataSource): self
     {
         if ($dataSource instanceof ImapDataSourceId) {
-            return $this->setImapDataSource($dataSource);
+            $this->setImapDataSource($dataSource);
         }
         if ($dataSource instanceof Pop3DataSourceId) {
-            return $this->setPop3DataSource($dataSource);
+            $this->setPop3DataSource($dataSource);
         }
         if ($dataSource instanceof CaldavDataSourceId) {
-            return $this->setCaldavDataSource($dataSource);
+            $this->setCaldavDataSource($dataSource);
         }
         if ($dataSource instanceof YabDataSourceId) {
-            return $this->setYabDataSource($dataSource);
+            $this->setYabDataSource($dataSource);
         }
         if ($dataSource instanceof RssDataSourceId) {
-            return $this->setRssDataSource($dataSource);
+            $this->setRssDataSource($dataSource);
         }
         if ($dataSource instanceof GalDataSourceId) {
-            return $this->setGalDataSource($dataSource);
+            $this->setGalDataSource($dataSource);
         }
         if ($dataSource instanceof CalDataSourceId) {
-            return $this->setCalDataSource($dataSource);
+            $this->setCalDataSource($dataSource);
         }
         if ($dataSource instanceof UnknownDataSourceId) {
-            return $this->setUnknownDataSource($dataSource);
+            $this->setUnknownDataSource($dataSource);
         }
-        return $this;
     }
 
     /**

diff --git a/src/Mail/Message/GetDataSourcesResponse.php b/src/Mail/Message/GetDataSourcesResponse.php
@@ -115,7 +115,14 @@ class GetDataSourcesResponse extends SoapResponse
      */
     public function __construct(array $dataSources = [])
     {
-        $this->setDataSources($dataSources);
+        $this->setImapDataSources($dataSources)
+             ->setPop3DataSources($dataSources)
+             ->setCaldavDataSources($dataSources)
+             ->setYabDataSources($dataSources)
+             ->setRssDataSources($dataSources)
+             ->setGalDataSources($dataSources)
+             ->setCalDataSources($dataSources)
+             ->setUnknownDataSources($dataSources);
     }
 
     /**
@@ -310,25 +317,6 @@ public function setUnknownDataSources(array $dataSources): self
         return $this;
     }
 
-    /**
-     * Set dataSources
-     *
-     * @param  array $dataSources
-     * @return self
-     */
-    public function setDataSources(array $dataSources): self
-    {
-        $this->setImapDataSources($dataSources)
-             ->setPop3DataSources($dataSources)
-             ->setCaldavDataSources($dataSources)
-             ->setYabDataSources($dataSources)
-             ->setRssDataSources($dataSources)
-             ->setGalDataSources($dataSources)
-             ->setCalDataSources($dataSources)
-             ->setUnknownDataSources($dataSources);
-        return $this;
-    }
-
     /**
      * Get dataSources
      *

diff --git a/src/Mail/Message/GetRecurResponse.php b/src/Mail/Message/GetRecurResponse.php
@@ -15,7 +15,7 @@
     CalTZInfo,
     CancelItemRecur,
     ExceptionItemRecur,
-    InviteItemRecur,
+    InviteItemRecur
 };
 use Zimbra\Common\Struct\SoapResponse;
 

diff --git a/src/Mail/Struct/CalendarItemHitInfo.php b/src/Mail/Struct/CalendarItemHitInfo.php
@@ -346,25 +346,7 @@ public function getCategories()
      */
     public function setCategories(array $categories)
     {
-        $this->categories = [];
-        foreach ($categories as $category) {
-            $this->addCategory($category);
-        }
-        return $this;
-    }
-
-    /**
-     * add category
-     *
-     * @param  string $category
-     * @return self
-     */
-    public function addCategory(string $category)
-    {
-        $category = trim($category);
-        if (!in_array($category, $this->categories)) {
-            $this->categories[] = $category;
-        }
+        $this->categories = array_unique(array_map(static fn ($category) => trim($category), $categories));
         return $this;
     }
 
@@ -412,18 +394,6 @@ public function setFragment(string $fragment): self
         return $this;
     }
 
-    /**
-     * Add instance
-     *
-     * @param  InstanceDataInfo $instance
-     * @return self
-     */
-    public function addInstance(InstanceDataInfo $instance): self
-    {
-        $this->instances[] = $instance;
-        return $this;
-    }
-
     /**
      * Set instances
      *
@@ -468,18 +438,6 @@ public function setAlarmData(AlarmDataInfo $alarmData): self
         return $this;
     }
 
-    /**
-     * Add invite
-     *
-     * @param  Invitation $invite
-     * @return self
-     */
-    public function addInvite(Invitation $invite): self
-    {
-        $this->invites[] = $invite;
-        return $this;
-    }
-
     /**
      * Set invites
      *
@@ -502,18 +460,6 @@ public function getInvites(): array
         return $this->invites;
     }
 
-    /**
-     * Add reply
-     *
-     * @param  CalReply $reply
-     * @return self
-     */
-    public function addReply(CalReply $reply): self
-    {
-        $this->replies[] = $reply;
-        return $this;
-    }
-
     /**
      * Set replies
      *

diff --git a/src/Mail/Struct/CalendarItemInfo.php b/src/Mail/Struct/CalendarItemInfo.php
@@ -574,18 +574,6 @@ public function getInvites(): array
         return $this->invites;
     }
 
-    /**
-     * Add invite
-     *
-     * @param  Invitation $invite
-     * @return self
-     */
-    public function addInvite(Invitation $invite): self
-    {
-        $this->invites[] = $invite;
-        return $this;
-    }
-
     /**
      * Set calendarReplies
      *
@@ -608,18 +596,6 @@ public function getCalendarReplies(): array
         return $this->calendarReplies;
     }
 
-    /**
-     * Add reply
-     *
-     * @param  CalendarReply $reply
-     * @return self
-     */
-    public function addCalendarReply(CalendarReply $reply): self
-    {
-        $this->calendarReplies[] = $reply;
-        return $this;
-    }
-
     /**
      * Set metadatas
      *
@@ -641,16 +617,4 @@ public function getMetadatas(): array
     {
         return $this->metadatas;
     }
-
-    /**
-     * Add meta
-     *
-     * @param  MailCustomMetadata $meta
-     * @return self
-     */
-    public function addMetadata(MailCustomMetadata $meta): self
-    {
-        $this->metadatas[] = $meta;
-        return $this;
-    }
 }
diff --git a/src/Mail/Struct/CalendarItemRecur.php b/src/Mail/Struct/CalendarItemRecur.php
@@ -10,7 +10,7 @@
 
 namespace Zimbra\Mail\Struct;
 
-use JMS\Serializer\Annotation\{Accessor, SerializedName, Type, XmlElement, XmlList};
+use JMS\Serializer\Annotation\{Accessor, SerializedName, Type, XmlElement};
 use Zimbra\Common\Struct\{
     DtTimeInfoInterface,
     DurationInfoInterface,

diff --git a/src/Mail/Struct/CalendaringDataInterface.php b/src/Mail/Struct/CalendaringDataInterface.php
@@ -24,13 +24,11 @@ interface CalendaringDataInterface extends CommonInstanceDataAttrsInterface
     // function setDate(int $date);
     function setOrganizer(CalOrganizer $organizer);
     function setCategories(array $categories);
-    function addCategory(string $category);
     function setGeo(GeoInfo $geo);
     function setFragment(string $fragment);
     // used in interface instead of methods related to JAXB field
     function setInstances(array $instances);
     // used in interface instead of methods related to JAXB field
-    function addInstance(InstanceDataInterface $instance);
     function setAlarmData(AlarmDataInfo $alarmData);
 
     // function getDate(): ?int;

diff --git a/src/Mail/Struct/CommentInfo.php b/src/Mail/Struct/CommentInfo.php
@@ -436,16 +436,4 @@ public function getMetadatas(): array
     {
         return $this->metadatas;
     }
-
-    /**
-     * Add metadata
-     *
-     * @param  MailCustomMetadata $metadata
-     * @return self
-     */
-    public function addMetadata(MailCustomMetadata $metadata): self
-    {
-        $this->metadatas[] = $metadata;
-        return $this;
-    }
 }
diff --git a/src/Mail/Struct/CommonCalendaringData.php b/src/Mail/Struct/CommonCalendaringData.php
@@ -11,7 +11,13 @@
 namespace Zimbra\Mail\Struct;
 
 use JMS\Serializer\Annotation\{Accessor, SerializedName, Type, XmlAttribute};
-use Zimbra\Common\Enum\{FreeBusyStatus, InviteClass, InviteStatus, ParticipationStatus, Transparency};
+use Zimbra\Common\Enum\{
+    FreeBusyStatus,
+    InviteClass,
+    InviteStatus,
+    ParticipationStatus,
+    Transparency
+};
 
 /**
  * CommonCalendaringData struct class

diff --git a/src/Mail/Struct/CommonDocumentInfo.php b/src/Mail/Struct/CommonDocumentInfo.php
@@ -877,18 +877,6 @@ public function setMetadatas(array $metadatas): self
         return $this;
     }
 
-    /**
-     * Add metadata
-     *
-     * @param  MailCustomMetadata $metadata
-     * @return self
-     */
-    public function addMetadata(MailCustomMetadata $metadata): self
-    {
-        $this->metadatas[] = $metadata;
-        return $this;
-    }
-
     /**
      * Get fragment
      *

diff --git a/src/Mail/Struct/CommonInstanceDataAttrs.php b/src/Mail/Struct/CommonInstanceDataAttrs.php
@@ -11,7 +11,13 @@
 namespace Zimbra\Mail\Struct;
 
 use JMS\Serializer\Annotation\{Accessor, SerializedName, Type, XmlAttribute};
-use Zimbra\Common\Enum\{FreeBusyStatus, InviteClass, InviteStatus, ParticipationStatus, Transparency};
+use Zimbra\Common\Enum\{
+    FreeBusyStatus,
+    InviteClass,
+    InviteStatus,
+    ParticipationStatus,
+    Transparency
+};
 
 /**
  * CommonInstanceDataAttrs struct class

diff --git a/src/Mail/Struct/ConflictRecurrenceInstance.php b/src/Mail/Struct/ConflictRecurrenceInstance.php
@@ -78,16 +78,4 @@ public function getFreebusyUsers(): array
     {
         return $this->freebusyUsers;
     }
-
-    /**
-     * Add freebusyUser
-     *
-     * @param  FreeBusyUserStatus $freebusyUser
-     * @return self
-     */
-    public function addFreebusyUser(FreeBusyUserStatus $freebusyUser): self
-    {
-        $this->freebusyUsers[] = $freebusyUser;
-        return $this;
-    }
 }