[10.x] Update Stripe SDK to v7

.gitignore

@@ -1,3 +1,4 @@
 /vendor
 composer.lock
 phpunit.xml
+.phpunit.result.cache

composer.json

@@ -26,7 +26,7 @@
         "illuminate/view": "~5.8.0|^6.0|^7.0",
         "moneyphp/money": "^3.2",
         "nesbot/carbon": "^2.0",
-        "stripe/stripe-php": "^6.40",
+        "stripe/stripe-php": "^7.0",
         "symfony/http-kernel": "^4.3",
         "symfony/intl": "^4.3"
     },

src/Billable.php

@@ -8,12 +8,13 @@
 use Stripe\BankAccount as StripeBankAccount;
 use Stripe\Card as StripeCard;
 use Stripe\Customer as StripeCustomer;
-use Stripe\Error\Card as StripeCardException;
-use Stripe\Error\InvalidRequest as StripeErrorInvalidRequest;
+use Stripe\Exception\CardException as StripeCardException;
+use Stripe\Exception\InvalidRequestException as StripeInvalidRequestException;
 use Stripe\Invoice as StripeInvoice;
 use Stripe\InvoiceItem as StripeInvoiceItem;
 use Stripe\PaymentIntent as StripePaymentIntent;
 use Stripe\PaymentMethod as StripePaymentMethod;
+use Stripe\Refund as StripeRefund;
 use Stripe\SetupIntent as StripeSetupIntent;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -63,7 +64,10 @@ public function refund($paymentIntent, array $options = [])
     {
         $intent = StripePaymentIntent::retrieve($paymentIntent, $this->stripeOptions());
 
-        return $intent->charges->data[0]->refund($options);
+        return StripeRefund::create(
+            ['charge' => $intent->charges->data[0]->id] + $options,
+            $this->stripeOptions()
+        );
     }
 
     /**
@@ -231,7 +235,7 @@ public function invoice(array $options = [])
             $stripeInvoice = $stripeInvoice->pay();
 
             return new Invoice($this, $stripeInvoice);
-        } catch (StripeErrorInvalidRequest $e) {
+        } catch (StripeInvalidRequestException $exception) {
             return false;
         } catch (StripeCardException $exception) {
             $payment = new Payment(
@@ -258,7 +262,7 @@ public function upcomingInvoice()
             $stripeInvoice = StripeInvoice::upcoming(['customer' => $this->stripe_id], $this->stripeOptions());
 
             return new Invoice($this, $stripeInvoice);
-        } catch (StripeErrorInvalidRequest $e) {
+        } catch (StripeInvalidRequestException $exception) {
             //
         }
     }
@@ -276,12 +280,8 @@ public function findInvoice($id)
                 $id, $this->stripeOptions()
             );
 
-            $stripeInvoice->lines = StripeInvoice::retrieve($id, $this->stripeOptions())
-                        ->lines
-                        ->all(['limit' => 1000]);
-
             return new Invoice($this, $stripeInvoice);
-        } catch (Exception $e) {
+        } catch (Exception $exception) {
             //
         }
     }
@@ -334,7 +334,10 @@ public function invoices($includePending = false, $parameters = [])
 
         $parameters = array_merge(['limit' => 24], $parameters);
 
-        $stripeInvoices = $this->asStripeCustomer()->invoices($parameters);
+        $stripeInvoices = StripeInvoice::all(
+            ['customer' => $this->stripe_id] + $parameters,
+            $this->stripeOptions()
+        );
 
         // Here we will loop through the Stripe invoices and create our own custom Invoice
         // instances that have more helper methods and are generally more convenient to
@@ -440,22 +443,22 @@ public function removePaymentMethod($paymentMethod)
 
         $stripePaymentMethod = $this->resolveStripePaymentMethod($paymentMethod);
 
-        if ($stripePaymentMethod->customer === $this->stripe_id) {
-            $stripePaymentMethod->detach(null, $this->stripeOptions());
+        if ($stripePaymentMethod->customer !== $this->stripe_id) {
+            return;
+        }
 
-            $customer = $this->asStripeCustomer();
+        $customer = $this->asStripeCustomer();
 
-            // If payment method was the default payment method, we'll remove it manually...
-            if ($stripePaymentMethod->id === $customer->invoice_settings->default_payment_method) {
-                $customer->invoice_settings = ['default_payment_method' => null];
+        $defaultPaymentMethod = $customer->invoice_settings->default_payment_method;
 
-                $customer->save($this->stripeOptions());
+        $stripePaymentMethod->detach(null, $this->stripeOptions());
 
-                $this->forceFill([
-                    'card_brand' => null,
-                    'card_last_four' => null,
-                ])->save();
-            }
+        // If the payment method was the default payment method, we'll remove it manually...
+        if ($stripePaymentMethod->id === $defaultPaymentMethod) {
+            $this->forceFill([
+                'card_brand' => null,
+                'card_last_four' => null,
+            ])->save();
         }
     }
 

src/Http/Middleware/VerifyWebhookSignature.php

@@ -5,7 +5,7 @@
 use Closure;
 use Illuminate\Contracts\Config\Repository as Config;
 use Illuminate\Contracts\Foundation\Application;
-use Stripe\Error\SignatureVerification;
+use Stripe\Exception\SignatureVerificationException;
 use Stripe\WebhookSignature;
 
 class VerifyWebhookSignature
@@ -53,7 +53,7 @@ public function handle($request, Closure $next)
                 $this->config->get('cashier.webhook.secret'),
                 $this->config->get('cashier.webhook.tolerance')
             );
-        } catch (SignatureVerification $exception) {
+        } catch (SignatureVerificationException $exception) {
             $this->app->abort(403);
         }
 

src/Invoice.php

@@ -4,8 +4,10 @@
 
 use Carbon\Carbon;
 use Dompdf\Dompdf;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\View;
 use Stripe\Invoice as StripeInvoice;
+use Stripe\InvoiceLineItem as StripeInvoiceLineItem;
 use Symfony\Component\HttpFoundation\Response;
 
 class Invoice
@@ -24,6 +26,13 @@ class Invoice
      */
     protected $invoice;
 
+    /**
+     * The Stripe invoice items.
+     *
+     * @var \Stripe\Collection|\Stripe\InvoiceLineItem[]
+     */
+    protected $items;
+
     /**
      * Create a new invoice instance.
      *
@@ -220,17 +229,15 @@ public function subscriptions()
      */
     public function invoiceItemsByType($type)
     {
-        $lineItems = [];
-
-        if (isset($this->lines->data)) {
-            foreach ($this->lines->data as $line) {
-                if ($line->type == $type) {
-                    $lineItems[] = new InvoiceItem($this->owner, $line);
-                }
-            }
+        if (is_null($this->items)) {
+            $this->items = new Collection($this->lines->autoPagingIterator());
         }
 
-        return $lineItems;
+        return $this->items->filter(function (StripeInvoiceLineItem $item) use ($type) {
+            return $item->type === $type;
+        })->map(function (StripeInvoiceLineItem $item) {
+            return new InvoiceItem($this->owner, $item);
+        })->all();
     }
 
     /**

tests/Integration/IntegrationTestCase.php

@@ -6,7 +6,7 @@
 use Laravel\Cashier\Tests\Fixtures\User;
 use Laravel\Cashier\Tests\TestCase;
 use Stripe\ApiResource;
-use Stripe\Error\InvalidRequest;
+use Stripe\Exception\InvalidRequestException;
 use Stripe\Stripe;
 
 abstract class IntegrationTestCase extends TestCase
@@ -38,7 +38,7 @@ protected static function deleteStripeResource(ApiResource $resource)
     {
         try {
             $resource->delete();
-        } catch (InvalidRequest $e) {
+        } catch (InvalidRequestException $e) {
             //
         }
     }