Skip to content

Commit e9d0450

Browse files
Merge pull request #13610 from ChristophWurst/chore/jmap-2-revert-getsource-rename
refactor(imap): revert getSource -> getRawMessage rename
2 parents e8e81b3 + e89fad8 commit e9d0450

6 files changed

Lines changed: 10 additions & 10 deletions

File tree

appinfo/routes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
'verb' => 'GET'
232232
],
233233
[
234-
'name' => 'messages#getRawMessage',
234+
'name' => 'messages#getSource',
235235
'url' => '/api/messages/{id}/source',
236236
'verb' => 'GET'
237237
],

lib/Controller/MessageApiController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ public function getRaw(int $id): DataResponse {
338338
}
339339

340340
try {
341-
$source = $this->mailManager->getRawMessage(
341+
$source = $this->mailManager->getSource(
342342
$account,
343343
$mailbox,
344344
$message

lib/Controller/MessagesController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ public function mdn(int $id): JSONResponse {
507507
* @throws ServiceException
508508
*/
509509
#[TrapError]
510-
public function getRawMessage(int $id): JSONResponse {
510+
public function getSource(int $id): JSONResponse {
511511
if ($this->userId === null) {
512512
return new JSONResponse([], Http::STATUS_UNAUTHORIZED);
513513
}
@@ -521,7 +521,7 @@ public function getRawMessage(int $id): JSONResponse {
521521
}
522522

523523
$response = new JSONResponse([
524-
'source' => $this->mailManager->getRawMessage(
524+
'source' => $this->mailManager->getSource(
525525
$account,
526526
$mailbox,
527527
$message
@@ -559,7 +559,7 @@ public function export(int $id): Response {
559559
return new JSONResponse([], Http::STATUS_FORBIDDEN);
560560
}
561561

562-
$source = $this->mailManager->getRawMessage(
562+
$source = $this->mailManager->getSource(
563563
$account,
564564
$mailbox,
565565
$message
@@ -611,7 +611,7 @@ public function saveFile(int $id, string $targetPath): Response {
611611
return new JSONResponse([], Http::STATUS_FORBIDDEN);
612612
}
613613

614-
$source = $this->mailManager->getRawMessage(
614+
$source = $this->mailManager->getSource(
615615
$account,
616616
$mailbox,
617617
$message

lib/Service/MailManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public function getImapMessages(Account $account, Mailbox $mailbox, bool $loadBo
182182
* @throws ClientException
183183
* @throws ServiceException
184184
*/
185-
public function getRawMessage(Account $account, Mailbox $mailbox, Message $message): ?string {
185+
public function getSource(Account $account, Mailbox $mailbox, Message $message): ?string {
186186
$raw = $this->protocolFactory
187187
->messageConnector($account)
188188
->fetchMessageRaw($account, $mailbox, $message);

tests/Integration/MailboxSynchronizationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ public function testUnsolicitedVanishedMessage() {
282282

283283
// Receive unsolicited vanished uid
284284
$message = $dbMessageMapper->findByUids($inbox, [$uid2])[0];
285-
$mailManager->getRawMessage(
285+
$mailManager->getSource(
286286
new Account($this->account),
287287
$inbox,
288288
$message,

tests/Unit/Controller/MessagesControllerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@ public function testExport() {
11671167
->will($this->returnValue($this->account));
11681168
$source = file_get_contents(__DIR__ . '/../../data/mail-message-123.txt');
11691169
$this->mailManager->expects($this->exactly(1))
1170-
->method('getRawMessage')
1170+
->method('getSource')
11711171
->with($this->account, $mailbox, $message)
11721172
->willReturn($source);
11731173

@@ -1211,7 +1211,7 @@ public function testSaveFile() {
12111211
->will($this->returnValue($this->account));
12121212
$source = file_get_contents(__DIR__ . '/../../data/mail-message-123.txt');
12131213
$this->mailManager->expects($this->exactly(1))
1214-
->method('getRawMessage')
1214+
->method('getSource')
12151215
->with($this->account, $mailbox, $message)
12161216
->willReturn($source);
12171217
$folderNode = $this->createStub(Folder::class);

0 commit comments

Comments
 (0)