Merge pull request #55 from leeroy869/main

change getMediaType to getContentType

Author: geisi

src/MicrosoftGraphTransport.php

@@ -79,7 +79,7 @@ protected function prepareAttachments(Email $email, ?string $html): array
             $attachments[] = [
                 '@odata.type' => '#microsoft.graph.fileAttachment',
                 'name' => $fileName,
-                'contentType' => $attachment->getMediaType(),
+                'contentType' => implode('/', [$attachment->getMediaType(), $attachment->getMediaSubtype()]),
                 'contentBytes' => base64_encode($attachment->getBody()),
                 'contentId' => $fileName,
                 'isInline' => $headers->getHeaderBody('Content-Disposition') === 'inline',

tests/MicrosoftGraphTransportTest.php

@@ -77,15 +77,15 @@
                         [
                             '@odata.type' => '#microsoft.graph.fileAttachment',
                             'name' => 'test-file-1.txt',
-                            'contentType' => 'text',
+                            'contentType' => 'text/plain',
                             'contentBytes' => 'Zm9vCg==',
                             'contentId' => 'test-file-1.txt',
                             'isInline' => false,
                         ],
                         [
                             '@odata.type' => '#microsoft.graph.fileAttachment',
                             'name' => 'test-file-2.txt',
-                            'contentType' => 'text',
+                            'contentType' => 'text/plain',
                             'contentBytes' => 'Zm9vCg==',
                             'contentId' => 'test-file-2.txt',
                             'isInline' => false,
@@ -163,15 +163,15 @@
                         [
                             '@odata.type' => '#microsoft.graph.fileAttachment',
                             'name' => 'test-file-1.txt',
-                            'contentType' => 'text',
+                            'contentType' => 'text/plain',
                             'contentBytes' => 'Zm9vCg==',
                             'contentId' => 'test-file-1.txt',
                             'isInline' => false,
                         ],
                         [
                             '@odata.type' => '#microsoft.graph.fileAttachment',
                             'name' => 'test-file-2.txt',
-                            'contentType' => 'text',
+                            'contentType' => 'text/plain',
                             'contentBytes' => 'Zm9vCg==',
                             'contentId' => 'test-file-2.txt',
                             'isInline' => false,
@@ -418,7 +418,7 @@
                         [
                             '@odata.type' => '#microsoft.graph.fileAttachment',
                             'name' => $inlineImageContentId,
-                            'contentType' => 'image',
+                            'contentType' => 'image/jpeg',
                             'contentBytes' => '/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wgARCABLAGQDAREAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAj/xAAWAQEBAQAAAAAAAAAAAAAAAAAABQj/2gAMAwEAAhADEAAAAZ71TDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/xAAUEAEAAAAAAAAAAAAAAAAAAABw/9oACAEBAAEFAgL/xAAUEQEAAAAAAAAAAAAAAAAAAABw/9oACAEDAQE/AQL/xAAUEQEAAAAAAAAAAAAAAAAAAABw/9oACAECAQE/AQL/xAAUEAEAAAAAAAAAAAAAAAAAAABw/9oACAEBAAY/AgL/xAAUEAEAAAAAAAAAAAAAAAAAAABw/9oACAEBAAE/IQL/2gAMAwEAAgADAAAAEEkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkv/xAAUEQEAAAAAAAAAAAAAAAAAAABw/9oACAEDAQE/EAL/xAAUEQEAAAAAAAAAAAAAAAAAAABw/9oACAECAQE/EAL/xAAUEAEAAAAAAAAAAAAAAAAAAABw/9oACAEBAAE/EAL/2Q==',
                             'contentId' => $inlineImageContentId,
                             'isInline' => true,
@@ -499,15 +499,15 @@
                         [
                             '@odata.type' => '#microsoft.graph.fileAttachment',
                             'name' => 'test-file-1.txt',
-                            'contentType' => 'text',
+                            'contentType' => 'text/plain',
                             'contentBytes' => 'Zm9vCg==',
                             'contentId' => 'test-file-1.txt',
                             'isInline' => false,
                         ],
                         [
                             '@odata.type' => '#microsoft.graph.fileAttachment',
                             'name' => 'test-file-2.txt',
-                            'contentType' => 'text',
+                            'contentType' => 'text/plain',
                             'contentBytes' => 'Zm9vCg==',
                             'contentId' => 'test-file-2.txt',
                             'isInline' => false,
@@ -586,15 +586,15 @@
                         [
                             '@odata.type' => '#microsoft.graph.fileAttachment',
                             'name' => 'test-file-1.txt',
-                            'contentType' => 'text',
+                            'contentType' => 'text/plain',
                             'contentBytes' => 'Zm9vCg==',
                             'contentId' => 'test-file-1.txt',
                             'isInline' => false,
                         ],
                         [
                             '@odata.type' => '#microsoft.graph.fileAttachment',
                             'name' => 'test-file-2.txt',
-                            'contentType' => 'text',
+                            'contentType' => 'text/plain',
                             'contentBytes' => 'Zm9vCg==',
                             'contentId' => 'test-file-2.txt',
                             'isInline' => false,