added separate method to delete envelope

Author: annahileta

src/Controllers/Examples/eSignature/EG045DeleteEnvelope.php

@@ -15,8 +15,6 @@ class EG045DeleteEnvelope extends eSignBaseController
     const EG = 'eg045';            # reference (and url) for this example
     const FILE = __FILE__;
 
-    const DELETE_FOLDER_ID = "recyclebin";
-
     /**
      * Create a new controller instance.
      *
@@ -42,12 +40,10 @@ public function createController(): void
         try {
             $_SESSION["envelope_id"] = $this->args['envelope_id'];
 
-            DeleteRestoreEnvelopeService::moveEnvelopeToFolder(
+            DeleteRestoreEnvelopeService::deleteEnvelope(
                 $this->clientService,
                 $this->args["account_id"],
-                $this->args["envelope_id"],
-                self::DELETE_FOLDER_ID,
-                null
+                $this->args["envelope_id"]
             );
 
             $pageText = array_values(array_filter(

src/Services/Examples/eSignature/DeleteRestoreEnvelopeService.php

@@ -9,14 +9,16 @@
 
 class DeleteRestoreEnvelopeService
 {
+    const DELETE_FOLDER_ID = "recyclebin";
+
     /**
      * Moves envelope to a different folder
      *
      * @param SignatureClientService $clientService   The client service for eSignature
      * @param string $accountId     The DocuSign Account ID (GUID or short version)
      * @param string $envelopeId    Envelope ID
      * @param string $folderId      Destination Folder ID
-     * @param string|null $fromFolderId  From Folder ID (optional)
+     * @param string $fromFolderId  From Folder ID
      *
      * @return \DocuSign\eSign\Model\FoldersResponse
      */
@@ -25,7 +27,7 @@ public static function moveEnvelopeToFolder(
         string $accountId,
         string $envelopeId,
         string $folderId,
-        string|null $fromFolderId
+        string $fromFolderId
     ): FoldersResponse {
         $foldersApi = $clientService->getFoldersApi();
 
@@ -37,6 +39,29 @@ public static function moveEnvelopeToFolder(
         return $foldersApi->moveEnvelopes($accountId, $folderId, $foldersRequest);
     }
 
+    /**
+     * Deletes envelope
+     *
+     * @param SignatureClientService $clientService   The client service for eSignature
+     * @param string $accountId     The DocuSign Account ID (GUID or short version)
+     * @param string $envelopeId    Envelope ID
+     *
+     * @return \DocuSign\eSign\Model\FoldersResponse
+     */
+    public static function deleteEnvelope(
+        SignatureClientService $clientService,
+        string $accountId,
+        string $envelopeId,
+    ): FoldersResponse {
+        $foldersApi = $clientService->getFoldersApi();
+
+        $foldersRequest = new FoldersRequest([
+            'envelope_ids'   => [$envelopeId],
+        ]);
+
+        return $foldersApi->moveEnvelopes($accountId, self::DELETE_FOLDER_ID, $foldersRequest);
+    }
+
     /**
      * Gets all folders in the account
      *