Laravel 7 (#8)

RingierIMU · Aug 4, 2020 · 79bdee5 · 79bdee5
1 parent 903ca09
commit 79bdee5
Show file tree

Hide file tree

Showing 9 changed files with 185 additions and 180 deletions.
diff --git a/composer.json b/composer.json
@@ -12,14 +12,14 @@
         }
     ],
     "require": {
-        "php": ">=7.2",
-        "illuminate/notifications": "~5.5 || ~6.0",
-        "illuminate/support": "~5.5 || ~6.0",
+        "php": "^7.2",
+        "illuminate/notifications": "^5.5 || ^6.0 || ^7.0",
+        "illuminate/support": "^5.5 || ^6.0 || ^7.0",
         "sailthru/sailthru-php5-client": "^1.2"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "phpunit/phpunit": "^8.0"
+        "phpunit/phpunit": "^9.0"
     },
     "autoload": {
         "psr-4": {
@@ -34,6 +34,13 @@
     "scripts": {
         "test": "vendor/bin/phpunit"
     },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "NotificationChannels\\Sailthru\\SailthruServiceProvider"
+            ]
+        }
+    },
     "config": {
         "sort-packages": true
     }

diff --git a/src/Events/MessageFailedToSend.php b/src/Events/MessageFailedToSend.php
diff --git a/src/Events/MessageWasSent.php b/src/Events/MessageWasSent.php
diff --git a/src/Exceptions/CouldNotSendNotification.php b/src/Exceptions/CouldNotSendNotification.php
diff --git a/src/SailthruChannel.php b/src/SailthruChannel.php
@@ -2,20 +2,27 @@
 
 namespace NotificationChannels\Sailthru;
 
+use Exception;
+use Illuminate\Notifications\Events\NotificationFailed;
+use Illuminate\Notifications\Events\NotificationSent;
 use Illuminate\Notifications\Notification;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Log;
-use NotificationChannels\Sailthru\Events\MessageFailedToSend;
-use NotificationChannels\Sailthru\Events\MessageWasSent;
+use Sailthru_Client_Exception;
 
 class SailthruChannel
 {
     /**
-     * SailthruChannel constructor.
-     *
-     * @param \Sailthru_Client $sailthru
+     * @var SailthruClient
      */
-    public function __construct(\Sailthru_Client $sailthru)
-    {
+    protected $sailthru;
+
+    /**
+     * @param SailthruClient $sailthru
+     */
+    public function __construct(
+        SailthruClient $sailthru
+    ) {
         $this->sailthru = $sailthru;
     }
 
@@ -37,9 +44,11 @@ public static function getDefaultVars(): array
      *
      * @return array
      */
-    public function send($notifiable, Notification $notification)
-    {
-        if (!config('services.sailthru.enabled', true)) {
+    public function send(
+        $notifiable,
+        Notification $notification
+    ) {
+        if (config('services.sailthru.enabled') === false) {
             Log::info(
                 'Sending Sailthru message',
                 [
@@ -54,17 +63,39 @@ public function send($notifiable, Notification $notification)
         try {
             /** @var SailthruMessage $message */
             $message = $notification->toSailthru($notifiable);
-            $message->mergeDefaultVars(self::getDefaultVars());
+            $message->mergeDefaultVars(
+                static::getDefaultVars()
+            );
 
             $response = $message->isMultiSend()
                 ? $this->multiSend($message)
                 : $this->singleSend($message);
 
-            event(new MessageWasSent($message, $response));
+            Event::dispatch(
+                new NotificationSent(
+                    $notifiable,
+                    $notification,
+                    'sailthru',
+                    [
+                        'message' => $message,
+                        'response' => $response,
+                    ]
+                )
+            );
 
             return $response;
-        } catch (\Sailthru_Client_Exception $e) {
-            event(new MessageFailedToSend($message, $e));
+        } catch (Exception $e) {
+            Event::dispatch(
+                new NotificationFailed(
+                    $notifiable,
+                    $notification,
+                    'sailthru',
+                    [
+                        'message' => $message,
+                        'exception' => $e,
+                    ]
+                )
+            );
 
             return [];
         }
@@ -73,45 +104,73 @@ public function send($notifiable, Notification $notification)
     /**
      * @param SailthruMessage $sailthruMessage
      *
-     * @throws \Sailthru_Client_Exception
+     * @throws Sailthru_Client_Exception
      *
      * @return array
      */
-    protected function multiSend(SailthruMessage $sailthruMessage)
-    {
+    protected function multiSend(
+        SailthruMessage $sailthruMessage
+    ) {
+        $template = $sailthruMessage->getTemplate();
+        $toEmail = $sailthruMessage->getToEmail();
+        $vars = $sailthruMessage->getVars();
+        $eVars = $sailthruMessage->getEVars();
+        $options = $sailthruMessage->getOptions();
+
+        if (config('services.sailthru.log_payload') === true) {
+            Log::debug(
+                'Sailthru Payload',
+                [
+                    'template' => $template,
+                    'email' => $toEmail,
+                    'vars' => $vars,
+                    'eVars' => $eVars,
+                    'options' => $options,
+                ]
+            );
+        }
+
         return $this->sailthru->multisend(
-            $sailthruMessage->getTemplate(),
-            $sailthruMessage->getToEmail(),
-            $sailthruMessage->getVars(),
-            $sailthruMessage->getEVars(),
-            $sailthruMessage->getOptions()
+            $template,
+            $toEmail,
+            $vars,
+            $eVars,
+            $options
         );
     }
 
     /**
      * @param SailthruMessage $sailthruMessage
      *
+     * @throws Sailthru_Client_Exception
+     *
      * @return array
      */
-    protected function singleSend(SailthruMessage $sailthruMessage)
-    {
-        if (config('services.sailthru.log_payload', false)) {
+    protected function singleSend(
+        SailthruMessage $sailthruMessage
+    ) {
+        $template = $sailthruMessage->getTemplate();
+        $toEmail = $sailthruMessage->getToEmail();
+        $vars = $sailthruMessage->getVars();
+        $options = $sailthruMessage->getOptions();
+
+        if (config('services.sailthru.log_payload') === true) {
             Log::debug(
                 'Sailthru Payload',
                 [
-                    'template' => $sailthruMessage->getTemplate(),
-                    'email' => $sailthruMessage->getToEmail(),
-                    'vars' => $sailthruMessage->getVars(),
-                    'options' => $sailthruMessage->getOptions(),
+                    'template' => $template,
+                    'email' => $toEmail,
+                    'vars' => $vars,
+                    'options' => $options,
                 ]
             );
         }
 
         return $this->sailthru->send(
-            $sailthruMessage->getTemplate(),
-            $sailthruMessage->getToEmail(),
-            $sailthruMessage->getVars(),
-            $sailthruMessage->getOptions()
+            $template,
+            $toEmail,
+            $vars,
+            $options
         );
     }
 }
diff --git a/src/SailthruClient.php b/src/SailthruClient.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace NotificationChannels\Sailthru;
+
+use Sailthru_Client;
+
+class SailthruClient extends Sailthru_Client
+{
+}