Merge pull request #2 from RedberryProducts/dependabot/github_actions/actions/checkout-5

Chore(deps): Bump actions/checkout from 4 to 5

Author: nikajorjika

.github/workflows/fix-php-code-style-issues.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.head_ref }}
 

.github/workflows/phpstan.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/run-tests.yml

@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

phpstan.neon.dist

@@ -7,6 +7,8 @@ parameters:
         - src
         - config
         - database
+    configDirectories:
+        - config
     tmpDir: build/phpstan
     checkOctaneCompatibility: true
     checkModelProperties: true

routes/inbox.php

@@ -4,7 +4,6 @@
 use Redberry\MailboxForLaravel\Http\Controllers\AssetController;
 use Redberry\MailboxForLaravel\Http\Controllers\ClearInboxController;
 use Redberry\MailboxForLaravel\Http\Controllers\InboxController;
-use Redberry\MailboxForLaravel\Http\Controllers\PublicAssetController;
 use Redberry\MailboxForLaravel\Http\Controllers\SeenController;
 use Redberry\MailboxForLaravel\Http\Controllers\SendTestMailController;
 
@@ -32,5 +31,3 @@
             ->name('asset');
         Route::post('/messages/{id}/seen', SeenController::class)->name('messages.seen');
     });
-
-Route::get('/mailbox/assets/{path}', PublicAssetController::class)->where('path', '.*')->name('mailbox.asset');

src/Http/Controllers/AssetController.php

@@ -2,27 +2,21 @@
 
 namespace Redberry\MailboxForLaravel\Http\Controllers;
 
-use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\View\View;
+use Illuminate\Support\Facades\View;
 use Redberry\MailboxForLaravel\CaptureService;
 
 class InboxController
 {
-    public function __invoke(Request $request, CaptureService $service): View|JsonResponse
+    public function __invoke(Request $request, CaptureService $service): \Illuminate\Contracts\View\View
     {
         $messages = $service->all(); // adapt to your API
 
         $payload = [
             'messages' => array_values($messages['data'] ?? $messages), // support both shapes
         ];
 
-        // If the client asks for JSON, return JSON (Vue will update without reload)
-        if ($request->expectsJson()) {
-            return response()->json($payload);
-        }
-
         // Otherwise, render the Blade view and hydrate initial props
-        return view('inbox::index', ['data' => $payload]);
+        return View::make('inbox::index', ['data' => $payload]);
     }
 }

src/Http/Controllers/InboxController.php

@@ -8,7 +8,9 @@
 use Symfony\Component\Mailer\Envelope;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Email;
+use Symfony\Component\Mime\Header\Headers;
 use Symfony\Component\Mime\Part\DataPart;
+use Symfony\Component\Mime\RawMessage;
 
 final class MessageNormalizer
 {
@@ -18,22 +20,61 @@ final class MessageNormalizer
      *
      * @return array<string,mixed>
      */
+    /** @return array<string,mixed> */
     public static function normalize(
-        Email $email,
+        Email|RawMessage $message,
         ?Envelope $envelope = null,
         ?string $raw = null,
         bool $storeAttachmentsInline = false
     ): array {
-        $keepRaw = true;
+        if ($message instanceof Email) {
+
+            return self::normalizeEmail($message, $envelope, $raw, $storeAttachmentsInline);
+        }
+
+        // RawMessage (non-Email) fallback
+        return self::normalizeRaw($message, $envelope, $raw);
+    }
+
+    /** @return array<string,mixed> */
+    private static function normalizeRaw(
+        RawMessage $rawMessage,
+        ?Envelope $envelope,
+        ?string $raw
+    ): array {
+        return [
+            'version' => 1,
+            'saved_at' => (new \DateTimeImmutable)->format(\DateTimeInterface::ATOM),
+            'subject' => null,
+            'from' => [],
+            'to' => [],
+            'cc' => [],
+            'bcc' => [],
+            'reply_to' => [],
+            'text' => null,
+            'html' => null,
+            'headers' => [],
+            'attachments' => [],
+            'raw' => $rawMessage,
+        ];
+    }
+
+    /** @return array<string,mixed> */
+    private static function normalizeEmail(
+        Email $email,
+        ?Envelope $envelope,
+        ?string $raw,
+        bool $storeAttachmentsInline
+    ): array {
         $headers = [];
         foreach ($email->getHeaders()->all() as $header) {
-            // flatten to "Name" => ["value1", "value2"...]
             $headers[$header->getName()][] = trim($header->getBodyAsString());
         }
 
         $attachments = [];
         foreach ($email->getAttachments() as $part) {
             /** @var DataPart $part */
+            $filename = $part->getFilename();
             $contentId = $part->getPreparedHeaders()->has('Content-ID')
                 ? trim($part->getPreparedHeaders()->get('Content-ID')->getBodyAsString(), '<>')
                 : null;
@@ -42,8 +83,6 @@ public static function normalize(
                 ? $part->getPreparedHeaders()->get('Content-Disposition')->getBodyAsString()
                 : null;
 
-            $filename = method_exists($part, 'getFilename') ? $part->getFilename() : null;
-
             $contentType = $part->getPreparedHeaders()->has('Content-Type')
                 ? $part->getPreparedHeaders()->get('Content-Type')->getBodyAsString()
                 : null;
@@ -102,11 +141,9 @@ public static function normalize(
 
             'headers' => $headers,       // full header map
             'attachments' => $attachments,   // metadata (+ content if enabled)
-        ];
 
-        if ($keepRaw && $raw !== null) {
-            $payload['raw'] = $raw;
-        }
+            'raw' => $raw,  // raw email source if provided
+        ];
 
         return $payload;
     }
@@ -119,13 +156,11 @@ private static function addressesToArray(iterable $addresses): array
     {
         $out = [];
         foreach ($addresses as $addr) {
-            if ($addr instanceof Address) {
-                $row = ['email' => $addr->getAddress()];
-                if ($addr->getName() !== '') {
-                    $row['name'] = $addr->getName();
-                }
-                $out[] = $row;
+            $row = ['email' => $addr->getAddress()];
+            if ($addr->getName() !== '') {
+                $row['name'] = $addr->getName();
             }
+            $out[] = $row;
         }
 
         return $out;