Merge branch '9.0'

vrajroham · Jul 30, 2019 · 81eb7cd · 81eb7cd
2 parents bc2d38e + 8f37c15
commit 81eb7cd
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Http/Controllers/WebhookController.php b/src/Http/Controllers/WebhookController.php
@@ -191,10 +191,14 @@ protected function handleInvoicePaymentActionRequired(array $payload)
      * Get the billable entity instance by Stripe ID.
      *
      * @param  string  $stripeId
-     * @return \Laravel\Cashier\Billable
+     * @return \Laravel\Cashier\Billable|null
      */
     protected function getUserByStripeId($stripeId)
     {
+        if ($stripeId === null) {
+            return;
+        }
+
         $model = config('cashier.model');
 
         return (new $model)->where('stripe_id', $stripeId)->first();