chore(deps): update dependency phpunit/phpunit to v12.5.33

composer.lock

@@ -862,20 +862,20 @@
     "packages-dev": [
         {
             "name": "myclabs/deep-copy",
-            "version": "1.14.0",
+            "version": "1.13.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae"
+                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a",
-                "reference": "8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae",
+                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.0"
+                "php": "^7.1 || ^8.0"
             },
             "conflict": {
                 "doctrine/collections": "<1.6.8",
@@ -910,15 +910,15 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.14.0"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4"
             },
             "funding": [
                 {
-                    "url": "https://github.com/mnapoli",
+                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
-                    "type": "github"
+                    "type": "tidelift"
                 }
             ],
-            "time": "2026-08-11T10:17:44+00:00"
+            "time": "2025-08-01T08:46:24+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -1185,23 +1185,23 @@
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "6.0.2",
+            "version": "6.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "a248d1640ab059b075f53a2ef0f9856e864e06b5"
+                "reference": "3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a248d1640ab059b075f53a2ef0f9856e864e06b5",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5",
-                "reference": "a248d1640ab059b075f53a2ef0f9856e864e06b5",
+                "reference": "3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^12.5.33"
+                "phpunit/phpunit": "^12.0"
             },
             "type": "library",
             "extra": {
@@ -1234,7 +1234,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
                 "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/6.0.2"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/6.0.1"
             },
             "funding": [
                 {
@@ -1254,7 +1254,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-08-25T14:40:53+00:00"
+            "time": "2026-02-02T14:04:18+00:00"
         },
         {
             "name": "phpunit/php-invoker",
@@ -1442,16 +1442,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "12.5.34",
+            "version": "12.5.33",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "6cbff63d670de92cb1cb3d2ff9f40327e9da9c7f"
+                "reference": "b98e028a26c5c5ba7e4a54be96ccf35f2914d184"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6cbff63d670de92cb1cb3d2ff9f40327e9da9c7f",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b98e028a26c5c5ba7e4a54be96ccf35f2914d184",
-                "reference": "6cbff63d670de92cb1cb3d2ff9f40327e9da9c7f",
+                "reference": "b98e028a26c5c5ba7e4a54be96ccf35f2914d184",
                 "shasum": ""
             },
             "require": {
@@ -1461,18 +1461,18 @@
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.14.0",
+                "myclabs/deep-copy": "^1.13.4",
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.3",
                 "phpunit/php-code-coverage": "^12.5.7",
-                "phpunit/php-file-iterator": "^6.0.2",
+                "phpunit/php-file-iterator": "^6.0.1",
                 "phpunit/php-invoker": "^6.0.0",
                 "phpunit/php-text-template": "^5.0.0",
                 "phpunit/php-timer": "^8.0.0",
                 "sebastian/cli-parser": "^4.2.1",
                 "sebastian/comparator": "^7.1.8",
-                "sebastian/diff": "^7.0.1",
+                "sebastian/diff": "^7.0.0",
                 "sebastian/environment": "^8.1.2",
                 "sebastian/exporter": "^7.0.3",
                 "sebastian/global-state": "^8.0.3",
@@ -1520,7 +1520,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.34"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.33"
             },
             "funding": [
                 {
@@ -1528,7 +1528,7 @@
                     "type": "other"
                 }
             ],
-            "time": "2026-08-27T08:38:28+00:00"
+            "time": "2026-07-28T13:58:09+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -1751,24 +1751,24 @@
         },
         {
             "name": "sebastian/diff",
-            "version": "7.0.1",
+            "version": "7.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6"
+                "reference": "7ab1ea946c012266ca32390913653d844ecd085f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7ab1ea946c012266ca32390913653d844ecd085f",
-                "reference": "cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6",
+                "reference": "7ab1ea946c012266ca32390913653d844ecd085f",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^12.5.33",
+                "phpunit/phpunit": "^12.0",
-                "symfony/process": "^7.4.17"
+                "symfony/process": "^7.2"
             },
             "type": "library",
             "extra": {
@@ -1806,27 +1806,15 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
                 "security": "https://github.com/sebastianbergmann/diff/security/policy",
-                "source": "https://github.com/sebastianbergmann/diff/tree/7.0.1"
+                "source": "https://github.com/sebastianbergmann/diff/tree/7.0.0"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
-                },
-                {
-                    "url": "https://liberapay.com/sebastianbergmann",
-                    "type": "liberapay"
-                },
-                {
-                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
-                    "type": "thanks_dev"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/sebastian/diff",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2026-08-25T15:35:54+00:00"
+            "time": "2025-02-07T04:55:46+00:00"
         },
         {
             "name": "sebastian/environment",

lib/Listeners/UserEventListener.php

@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace KTXM\ProviderJmapc\Listeners;
-
-use KTXC\User\Event\UserCreatedEvent;
-use KTXC\User\Event\UserDeletingEvent;
-use KTXM\ProviderJmapc\Stores\ServiceStore;
-
-final class UserEventListener
-{
-    public function __construct(
-        private readonly ServiceStore $serviceStore,
-    ) {
-    }
-
-    public function onUserCreated(UserCreatedEvent $event): void
-    {
-        // TODO: implement provisioning configuration
-    }
-
-    public function onUserDeleting(UserDeletingEvent $event): void
-    {
-        $this->serviceStore->deleteByUser($event->tenantIdentifier(), $event->userIdentifier());
-    }
-}

lib/Module.php

@@ -10,14 +10,9 @@ declare(strict_types=1);
 namespace KTXM\ProviderJmapc;
 
 use KTXC\Resource\ProviderManager;
-use KTXC\User\Event\UserCreatedEvent;
-use KTXC\User\Event\UserDeletingEvent;
-use KTXF\Event\DeliveryMode;
-use KTXF\Event\EventListenerRegistrarInterface;
 use KTXF\Module\ModuleBrowserInterface;
 use KTXF\Module\ModuleInstanceAbstract;
 use KTXF\Resource\Provider\ProviderInterface;
-use KTXM\ProviderJmapc\Listeners\UserEventListener;
 use KTXM\ProviderJmapc\Providers\Mail\Provider as MailProvider;
 use KTXM\ProviderJmapc\Providers\Chrono\Provider as ChronoProvider;
 use KTXM\ProviderJmapc\Providers\People\Provider as PeopleProvider;
@@ -32,7 +27,6 @@ class Module extends ModuleInstanceAbstract implements ModuleBrowserInterface
 {
     public function __construct(
         private readonly ProviderManager $providerManager,
-        private readonly EventListenerRegistrarInterface $events,
     ) {}
 
     public function handle(): string
@@ -73,9 +67,6 @@ class Module extends ModuleInstanceAbstract implements ModuleBrowserInterface
     
     public function boot(): void
     {
-        // Register listeners
-        $this->events->listen($this->handle(), UserCreatedEvent::class, UserEventListener::class, 'onUserCreated', DeliveryMode::Deferred);
-        $this->events->listen($this->handle(), UserDeletingEvent::class, UserEventListener::class, 'onUserDeleting', DeliveryMode::Deferred);
         // Register JMAP providers - all three share the same service store
         $this->providerManager->register(ProviderInterface::TYPE_MAIL, 'jmap', MailProvider::class);
         //$this->providerManager->register(ProviderInterface::TYPE_CHRONO, 'jmap', ChronoProvider::class);

lib/Providers/Mail/Service.php

@@ -102,8 +102,8 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
 		],
 		self::CAPABILITY_ENTITY_FETCH => true,
         self::CAPABILITY_ENTITY_EXTANT => true,
-		self::CAPABILITY_ENTITY_CREATE => true,
+        self::CAPABILITY_ENTITY_CREATE => false,
-        self::CAPABILITY_ENTITY_MODIFY => true,
+        self::CAPABILITY_ENTITY_MODIFY => false,
         self::CAPABILITY_ENTITY_PATCH => true,
         self::CAPABILITY_ENTITY_DELETE => true,
         self::CAPABILITY_ENTITY_MOVE => true,
@@ -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');
-            }
-
-            $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
@@ -638,42 +621,14 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
 
     public function entityCreate(CollectionIdentifier $target, MessagePropertiesMutableInterface $properties, array $options = []): EntityResource
     {
-        if ($target->provider() !== $this->provider() || (string)$target->service() !== (string)$this->identifier()) {
+        // TODO: Implement entity create
-            throw new \InvalidArgumentException('Target collection does not belong to this service: ' . (string)$target);
+        return $this->entityFresh();
     }
 
-        $this->initialize();
+    public function entityModify(EntityIdentifier $identifier, MessagePropertiesMutableInterface $properties): EntityResource
-
-        [$nativeMessage, $nativeAttachments] = $this->messagePayload($properties);
-
-        $created = $this->mailService->entityCreate((string)$target->collection(), $nativeMessage, $nativeAttachments);
-        if ($created === null || !isset($created['id'])) {
-            throw new \RuntimeException('JMAP entity creation did not return an identifier');
-        }
-        $created['mailboxIds'] ??= [(string)$target->collection() => true];
-
-        return $this->entityFresh()->fromJmap($created);
-    }
-
-    public function entityModify(EntityIdentifier $target, MessagePropertiesMutableInterface $properties): EntityResource
     {
-        if ($target->provider() !== $this->provider() || (string)$target->service() !== (string)$this->identifier()) {
+        // TODO: Implement entity modify
-            throw new \InvalidArgumentException('Target collection does not belong to this service: ' . (string)$target);
+        return $this->entityFresh();
-        }
-
-        $this->initialize();
-
-        [$nativeMessage, $nativeAttachments] = $this->messagePayload($properties);
-        $nativeMessage['id'] = (string)$target->entity();
-        $nativeMessage['mailboxIds'] = [(string)$target->collection() => true];
-
-        // JMAP replaces immutable Email content and returns the new authoritative ID.
-        $modified = $this->mailService->entityReplace($nativeMessage, $nativeAttachments);
-        if ($modified === null) {
-            throw new \RuntimeException('JMAP entity modification failed');
-        }
-
-        return $this->entityFresh()->fromJmap($modified);
     }
 
     public function entityPatch(MessagePropertiesMutableInterface $properties, EntityIdentifier ...$targets): array
@@ -925,14 +880,32 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
             );
         }
 
-        [$nativeMessage, $nativeAttachments] = $this->messagePayload($message);
+        $nativeProperties = $this->normalizeMessageProperties($message);
-        $transportId = $this->mailService->entitySubmitFresh(
+        $attachments = $nativeProperties->getAttachments();
-            $identityId,
+        foreach ($attachments as $attachment) {
-            $nativeMessage,
+            if ($attachment->getBlobId() !== null) {
-            $preSendTarget->collection(),
+                continue;
-            $postSentTarget->collection(),
+            }
-            $nativeAttachments,
+
-        );
+            $content = $attachment->getContent();
+            if ($content === null) {
+                throw new \InvalidArgumentException(sprintf(
+                    'Attachment "%s" has neither content nor a JMAP blob identifier',
+                    $attachment->getName() ?? 'unnamed',
+                ));
+            }
+
+            $attachment->setBlobId($this->mailService->blobDeposit(
+                $attachment->getType() ?? 'application/octet-stream',
+                $content,
+            ));
+        }
+        if ($attachments !== []) {
+            $nativeProperties->setAttachments(...$attachments);
+        }
+
+        $nativeMessage = $nativeProperties->toJmap();
+        $transportId = $this->mailService->entitySubmitFresh($identityId, $nativeMessage, $preSendTarget->collection(), $postSentTarget->collection());
 
         return new EntitySubmitResult(
             EntitySubmitResult::DISPOSITION_SENT,
@@ -950,38 +923,12 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
             );
         }
 
-        // determine the sent folder
+        $patch = null;
-        // if no explicit sent folder is configured, we will attempt to find a folder with the "sent" role.
-        $postSentTarget = $this->auxiliary['sentTarget'] ?? null;
-        $postSentTarget = $postSentTarget !== null && (string) $postSentTarget !== ''
-            ? new CollectionIdentifier($this->provider(), (string) $this->identifier(), (string) $postSentTarget)
-            : $this->resolveCollectionByRole(CollectionRoles::Sent->value);
-
-        if ($postSentTarget === null
-            || $postSentTarget->provider() !== $this->provider()
-            || $postSentTarget->service() !== (string)$this->identifier()) {
-            return new EntitySubmitResult(
-                EntitySubmitResult::DISPOSITION_ERROR,
-                errorCode: 'sent_collection_not_found',
-                errorMessage: 'No Sent target collection is configured or could be resolved for this service',
-            );
-        }
-
         if ($message !== null) {
-            [$nativeMessage, $nativeAttachments] = $this->messagePayload($message);
+            $patch = $this->normalizeMessageProperties($message)->toJmap();
-        } else {
-            $nativeMessage = null;
-            $nativeAttachments = [];
         }
 
-        $transportId = $this->mailService->entitySubmitDraft(
+        $transportId = $this->mailService->entitySubmitDraft($identityId, (string)$source->entity(), $patch);
-            $identityId,
-            (string)$source->entity(),
-            (string)$source->collection(),
-            $postSentTarget->collection(),
-            $nativeMessage,
-            $nativeAttachments,
-        );
 
         return new EntitySubmitResult(
             EntitySubmitResult::DISPOSITION_SENT,
@@ -990,50 +937,16 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
         );
     }
 
-    /**
+    private function normalizeMessageProperties(MessagePropertiesMutableInterface $message): MessageProperties
-     * Convert message properties and describe attachment blobs for the remote
-     * service. Uploading and request batching remain remote-layer concerns.
-     *
-     * @return array{0: array, 1: array<string, array{type: string, content: string}>}
-     */
-    private function messagePayload(MessagePropertiesMutableInterface $message): array
     {
-        if ($message instanceof MessageProperties === false) {
+        if ($message instanceof MessageProperties) {
+            return $message;
+        }
+
         $native = new MessageProperties([]);
         $native->jsonDeserialize($message->jsonSerialize());
-        } else {
-            $native = $message;
-        }
 
-        $attachments = $native->getAttachments();
+        return $native;
-        $uploads = [];
-
-        foreach ($attachments as $attachment) {
-            if ($attachment->getBlobId() !== null) {
-                continue;
-            }
-
-            $content = $attachment->getContent();
-            if ($content === null) {
-                throw new \InvalidArgumentException(sprintf(
-                    'Attachment "%s" has neither content nor a JMAP blob identifier',
-                    $attachment->getName() ?? 'unnamed',
-                ));
-            }
-
-            $creationId = 'attachment_' . count($uploads);
-            $attachment->setBlobId('#' . $creationId);
-            $uploads[$creationId] = [
-                'type' => $attachment->getType() ?? 'application/octet-stream',
-                'content' => $content,
-            ];
-        }
-
-        if ($attachments !== []) {
-            $native->setAttachments(...$attachments);
-        }
-
-        return [$native->toJmap(), $uploads];
     }
 
     private function resolveCollectionByRole(string $role): ?CollectionIdentifier

lib/Service/Remote/RemoteMailService.php

@@ -11,7 +11,6 @@ namespace KTXM\ProviderJmapc\Service\Remote;
 
 use Exception;
 use JmapClient\Client;
-use JmapClient\Requests\Blob\BlobSet;
 use JmapClient\Requests\Mail\MailboxGet;
 use JmapClient\Requests\Mail\MailboxParameters as MailboxParametersRequest;
 use JmapClient\Requests\Mail\MailboxQuery;
@@ -728,8 +727,7 @@ class RemoteMailService {
 	 *
 	 * @since Release 1.0.0
 	 */
-	public function entityCreate(string $location, array $so, array $attachments = []): ?array {
+	public function entityCreate(string $location, array $so): ?array {
-		$blobRequest = $this->prepareAttachmentRequest($so, $attachments);
 		// convert entity
 		$to = new MailParametersRequest();
 		$to->parametersRaw($so);
@@ -739,11 +737,9 @@ class RemoteMailService {
 		$r0 = new MailSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
 		$r0->create($id, $to);
 		// transceive
-		$requests = $blobRequest !== null ? [$blobRequest, $r0] : [$r0];
+		$bundle = $this->dataStore->perform([$r0]);
-		$bundle = $this->dataStore->perform($requests);
-		$this->assertAttachmentUploads($bundle, $blobRequest, $attachments, $so);
 		// extract response
-		$response = $bundle->response($blobRequest !== null ? 1 : 0);
+		$response = $bundle->response(0);
 		// check for command error
 		if ($response instanceof ResponseException) {
 			if ($response->type() === 'unknownMethod') {
@@ -773,64 +769,27 @@ class RemoteMailService {
 	 *
 	 * @since Release 1.0.0
 	 */
-	public function entityReplace(array $so, array $attachments = []): ?array {
+	public function entityModify(array $so): ?array {
-		// JMAP Email content is immutable after creation. Replacing a draft must
+		// extract entity id
-		// therefore create a new Email and remove the superseded Email together.
+		$id = $so['id'];
-		$id = (string)($so['id'] ?? '');
+		// convert entity
-		unset($so['id']);
+		$to = new MailParametersRequest();
-		if ($id === '') {
+		$to->parametersRaw($so);
-			throw new Exception('Draft identifier is required for replacement', 1);
+		// construct request
+		$r0 = new MailSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
+		$r0->update($id, $to);
+		// transceive
+		$bundle = $this->dataStore->perform([$r0]);
+		// extract response
+		$response = $bundle->response(0);
+		// determine if command succeeded
+		if (array_key_exists($id, $response->updated())) {
+			// update entity
+			$ro = $response->updated()[$id];
+			$so = array_merge($so, $ro);
+			return $so;
 		}
-
+		return null;
-		$location = null;
-		foreach (($so['mailboxIds'] ?? []) as $mailboxId => $included) {
-			if ($included === true) {
-				$location = (string)$mailboxId;
-				break;
-			}
-		}
-		if ($location === null || $location === '') {
-			throw new Exception('Draft mailbox is required for replacement', 1);
-		}
-
-		$blobRequest = $this->prepareAttachmentRequest($so, $attachments);
-		$replacement = new MailParametersRequest();
-		$replacement->parametersRaw($so);
-		$replacement->in($location);
-		$creationId = uniqid();
-
-		// Email/set supports create and destroy in one method call. When attachment
-		// content is present, Blob/upload is included in the same HTTP request.
-		$request = new MailSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
-		$request->create($creationId, $replacement);
-		$request->delete($id);
-		$requests = $blobRequest !== null ? [$blobRequest, $request] : [$request];
-		$bundle = $this->dataStore->perform($requests);
-		$this->assertAttachmentUploads($bundle, $blobRequest, $attachments, $so);
-		$response = $bundle->response($blobRequest !== null ? 1 : 0);
-
-		if ($response instanceof ResponseException) {
-			if ($response->type() === 'unknownMethod') {
-				throw new JmapUnknownMethod($response->description(), 1);
-			}
-			throw new Exception($response->type() . ': ' . $response->description(), 1);
-		}
-
-		$created = $response->createSuccess($creationId);
-		if ($created === null) {
-			$failure = $response->createFailure($creationId);
-			$type = $failure['type'] ?? 'unknownError';
-			$description = $failure['description'] ?? 'JMAP draft replacement failed.';
-			throw new Exception("$type: $description", 1);
-		}
-		if ($response->deleteSuccess($id) === null) {
-			$failure = $response->deleteFailure($id);
-			$type = $failure['type'] ?? 'unknownError';
-			$description = $failure['description'] ?? 'The superseded JMAP draft could not be deleted.';
-			throw new Exception("$type: $description", 1);
-		}
-
-		return array_merge($so, $created);
 	}
 
 	public function entityPatch(MailParametersRequest $properties, string ...$identifiers): ?array {
@@ -953,41 +912,29 @@ class RemoteMailService {
 	 *
 	 * @since Release 2.0.0
 	 */
-	public function entitySubmitFresh(string $identityId, array $data, string $preSendTarget, string $postSentTarget, array $attachments = []): string {
+	public function entitySubmitFresh(string $identityId, array $message, string $preSendTarget, string $postSentTarget): string {
-		$blobRequest = $this->prepareAttachmentRequest($data, $attachments);
 
-		$message = new MailParametersRequest();
+		$mail = new MailParametersRequest();
-		$message->parametersRaw($data);
+		$mail->parametersRaw($message);
 
-		$messageId = 'm_' . uniqid();
+		$messageCreateId = 'm_' . uniqid();
-		$submissionId = 's_' . uniqid();
+		$submissionCreateId = 's_' . uniqid();
 
 		$r0 = new MailSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
-		$m0 = $r0->create($messageId, $message);
+		$createdMessage = $r0->create($messageCreateId, $mail);
-		$m0->in($preSendTarget);
+		$createdMessage->in($preSendTarget);
-		$m0->draft(true);
-		$m0->seen(true);
-
 		$r1 = new MailSubmissionSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
-		$r1->completionUpdate('#' . $messageId, [
+		$submission = $r1->create($submissionCreateId);
-			'mailboxIds/' . $postSentTarget => true,
+		$submission->identity($identityId);
-			'mailboxIds/' . $preSendTarget => null,
+		$submission->message('#' . $messageCreateId);
-			'keywords/$draft' => null,
-		]);
-		$s0 = $r1->create($submissionId);
-		$s0->identity($identityId);
-		$s0->message('#' . $messageId);
 
-		$requests = $blobRequest !== null ? [$blobRequest, $r0, $r1] : [$r0, $r1];
+		$bundle = $this->dataStore->perform([$r0, $r1]);
-		$bundle = $this->dataStore->perform($requests);
+		$messageResponse = $bundle->response(0);
-		$this->assertAttachmentUploads($bundle, $blobRequest, $attachments, $data);
-		$responseOffset = $blobRequest !== null ? 1 : 0;
-		$messageResponse = $bundle->response($responseOffset);
 		if ($messageResponse instanceof ResponseException) {
 			throw new Exception($messageResponse->type() . ': ' . $messageResponse->description(), 1);
 		}
 		if (method_exists($messageResponse, 'createFailure')) {
-			$failure = $messageResponse->createFailure($messageId);
+			$failure = $messageResponse->createFailure($messageCreateId);
 			if (is_array($failure)) {
 				$type = $failure['type'] ?? 'unknownError';
 				$description = $failure['description'] ?? 'Email creation failed';
@@ -995,7 +942,7 @@ class RemoteMailService {
 			}
 		}
 
-		$response = $bundle->response($responseOffset + 1);
+		$response = $bundle->response(1);
 		if ($response instanceof ResponseException) {
 			if ($response->type() === 'unknownMethod') {
 				throw new JmapUnknownMethod($response->description(), 1);
@@ -1003,59 +950,7 @@ class RemoteMailService {
 			throw new Exception($response->type() . ': ' . $response->description(), 1);
 		}
 
-		return $this->extractSubmissionIdentifier($response, $submissionId);
+		return $this->extractSubmissionIdentifier($response, $submissionCreateId);
-	}
-
-	/**
-	 * Submit an existing draft message. On success, the draft Email is moved
-	 * from the drafts mailbox to the sent mailbox and its \Draft keyword is
-	 * cleared in the same request, so the submitted draft becomes the sent
-	 * copy rather than lingering as an unsent draft.
-	 *
-	 * @since Release 2.0.0
-	 */
-	public function entitySubmitDraft(string $identityId, string $draftId, string $preSendTarget, string $postSentTarget, ?array $patch = null, array $attachments = []): string {
-		if ($draftId === '') {
-			throw new Exception('Draft identifier is required for draft submission', 1);
-		}
-
-		$blobRequest = $patch !== null ? $this->prepareAttachmentRequest($patch, $attachments) : null;
-		$requests = $blobRequest !== null ? [$blobRequest] : [];
-
-		if ($patch !== null && $patch !== []) {
-			$m0 = new MailParametersRequest();
-			$m0->parametersRaw($patch);
-			$r0 = new MailSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
-			$r0->update($draftId, $m0);
-			$requests[] = $r0;
-		}
-
-		$submissionId = 's_' . uniqid();
-		$r1 = new MailSubmissionSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
-		$r1->completionUpdate($draftId, [
-			'mailboxIds/' . $postSentTarget => true,
-			'mailboxIds/' . $preSendTarget => null,
-			'keywords/$draft' => null,
-		]);
-		$s0 = $r1->create($submissionId);
-		$s0->identity($identityId);
-		$s0->message($draftId);
-		$requests[] = $r1;
-
-		$bundle = $this->dataStore->perform($requests);
-		if ($patch !== null) {
-			$this->assertAttachmentUploads($bundle, $blobRequest, $attachments, $patch);
-		}
-		$responseIndex = count($requests) - 1;
-		$response = $bundle->response($responseIndex);
-		if ($response instanceof ResponseException) {
-			if ($response->type() === 'unknownMethod') {
-				throw new JmapUnknownMethod($response->description(), 1);
-			}
-			throw new Exception($response->type() . ': ' . $response->description(), 1);
-		}
-
-		return $this->extractSubmissionIdentifier($response, $submissionId);
 	}
 
 	/**
@@ -1071,78 +966,55 @@ class RemoteMailService {
 	}
 
 	/**
-	 * Build one Blob/upload method call for all new attachment content. Servers
+	 * Submit an existing draft message.
-	 * without the Blob capability fall back to the standard upload endpoint.
 	 *
-	 * @param array<string, array{type: string, content: string}> $attachments
+	 * @since Release 2.0.0
 	 */
-	private function prepareAttachmentRequest(array &$data, array $attachments): ?BlobSet {
+	public function entitySubmitDraft(string $identityId, string $draftId, ?array $patch = null): string {
-		if ($attachments === []) {
+		if ($draftId === '') {
-			return null;
+			throw new Exception('Draft identifier is required for draft submission', 1);
 		}
 
-		if (!$this->dataStore->sessionCapable('blob')) {
+		$requests = [];
-			foreach ($attachments as $creationId => $attachment) {
+
-				$blobId = $this->blobDeposit($attachment['type'], $attachment['content']);
+		if ($patch !== null && $patch !== []) {
-				$this->replaceBlobReference($data, '#' . $creationId, $blobId);
+			$draftMutation = new MailParametersRequest();
-			}
+			$draftMutation->parametersRaw($patch);
-			return null;
+			$r0 = new MailSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
+			$r0->update($draftId, $draftMutation);
+			$requests[] = $r0;
 		}
 
-		$request = new BlobSet($this->dataAccount);
+		$submissionCreateId = 's_' . uniqid();
-		foreach ($attachments as $creationId => $attachment) {
+		$r1 = new MailSubmissionSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
-			$request->create($creationId)
+		$submission = $r1->create($submissionCreateId);
-				->type($attachment['type'])
+		$submission->identity($identityId);
-				->dataEncoded(base64_encode($attachment['content']));
+		$submission->message($draftId);
-		}
+		$requests[] = $r1;
 
-		return $request;
+		$bundle = $this->dataStore->perform($requests);
-	}
+		$responseIndex = count($requests) - 1;
-
+		$response = $bundle->response($responseIndex);
-	/**
-	 * Validate a batched Blob/upload response and replace creation references
-	 * in the returned local representation with actual server blob IDs.
-	 *
-	 * @param array<string, array{type: string, content: string}> $attachments
-	 */
-	private function assertAttachmentUploads(object $bundle, ?BlobSet $request, array $attachments, array &$data): void {
-		if ($request === null) {
-			return;
-		}
-
-		$response = $bundle->response(0);
 		if ($response instanceof ResponseException) {
-			throw new Exception('Attachment upload failed: ' . $response->type() . ': ' . $response->description(), 1);
+			if ($response->type() === 'unknownMethod') {
+				throw new JmapUnknownMethod($response->description(), 1);
+			}
+			throw new Exception($response->type() . ': ' . $response->description(), 1);
 		}
 
-		foreach (array_keys($attachments) as $creationId) {
+		return $this->extractSubmissionIdentifier($response, $submissionCreateId);
-			$failure = $response->createFailure($creationId);
-			if ($failure !== null) {
-				$type = $failure['type'] ?? 'unknownError';
-				$description = $failure['description'] ?? 'Attachment upload failed.';
-				throw new Exception("$type: $description", 1);
 	}
 
-			$success = $response->createSuccess($creationId);
+	private function collectionByRole(string $role): ?string {
-			$blobId = is_array($success) ? ($success['id'] ?? null) : null;
+		$filter = $this->collectionListFilter();
-			if (!is_string($blobId) || $blobId === '') {
+		$filter->condition('role', $role);
-				throw new Exception('Attachment upload did not return a blob identifier', 1);
+
-			}
+		$collections = $this->collectionList(null, $filter, null);
-			$this->replaceBlobReference($data, '#' . $creationId, $blobId);
+		if ($collections === []) {
-		}
+			return null;
 		}
 
-	private function replaceBlobReference(array &$data, string $reference, string $blobId): void {
+		return (string)array_key_first($collections);
-		foreach ($data as &$value) {
-			if (is_array($value)) {
-				$this->replaceBlobReference($value, $reference, $blobId);
-				continue;
-			}
-			if ($value === $reference) {
-				$value = $blobId;
-			}
-		}
-		unset($value);
 	}
 
 	private function extractSubmissionIdentifier(object $response, string $createId): string {

lib/Service/Remote/RemoteService.php

@@ -73,7 +73,7 @@ class RemoteService {
 		}
 		// debugging
 		if ($service->getDebug()) {
-			$logDirectory = dirname(__DIR__, 5) . '/var/logs/provider_jmap';
+			$logDirectory = dirname(__DIR__, 5) . '/var/logs/jmap';
 			if (!is_dir($logDirectory) && !mkdir($logDirectory, 0775, true) && !is_dir($logDirectory)) {
 				throw new \RuntimeException(sprintf('Unable to create JMAP log directory: %s', $logDirectory));
 			}

lib/Stores/ServiceStore.php

@@ -176,15 +176,4 @@ class ServiceStore
         return $result->getDeletedCount() > 0;
     }
 
-    /**
-     * Delete every service owned by a user.
-     */
-    public function deleteByUser(string $tenantId, string $userId): void
-    {
-        $this->dataStore->selectCollection(self::COLLECTION_NAME)->deleteMany([
-            'tid' => $tenantId,
-            'uid' => $userId,
-        ]);
-    }
-
 }