Merge pull request #881 from laravel/rename-some-exceptions

[11.x] Rename some exceptions

src/Billable.php

@@ -4,8 +4,9 @@
 
 use Exception;
 use Illuminate\Support\Collection;
+use Laravel\Cashier\Exceptions\CustomerAlreadyCreated;
+use Laravel\Cashier\Exceptions\InvalidCustomer;
 use Laravel\Cashier\Exceptions\InvalidInvoice;
-use Laravel\Cashier\Exceptions\InvalidStripeCustomer;
 use Stripe\BankAccount as StripeBankAccount;
 use Stripe\Card as StripeCard;
 use Stripe\Customer as StripeCustomer;
@@ -738,12 +739,12 @@ public function hasStripeId()
      *
      * @return void
      *
-     * @throws \Laravel\Cashier\Exceptions\InvalidStripeCustomer
+     * @throws \Laravel\Cashier\Exceptions\InvalidCustomer
      */
     protected function assertCustomerExists()
     {
         if (! $this->hasStripeId()) {
-            throw InvalidStripeCustomer::nonCustomer($this);
+            throw InvalidCustomer::notYetCreated($this);
         }
     }
 
@@ -752,11 +753,13 @@ protected function assertCustomerExists()
      *
      * @param  array  $options
      * @return \Stripe\Customer
+     *
+     * @throws \Laravel\Cashier\Exceptions\CustomerAlreadyCreated
      */
     public function createAsStripeCustomer(array $options = [])
     {
-        if ($this->hasStripeId()) {
-            throw InvalidStripeCustomer::exists($this);
+        if (! $this->hasStripeId()) {
+            throw CustomerAlreadyCreated::exists($this);
         }
 
         $options = array_key_exists('email', $options)

src/Exceptions/CustomerAlreadyCreated.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Laravel\Cashier\Exceptions;
+
+use Exception;
+
+class CustomerAlreadyCreated extends Exception
+{
+    /**
+     * Create a new CustomerAlreadyCreated instance.
+     *
+     * @param  \Illuminate\Database\Eloquent\Model  $owner
+     * @return static
+     */
+    public static function exists($owner)
+    {
+        return new static(class_basename($owner)." is already a Stripe customer with ID {$owner->stripe_id}.");
+    }
+}

src/Exceptions/InvalidCustomer.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Laravel\Cashier\Exceptions;
+
+use Exception;
+
+class InvalidCustomer extends Exception
+{
+    /**
+     * Create a new InvalidCustomer instance.
+     *
+     * @param  \Illuminate\Database\Eloquent\Model  $owner
+     * @return static
+     */
+    public static function notYetCreated($owner)
+    {
+        return new static(class_basename($owner).' is not a Stripe customer yet. See the createAsStripeCustomer method.');
+    }
+}

tests/Feature/InvoicesTest.php

@@ -2,8 +2,8 @@
 
 namespace Laravel\Cashier\Tests\Feature;
 
+use Laravel\Cashier\Exceptions\InvalidCustomer;
 use Laravel\Cashier\Exceptions\InvalidInvoice;
-use Laravel\Cashier\Exceptions\InvalidStripeCustomer;
 use Laravel\Cashier\Invoice;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
@@ -13,7 +13,7 @@ public function test_require_stripe_customer_for_invoicing()
     {
         $user = $this->createCustomer('require_stripe_customer_for_invoicing');
 
-        $this->expectException(InvalidStripeCustomer::class);
+        $this->expectException(InvalidCustomer::class);
 
         $user->invoice();
     }

tests/Unit/CustomerTest.php

@@ -3,7 +3,8 @@
 namespace Laravel\Cashier\Tests\Unit;
 
 use Carbon\Carbon;
-use Laravel\Cashier\Exceptions\InvalidStripeCustomer;
+use Laravel\Cashier\Exceptions\CustomerAlreadyCreated;
+use Laravel\Cashier\Exceptions\InvalidCustomer;
 use Laravel\Cashier\Tests\Fixtures\User;
 use PHPUnit\Framework\TestCase;
 
@@ -47,7 +48,7 @@ public function test_stripe_customer_method_throws_exception_when_stripe_id_is_n
     {
         $user = new User;
 
-        $this->expectException(InvalidStripeCustomer::class);
+        $this->expectException(InvalidCustomer::class);
 
         $user->asStripeCustomer();
     }
@@ -57,7 +58,7 @@ public function test_stripe_customer_cannot_be_created_when_stripe_id_is_already
         $user = new User();
         $user->stripe_id = 'foo';
 
-        $this->expectException(InvalidStripeCustomer::class);
+        $this->expectException(CustomerAlreadyCreated::class);
 
         $user->createAsStripeCustomer();
     }