[8.x] Supports Laravel 13

.github/workflows/tests.yaml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         php: [8.3, 8.4, 8.5]
-        laravel: [12.*]
+        laravel: [12.*, 13.*]
         stability: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]
 

composer.json

@@ -31,24 +31,24 @@
     "require": {
         "php": "^8.3",
         "ext-intl": "*",
-        "laravel/framework": "^12.0",
+        "laravel/framework": "^12.0 || ^13.0",
         "mollie/mollie-api-php": "^2.30.0",
         "moneyphp/money": "^4.0",
         "paypal/paypal-checkout-sdk": "^1.0",
         "pixelfear/composer-dist-plugin": "^0.1.0",
         "spatie/ignition": "^1.13",
-        "statamic/cms": "^6.0.0",
-        "stillat/proteus": "^4.0",
+        "statamic/cms": "^6.5",
+        "stillat/proteus": "^4.2.1",
         "stripe/stripe-php": "^13.0"
     },
     "require-dev": {
         "laravel/pint": "dev-main",
-        "orchestra/testbench": "^10.8",
+        "orchestra/testbench": "^10.8 || ^11.0",
         "pestphp/pest": "^3.0 || ^4.1.4",
         "pestphp/pest-plugin-laravel": "^3.0 || ^4.0",
         "spatie/ray": "^1.17",
         "spatie/test-time": "^1.3",
-        "statamic-rad-pack/runway": "^9.0.0-alpha.5"
+        "statamic-rad-pack/runway": "^9.2"
     },
     "config": {
         "optimize-autoloader": true,
@@ -60,5 +60,7 @@
             "pixelfear/composer-dist-plugin": true,
             "pestphp/pest-plugin": true
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

config/simple-commerce.php

@@ -1,5 +1,12 @@
 <?php
 
+use DuncanMcClean\SimpleCommerce\Customers\EntryCustomerRepository;
+use DuncanMcClean\SimpleCommerce\Gateways\Builtin\DummyGateway;
+use DuncanMcClean\SimpleCommerce\Orders\EntryOrderRepository;
+use DuncanMcClean\SimpleCommerce\Products\EntryProductRepository;
+use DuncanMcClean\SimpleCommerce\Shipping\FreeShipping;
+use DuncanMcClean\SimpleCommerce\Tax\Standard\TaxEngine;
+
 return [
 
     /*
@@ -20,7 +27,7 @@
 
             'shipping' => [
                 'methods' => [
-                    \DuncanMcClean\SimpleCommerce\Shipping\FreeShipping::class => [],
+                    FreeShipping::class => [],
                 ],
             ],
         ],
@@ -39,7 +46,7 @@
     */
 
     'gateways' => [
-        \DuncanMcClean\SimpleCommerce\Gateways\Builtin\DummyGateway::class => [
+        DummyGateway::class => [
             'display' => 'Card',
         ],
     ],
@@ -110,7 +117,7 @@
     |
     */
 
-    'tax_engine' => \DuncanMcClean\SimpleCommerce\Tax\Standard\TaxEngine::class,
+    'tax_engine' => TaxEngine::class,
 
     'tax_engine_config' => [
         // Basic Engine
@@ -161,17 +168,17 @@
 
     'content' => [
         'customers' => [
-            'repository' => \DuncanMcClean\SimpleCommerce\Customers\EntryCustomerRepository::class,
+            'repository' => EntryCustomerRepository::class,
             'collection' => 'customers',
         ],
 
         'orders' => [
-            'repository' => \DuncanMcClean\SimpleCommerce\Orders\EntryOrderRepository::class,
+            'repository' => EntryOrderRepository::class,
             'collection' => 'orders',
         ],
 
         'products' => [
-            'repository' => \DuncanMcClean\SimpleCommerce\Products\EntryProductRepository::class,
+            'repository' => EntryProductRepository::class,
             'collection' => 'products',
         ],
     ],

src/Actions/Delete.php

@@ -2,6 +2,7 @@
 
 namespace DuncanMcClean\SimpleCommerce\Actions;
 
+use DuncanMcClean\SimpleCommerce\Coupons\Coupon;
 use Statamic\Actions\Action;
 
 class Delete extends Action
@@ -20,7 +21,7 @@ public static function title()
     public function visibleTo($item)
     {
         switch (true) {
-            case $item instanceof \DuncanMcClean\SimpleCommerce\Coupons\Coupon:
+            case $item instanceof Coupon:
                 return true;
             default:
                 return false;
@@ -30,7 +31,7 @@ public function visibleTo($item)
     public function authorize($user, $item)
     {
         switch (true) {
-            case $item instanceof \DuncanMcClean\SimpleCommerce\Coupons\Coupon:
+            case $item instanceof Coupon:
                 return $user->can('delete coupons');
             default:
                 return false;

src/Console/Commands/PurgeCartOrdersCommand.php

@@ -3,6 +3,7 @@
 namespace DuncanMcClean\SimpleCommerce\Console\Commands;
 
 use DuncanMcClean\SimpleCommerce\Facades\Order;
+use DuncanMcClean\SimpleCommerce\Orders\EntryOrderRepository;
 use DuncanMcClean\SimpleCommerce\Orders\OrderStatus;
 use DuncanMcClean\SimpleCommerce\SimpleCommerce;
 use Illuminate\Console\Command;
@@ -23,7 +24,7 @@ public function handle()
 
         $fourteenDaysFromNow = Carbon::now()->subDays(14);
 
-        if ($this->isOrExtendsClass(SimpleCommerce::orderDriver()['repository'], \DuncanMcClean\SimpleCommerce\Orders\EntryOrderRepository::class)) {
+        if ($this->isOrExtendsClass(SimpleCommerce::orderDriver()['repository'], EntryOrderRepository::class)) {
             $fourteenDaysFromNow = $fourteenDaysFromNow->timestamp;
         }
 

src/Console/Commands/SwitchToDatabase.php

@@ -2,6 +2,10 @@
 
 namespace DuncanMcClean\SimpleCommerce\Console\Commands;
 
+use DuncanMcClean\SimpleCommerce\Customers\CustomerModel;
+use DuncanMcClean\SimpleCommerce\Customers\EloquentCustomerRepository;
+use DuncanMcClean\SimpleCommerce\Orders\EloquentOrderRepository;
+use DuncanMcClean\SimpleCommerce\Orders\OrderModel;
 use DuncanMcClean\SimpleCommerce\SimpleCommerce;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
@@ -111,12 +115,12 @@ protected function switchRepositories(): self
 
         ConfigWriter::edit('simple-commerce')
             ->replace('content.orders', [
-                'repository' => \DuncanMcClean\SimpleCommerce\Orders\EloquentOrderRepository::class,
-                'model' => \DuncanMcClean\SimpleCommerce\Orders\OrderModel::class,
+                'repository' => EloquentOrderRepository::class,
+                'model' => OrderModel::class,
             ])
             ->replace('content.customers', [
-                'repository' => \DuncanMcClean\SimpleCommerce\Customers\EloquentCustomerRepository::class,
-                'model' => \DuncanMcClean\SimpleCommerce\Customers\CustomerModel::class,
+                'repository' => EloquentCustomerRepository::class,
+                'model' => CustomerModel::class,
             ])
             ->save();
 

src/Console/Commands/stubs/runway_config.php

@@ -1,5 +1,8 @@
 <?php
 
+use DuncanMcClean\SimpleCommerce\Customers\CustomerModel;
+use DuncanMcClean\SimpleCommerce\Orders\OrderModel;
+
 return [
 
     /*
@@ -12,13 +15,13 @@
     */
 
     'resources' => [
-        \DuncanMcClean\SimpleCommerce\Customers\CustomerModel::class => [
+        CustomerModel::class => [
             'name' => 'Customers',
             'handle' => 'customers',
             'hidden' => true,
         ],
 
-        \DuncanMcClean\SimpleCommerce\Orders\OrderModel::class => [
+        OrderModel::class => [
             'name' => 'Orders',
             'handle' => 'orders',
             'hidden' => true,

src/Currency.php

@@ -44,16 +44,16 @@ public static function parse($amount, Site $site): string
         try {
             $money = new Money(str_replace('.', '', (int) $amount), new MoneyCurrency(self::get($site)['code']));
 
-            $numberFormatter = new NumberFormatter($site->locale(), \NumberFormatter::CURRENCY);
+            $numberFormatter = new NumberFormatter($site->locale(), NumberFormatter::CURRENCY);
 
             $currencyFormattingConfig = Config::get("simple-commerce.sites.{$site->handle()}.currency_formatting");
 
             if (isset($currencyFormattingConfig['decimal_separator'])) {
-                $numberFormatter->setSymbol(\NumberFormatter::MONETARY_SEPARATOR_SYMBOL, $currencyFormattingConfig['decimal_separator']);
+                $numberFormatter->setSymbol(NumberFormatter::MONETARY_SEPARATOR_SYMBOL, $currencyFormattingConfig['decimal_separator']);
             }
 
             if (isset($currencyFormattingConfig['thousand_separator'])) {
-                $numberFormatter->setSymbol(\NumberFormatter::MONETARY_GROUPING_SEPARATOR_SYMBOL, $currencyFormattingConfig['thousand_separator']);
+                $numberFormatter->setSymbol(NumberFormatter::MONETARY_GROUPING_SEPARATOR_SYMBOL, $currencyFormattingConfig['thousand_separator']);
             }
 
             $moneyFormatter = new IntlMoneyFormatter($numberFormatter, new ISOCurrencies);

src/Customers/EntryCustomerRepository.php

@@ -8,6 +8,7 @@
 use DuncanMcClean\SimpleCommerce\SimpleCommerce;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
+use Statamic\Eloquent\Entries\EntryModel;
 use Statamic\Facades\Entry;
 use Statamic\Facades\Stache;
 
@@ -141,7 +142,7 @@ public function delete(Customer $customer): void
 
     protected function isUsingEloquentDriverWithIncrementingIds(): bool
     {
-        return config('statamic.eloquent-driver.entries.model') === \Statamic\Eloquent\Entries\EntryModel::class;
+        return config('statamic.eloquent-driver.entries.model') === EntryModel::class;
     }
 
     public static function bindings(): array

src/DebugbarDataCollector.php

@@ -2,10 +2,12 @@
 
 namespace DuncanMcClean\SimpleCommerce;
 
+use DebugBar\DataCollector\DataCollector;
+use DebugBar\DataCollector\Renderable;
 use DuncanMcClean\SimpleCommerce\Orders\Cart\Drivers\CartDriver;
 use Statamic\Facades\Site;
 
-class DebugbarDataCollector extends \DebugBar\DataCollector\DataCollector implements \DebugBar\DataCollector\Renderable
+class DebugbarDataCollector extends DataCollector implements Renderable
 {
     use CartDriver;
 

src/Facades/Coupon.php

@@ -6,7 +6,7 @@
 use Illuminate\Support\Facades\Facade;
 
 /**
- * @see \DuncanMcClean\SimpleCommerce\Contracts\CouponRepository
+ * @see CouponRepository
  */
 class Coupon extends Facade
 {

src/Facades/Customer.php

@@ -6,7 +6,7 @@
 use Illuminate\Support\Facades\Facade;
 
 /**
- * @see \DuncanMcClean\SimpleCommerce\Contracts\CustomerRepository
+ * @see CustomerRepository
  */
 class Customer extends Facade
 {

src/Facades/Order.php

@@ -6,7 +6,7 @@
 use Illuminate\Support\Facades\Facade;
 
 /**
- * @see \DuncanMcClean\SimpleCommerce\Contracts\OrderRepository
+ * @see OrderRepository
  */
 class Order extends Facade
 {

src/Facades/Product.php

@@ -6,7 +6,7 @@
 use Illuminate\Support\Facades\Facade;
 
 /**
- * @see \DuncanMcClean\SimpleCommerce\Contracts\ProductRepository
+ * @see ProductRepository
  */
 class Product extends Facade
 {

src/Http/Controllers/CartItemController.php

@@ -2,6 +2,7 @@
 
 namespace DuncanMcClean\SimpleCommerce\Http\Controllers;
 
+use DuncanMcClean\SimpleCommerce\Contracts\Customer;
 use DuncanMcClean\SimpleCommerce\Facades\Product;
 use DuncanMcClean\SimpleCommerce\Http\Controllers\Concerns\HandlesCustomerInformation;
 use DuncanMcClean\SimpleCommerce\Http\Requests\CartItem\DestroyRequest;
@@ -47,7 +48,7 @@ public function store(StoreRequest $request)
 
         // If this product requires another one, ensure the customer has already purchased it...
         if ($product->has('prerequisite_product')) {
-            /** @var \DuncanMcClean\SimpleCommerce\Contracts\Customer $customer */
+            /** @var Customer $customer */
             $customer = $cart->customer();
 
             if (! $customer) {

src/Http/Controllers/Concerns/HandlesCustomerInformation.php

@@ -3,6 +3,7 @@
 namespace DuncanMcClean\SimpleCommerce\Http\Controllers\Concerns;
 
 use DuncanMcClean\SimpleCommerce\Contracts\Order as OrderContract;
+use DuncanMcClean\SimpleCommerce\Customers\UserCustomerRepository;
 use DuncanMcClean\SimpleCommerce\Exceptions\CustomerNotFound;
 use DuncanMcClean\SimpleCommerce\Facades\Customer;
 use DuncanMcClean\SimpleCommerce\SimpleCommerce;
@@ -17,7 +18,7 @@ protected function handleCustomerInformation(Request $request, OrderContract $ca
         // When the customer driver is set to users, a user is logged in, and the cart doesn't have a customer,
         // we'll set the customer to the logged in user.
         if (
-            $this->isOrExtendsClass(SimpleCommerce::customerDriver()['repository'], \DuncanMcClean\SimpleCommerce\Customers\UserCustomerRepository::class)
+            $this->isOrExtendsClass(SimpleCommerce::customerDriver()['repository'], UserCustomerRepository::class)
             && Auth::check()
             && ! $cart->customer()
         ) {

src/Http/Middleware/EnsureFormParametersArriveIntact.php

@@ -5,16 +5,19 @@
 use Closure;
 use DuncanMcClean\SimpleCommerce\Exceptions\InvalidFormParametersException;
 use Illuminate\Contracts\Encryption\DecryptException;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
 class EnsureFormParametersArriveIntact
 {
     /**
      * Handle the incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @param  Request  $request
+     * @return Response
      *
-     * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
+     * @throws AccessDeniedHttpException
      */
     public function handle($request, Closure $next)
     {

src/Http/Resources/BaseResource.php

@@ -2,14 +2,15 @@
 
 namespace DuncanMcClean\SimpleCommerce\Http\Resources;
 
+use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class BaseResource extends JsonResource
 {
     /**
      * Transform the resource into an array.
      *
-     * @param \Illuminate\Http\Request
+     * @param Request
      * @return array
      */
     public function toArray($request)

src/Listeners/RemoveCustomerFromOrder.php

@@ -2,6 +2,7 @@
 
 namespace DuncanMcClean\SimpleCommerce\Listeners;
 
+use DuncanMcClean\SimpleCommerce\Customers\UserCustomerRepository;
 use DuncanMcClean\SimpleCommerce\Orders\Cart\Drivers\CartDriver;
 use DuncanMcClean\SimpleCommerce\SimpleCommerce;
 use Illuminate\Auth\Events\Logout;
@@ -12,7 +13,7 @@ class RemoveCustomerFromOrder
 
     public function handle(Logout $event)
     {
-        if (! $this->isOrExtendsClass(SimpleCommerce::customerDriver()['repository'], \DuncanMcClean\SimpleCommerce\Customers\UserCustomerRepository::class)) {
+        if (! $this->isOrExtendsClass(SimpleCommerce::customerDriver()['repository'], UserCustomerRepository::class)) {
             return;
         }
 

src/Notifications/BackOfficeOrderPaid.php

@@ -35,7 +35,7 @@ public function via($notifiable)
      * Get the mail representation of the notification.
      *
      * @param  mixed  $notifiable
-     * @return \Illuminate\Notifications\Messages\MailMessage
+     * @return MailMessage
      */
     public function toMail($notifiable)
     {