Merge pull request #28484 from arxeiss/retryAfterToNotificationsAndMa…

…ilable [5.8] Add retryAfter in Notification and Mailable object
laravel · May 11, 2019 · 08f2555 · 08f2555
2 parents b4c0ef1 + 79ae5d6
commit 08f2555
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/src/Illuminate/Mail/SendQueuedMailable.php b/src/Illuminate/Mail/SendQueuedMailable.php
@@ -75,6 +75,20 @@ public function failed($e)
         }
     }
 
+    /**
+     * Get the retry delay for the mailable object.
+     *
+     * @return mixed
+     */
+    public function retryAfter()
+    {
+        if (! method_exists($this->mailable, 'retryAfter') && ! isset($this->mailable->retryAfter)) {
+            return;
+        }
+
+        return $this->mailable->retryAfter ?? $this->mailable->retryAfter();
+    }
+
     /**
      * Prepare the instance for cloning.
      *

diff --git a/src/Illuminate/Notifications/SendQueuedNotifications.php b/src/Illuminate/Notifications/SendQueuedNotifications.php
@@ -96,6 +96,20 @@ public function failed($e)
         }
     }
 
+    /**
+     * Get the retry delay for the notification.
+     *
+     * @return mixed
+     */
+    public function retryAfter()
+    {
+        if (! method_exists($this->notification, 'retryAfter') && ! isset($this->notification->retryAfter)) {
+            return;
+        }
+
+        return $this->notification->retryAfter ?? $this->notification->retryAfter();
+    }
+
     /**
      * Prepare the instance for cloning.
      *