techmahedy · Oct 7, 2026 · Oct 7, 2026 · Oct 7, 2026
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -269,3 +269,33 @@ parameters:
 			identifier: staticMethod.notFound
 			count: 1
 			path: src/database/migrations/2025_04_19_184307_create_notifications_table.php
+
+		-
+			message: '#^Call to an undefined static method Phaseolies\\Support\\Facades\\Mail\:\:to\(\)\.$#'
+			identifier: staticMethod.notFound
+			count: 1
+			path: src/Channels/MailChannel.php
+
+		-
+			message: '#^Call to an undefined static method Phaseolies\\Support\\Facades\\Log\:\:error\(\)\.$#'
+			identifier: staticMethod.notFound
+			count: 1
+			path: src/NotificationEvents.php
+
+		-
+			message: '#^Call to an undefined static method Phaseolies\\Support\\Facades\\Log\:\:warning\(\)\.$#'
+			identifier: staticMethod.notFound
+			count: 1
+			path: src/Support/DeliveryLog.php
+
+		-
+			message: '#^Call to an undefined static method Phaseolies\\Support\\Facades\\Schema\:\:create\(\)\.$#'
+			identifier: staticMethod.notFound
+			count: 1
+			path: src/database/migrations/2026_10_07_000000_create_notification_deliveries_table.php
+
+		-
+			message: '#^Call to an undefined static method Phaseolies\\Support\\Facades\\Schema\:\:dropIfExists\(\)\.$#'
+			identifier: staticMethod.notFound
+			count: 1
+			path: src/database/migrations/2026_10_07_000000_create_notification_deliveries_table.php
diff --git a/src/Channels/Contracts/ChannelDriver.php b/src/Channels/Contracts/ChannelDriver.php
@@ -16,12 +16,14 @@ abstract class ChannelDriver
 
     /**
      * Create a new channel driver instance
-     * 
+     *
      * @param mixed $app
      */
     public function __construct($app = null)
     {
-        $this->app = $app;
+        if ($app instanceof Application) {
+            $this->app = $app;
+        }
     }
 
     /**
@@ -43,10 +45,14 @@ abstract public function send($notifiable, Notification $notification): void;
      */
     protected function config(string $key, $default = null)
     {
-        if ($this->app && function_exists('config')) {
-            return config($key, $default);
+        if (function_exists('config')) {
+            try {
+                return config($key, $default);
+            } catch (\Throwable) {
+                return $default;
+            }
         }
 
         return $default;
     }
-}
+}
diff --git a/src/Channels/DatabaseChannel.php b/src/Channels/DatabaseChannel.php
@@ -2,21 +2,31 @@
 
 namespace Doppar\Notifier\Channels;
 
+use Doppar\Notifier\Models\DatabaseNotification;
 use Doppar\Notifier\Contracts\Notification;
 use Doppar\Notifier\Channels\Contracts\ChannelDriver;
+use Doppar\Notifier\Support\Notifiables;
 
 class DatabaseChannel extends ChannelDriver
 {
     /**
-     * Send the notification through the database channel.
+     * Store the notification so the notifiable can read it in the application
      *
      * @param mixed $notifiable
      * @param Notification $notification
      * @return void
+     * @throws \RuntimeException
      */
     public function send($notifiable, Notification $notification): void
     {
-        // Database storage is handled by NotificationDispatcher
-        // This channel just marks that database storage is needed
+        DatabaseNotification::create([
+            'notifiable_type' => Notifiables::type($notifiable),
+            'notifiable_id' => Notifiables::requireKey($notifiable),
+            'type' => get_class($notification),
+            'data' => json_encode($notification->contentFor('database', $notifiable), JSON_THROW_ON_ERROR),
+            'metadata' => json_encode($notification->metadata(), JSON_THROW_ON_ERROR),
+            'read_at' => null,
+            'created_at' => date('Y-m-d H:i:s'),
+        ]);
     }
-}
+}
diff --git a/src/Channels/DiscordChannel.php b/src/Channels/DiscordChannel.php
@@ -3,13 +3,14 @@
 namespace Doppar\Notifier\Channels;
 
 use Doppar\Notifier\Contracts\Notification;
+use Doppar\Notifier\Channels\Support\Http;
 use Doppar\Notifier\Channels\Contracts\ChannelDriver;
 
 class DiscordChannel extends ChannelDriver
 {
     /**
      * Send notification to Discord
-     * 
+     *
      * @param mixed $notifiable
      * @param Notification $notification
      * @return void
@@ -23,16 +24,16 @@ public function send($notifiable, Notification $notification): void
             throw new \RuntimeException('No Discord webhook URL defined for notifiable entity.');
         }
 
-        $content = $notification->content($notifiable);
+        $content = $notification->contentFor('discord', $notifiable);
 
         $payload = [
             'content' => $content['content'] ?? '',
-            'username' => $content['username'] ?? config('notification.discord.username', 'Doppar Bot'),
+            'username' => $content['username'] ?? $this->config('notification.discord.username', 'Doppar Bot'),
             'avatar_url' => $content['avatar'] ?? null,
             'embeds' => $content['embeds'] ?? [],
         ];
 
-        $this->postToDiscord($webhookUrl, $payload);
+        $this->postToDiscord((string) $webhookUrl, $payload);
     }
 
     /**
@@ -45,18 +46,14 @@ public function send($notifiable, Notification $notification): void
      */
     protected function postToDiscord(string $webhookUrl, array $payload): void
     {
-        $ch = curl_init($webhookUrl);
-        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
-        curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($payload));
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
-
-        $result = curl_exec($ch);
-        $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
-
-        if ($httpCode < 200 || $httpCode >= 300) {
-            throw new \RuntimeException("Discord notification failed with HTTP code: {$httpCode}");
+        $response = Http::post(
+            $webhookUrl,
+            json_encode($payload, JSON_THROW_ON_ERROR),
+            ['Content-Type: application/json']
+        );
+
+        if ($response['status'] < 200 || $response['status'] >= 300) {
+            throw new \RuntimeException("Discord notification failed with HTTP code: {$response['status']}");
         }
     }
-}
+}
diff --git a/src/Channels/MailChannel.php b/src/Channels/MailChannel.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Doppar\Notifier\Channels;
+
+use Phaseolies\Support\Facades\Mail;
+use Phaseolies\Support\Mail\Mailable;
+use Doppar\Notifier\Contracts\Notification;
+use Doppar\Notifier\Channels\Contracts\ChannelDriver;
+use Doppar\Notifier\Channels\Support\MailTemplate;
+use Doppar\Notifier\Support\Notifiables;
+
+class MailChannel extends ChannelDriver
+{
+    /**
+     * The function that hands the mail over, replaced by tests
+     *
+     * @var (callable(string, string|null, Mailable, array<string, mixed>): void)|null
+     */
+    protected static $sender = null;
+
+    /**
+     * Replace how mail is handed over, or restore the application mailer with null
+     *
+     * @param callable|null $sender
+     * @return void
+     */
+    public static function using(?callable $sender): void
+    {
+        static::$sender = $sender;
+    }
+
+    /**
+     * Send the notification as an email
+     *
+     * @param mixed $notifiable
+     * @param Notification $notification
+     * @return void
+     * @throws \RuntimeException
+     */
+    public function send($notifiable, Notification $notification): void
+    {
+        $address = $notifiable->routeNotificationFor('mail');
+
+        if (!is_string($address) || !filter_var($address, FILTER_VALIDATE_EMAIL)) {
+            throw new \RuntimeException('Mail address is missing or invalid.');
+        }
+
+        $content = $notification->contentFor('mail', $notifiable);
+        $mailable = $this->buildMailable($content);
+        $name = Notifiables::attribute($notifiable, 'name');
+        $name = is_string($name) && $name !== '' ? $name : null;
+
+        if (static::$sender !== null) {
+            (static::$sender)($address, $name, $mailable, $content);
+
+            return;
+        }
+
+        $mail = Mail::to($address, $name);
+
+        foreach (['cc', 'bcc'] as $field) {
+            if (!empty($content[$field])) {
+                $mail->{$field}($content[$field]);
+            }
+        }
+
+        $mail->send($mailable);
+    }
+
+    /**
+     * Build the Mailable for the mail content
+     *
+     * @param array<string, mixed> $content
+     * @return Mailable
+     */
+    protected function buildMailable(array $content): Mailable
+    {
+        $mailable = new Mailable();
+        $mailable->subject = (string) ($content['subject'] ?? 'Notification');
+
+        $rendered = isset($content['html']) ? null : MailTemplate::render($content);
+        $mailable->html((string) ($content['html'] ?? $rendered['html'] ?? ''));
+
+        $text = $content['text'] ?? $rendered['text'] ?? null;
+
+        if (is_string($text) && $text !== '') {
+            $mailable->text($text);
+        }
+
+        if (!empty($content['replyTo'])) {
+            $mailable->replyTo($content['replyTo']);
+        }
+
+        foreach ((array) ($content['tags'] ?? []) as $tag) {
+            $mailable->tag((string) $tag);
+        }
+
+        if (isset($content['priority'])) {
+            $mailable->priority((int) $content['priority']);
+        }
+
+        foreach ((array) ($content['attachments'] ?? []) as $attachment) {
+            $attachment = is_array($attachment) ? $attachment : ['path' => $attachment];
+
+            $mailable->attach((string) $attachment['path'], $attachment['name'] ?? null, $attachment['mime'] ?? null);
+        }
+
+        return $mailable;
+    }
+}
diff --git a/src/Channels/SlackChannel.php b/src/Channels/SlackChannel.php
@@ -2,15 +2,15 @@
 
 namespace Doppar\Notifier\Channels;
 
-use Phaseolies\Support\Facades\Log;
 use Doppar\Notifier\Contracts\Notification;
+use Doppar\Notifier\Channels\Support\Http;
 use Doppar\Notifier\Channels\Contracts\ChannelDriver;
 
 class SlackChannel extends ChannelDriver
 {
     /**
      * Send notification to Slack
-     * 
+     *
      * @param mixed $notifiable
      * @param Notification $notification
      * @return void
@@ -24,7 +24,7 @@ public function send($notifiable, Notification $notification): void
             throw new \RuntimeException('Slack webhook URL is missing.');
         }
 
-        $content = $notification->content($notifiable);
+        $content = $notification->contentFor('slack', $notifiable);
 
         $payload = [
             'text' => $content['text'] ?? '',
@@ -44,7 +44,7 @@ public function send($notifiable, Notification $notification): void
             $payload['channel'] = $content['channel'];
         }
 
-        $this->postToSlack($webhookUrl, $payload);
+        $this->postToSlack((string) $webhookUrl, $payload);
     }
 
     /**
@@ -57,24 +57,16 @@ public function send($notifiable, Notification $notification): void
      */
     protected function postToSlack(string $webhookUrl, array $payload): void
     {
-        $ch = curl_init($webhookUrl);
-
-        curl_setopt_array($ch, [
-            CURLOPT_POST => true,
-            CURLOPT_POSTFIELDS => json_encode($payload),
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_HTTPHEADER => ['Content-Type: application/json'],
-            CURLOPT_TIMEOUT => 10,
-        ]);
-
-        $response = curl_exec($ch);
-        $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        $error = curl_error($ch);
-
-        curl_close($ch);
+        $response = Http::post(
+            $webhookUrl,
+            json_encode($payload, JSON_THROW_ON_ERROR),
+            ['Content-Type: application/json']
+        );
 
-        if ($httpCode !== 200 || trim($response) !== 'ok') {
-            Log::error("Slack notification failed (HTTP {$httpCode}): " . ($response ?: $error));
+        if ($response['status'] !== 200 || trim($response['body']) !== 'ok') {
+            throw new \RuntimeException(
+                "Slack notification failed (HTTP {$response['status']}): " . ($response['body'] ?: $response['error'])
+            );
         }
     }
 }