chore(deps): update dependency guzzlehttp/guzzle to v7.15.3

composer.lock

@@ -8,21 +8,21 @@
     "packages": [
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.15.1",
+            "version": "7.15.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "61443dfb33c62f308ee8add20f45b4d6e4bf8d2f"
+                "reference": "ae311b8f045ea93ce7b1c9cdb7cec06c53f944bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/61443dfb33c62f308ee8add20f45b4d6e4bf8d2f",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ae311b8f045ea93ce7b1c9cdb7cec06c53f944bc",
-                "reference": "61443dfb33c62f308ee8add20f45b4d6e4bf8d2f",
+                "reference": "ae311b8f045ea93ce7b1c9cdb7cec06c53f944bc",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/promises": "^2.5.1",
+                "guzzlehttp/promises": "^2.5.2",
                 "guzzlehttp/psr7": "^2.13",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0",
@@ -116,7 +116,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.15.1"
+                "source": "https://github.com/guzzle/guzzle/tree/7.15.3"
             },
             "funding": [
                 {
@@ -132,20 +132,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-07-18T11:23:11+00:00"
+            "time": "2026-08-05T19:48:21+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "2.5.1",
+            "version": "2.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "9ad1e4fc607446a055b95870c7f668e93b5cff29"
+                "reference": "2823687acff28b2dbe67b2508a6b300e2c3fa4ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/9ad1e4fc607446a055b95870c7f668e93b5cff29",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/2823687acff28b2dbe67b2508a6b300e2c3fa4ce",
-                "reference": "9ad1e4fc607446a055b95870c7f668e93b5cff29",
+                "reference": "2823687acff28b2dbe67b2508a6b300e2c3fa4ce",
                 "shasum": ""
             },
             "require": {
@@ -200,7 +200,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.5.1"
+                "source": "https://github.com/guzzle/promises/tree/2.5.2"
             },
             "funding": [
                 {
@@ -216,7 +216,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-07-08T15:48:39+00:00"
+            "time": "2026-08-05T19:30:54+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
@@ -2556,5 +2556,5 @@
     "platform-overrides": {
         "php": "8.3"
     },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.9.0"
 }

lib/Providers/Mail/Service.php

@@ -484,34 +484,17 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
             }
         }
 
-        if ($deleteMode === 'soft') {
+        // we need to determine if the folder being deleted is already in the trash
-            $targetMailbox = $this->mailService->collectionFetch((string) $target->collection());
+        if (str_starts_with((string) $target->collection(), (string) $deleteTargetIdentifier?->collection())) {
-            if ($targetMailbox === null) {
+            // if so, we should hard delete instead of moving to avoid duplicates in the trash
-                throw new \RuntimeException('Collection not found for delete operation');
+            $deleteMode = 'hard';
-            }
-
-            $targetIdentifier = (string) $target->collection();
-            $trashIdentifier = (string) $deleteTargetIdentifier->collection();
-            $parentIdentifier = isset($targetMailbox['parentId'])
-                ? (string) $targetMailbox['parentId']
-                : null;
-
-            // JMAP mailbox IDs are opaque, so containment must be determined
-            // from parentId rather than by comparing ID prefixes.
-            if ($targetIdentifier === $trashIdentifier || $parentIdentifier === $trashIdentifier) {
-                $deleteMode = 'hard';
-            }
         }
 
-        if ($deleteMode === 'soft') {
+        $result = match ($deleteMode) {
-            return $this->collectionMove($deleteTargetIdentifier, $target);
+            'soft' => $this->collectionMove($deleteTargetIdentifier, $target),
-        }
+            'hard' => $this->mailService->collectionDestroy($target->collection(), $force),
-
+        };
-        if ($this->mailService->collectionDestroy((string) $target->collection(), $force) === null) {
+        return $result;
-            throw new \RuntimeException("Failed to delete collection: {$target->collection()}");
-        }
-
-        return true;
     }
 
     public function collectionMove(CollectionIdentifier $target, CollectionIdentifier $source): CollectionBaseInterface