Update test workflow

.github/workflows/tests.yml

@@ -13,6 +13,7 @@ jobs:
         laravel: [11.*, 10.*]
         dependency-version: [prefer-stable]
         testsuite: [core, admin, shipping, stripe]
+        phpunit-config: [phpunit.xml, phpunit.extending.xml]
         include:
           - laravel: 11.*
             testbench: 9.*
@@ -47,4 +48,4 @@ jobs:
           APP_ENV: testing
           DB_CONNECTION: testing
           DB_DATABASE: ":memory:"
-        run: ./vendor/bin/pest --testsuite ${{ matrix.testsuite }}
+        run: ./vendor/bin/pest --testsuite ${{ matrix.testsuite }} -c ${{ matrix.phpunit-config }}

composer.json

@@ -70,6 +70,8 @@
     },
     "autoload-dev": {
         "psr-4": {
+            "Lunar\\Tests\\": "tests",
+            "Lunar\\Tests\\Stubs\\": "tests/stubs",
             "Lunar\\Tests\\Admin\\": "tests/admin",
             "Lunar\\Tests\\Core\\": "tests/core",
             "Lunar\\Tests\\Opayo\\": "tests/opayo",

packages/core/src/Base/Traits/HasModelExtending.php

@@ -3,6 +3,7 @@
 namespace Lunar\Base\Traits;
 
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Arr;
 use Lunar\Facades\ModelManifest;
 
@@ -46,6 +47,20 @@ public static function modelClass(): string
         return ModelManifest::get($contractClass) ?? static::class;
     }
 
+    /**
+     * Returns the morph class for a model class registered in the model manifest.
+     */
+    public function getMorphClass(): string
+    {
+        $morphMap = Relation::morphMap();
+
+        if (! empty($morphMap) && in_array(static::modelClass(), $morphMap)) {
+            return array_search(static::modelClass(), $morphMap, true);
+        }
+
+        return parent::getMorphClass();
+    }
+
     public static function isLunarInstance(): bool
     {
         return static::class == static::modelClass();

packages/core/src/Pipelines/Cart/ApplyDiscounts.php

@@ -5,16 +5,19 @@
 use Closure;
 use Lunar\Facades\Discounts;
 use Lunar\Models\Cart;
+use Lunar\Models\Contracts\Cart as CartContract;
 
 final class ApplyDiscounts
 {
     /**
      * Called just before cart totals are calculated.
      *
-     * @return void
+     * @param  Closure(CartContract): mixed  $next
+     * @return Closure
      */
-    public function handle(Cart $cart, Closure $next)
+    public function handle(CartContract $cart, Closure $next): mixed
     {
+        /** @var Cart $cart */
         $cart->discounts = collect([]);
         $cart->discountBreakdown = collect([]);
 

packages/core/src/Pipelines/Cart/ApplyShipping.php

@@ -8,16 +8,19 @@
 use Lunar\DataTypes\Price;
 use Lunar\Facades\ShippingManifest;
 use Lunar\Models\Cart;
+use Lunar\Models\Contracts\Cart as CartContract;
 
 final class ApplyShipping
 {
     /**
      * Called just before cart totals are calculated.
      *
-     * @return void
+     * @param  Closure(CartContract): mixed  $next
+     * @return Closure
      */
-    public function handle(Cart $cart, Closure $next)
+    public function handle(CartContract $cart, Closure $next): mixed
     {
+        /** @var Cart $cart */
         $shippingSubTotal = 0;
         $shippingBreakdown = $cart->shippingBreakdown ?: new ShippingBreakdown;
 

packages/core/src/Pipelines/Cart/Calculate.php

@@ -5,16 +5,19 @@
 use Closure;
 use Lunar\DataTypes\Price;
 use Lunar\Models\Cart;
+use Lunar\Models\Contracts\Cart as CartContract;
 
 class Calculate
 {
     /**
      * Called just before cart totals are calculated.
      *
-     * @return void
+     * @param  Closure(CartContract): mixed  $next
+     * @return Closure
      */
-    public function handle(Cart $cart, Closure $next)
+    public function handle(CartContract $cart, Closure $next): mixed
     {
+        /** @var Cart $cart */
         $discountTotal = $cart->lines->sum('discountTotal.value');
 
         $subTotal = $cart->lines->sum('subTotal.value');

packages/core/src/Pipelines/Cart/CalculateLines.php

@@ -6,16 +6,19 @@
 use Illuminate\Pipeline\Pipeline;
 use Lunar\DataTypes\Price;
 use Lunar\Models\Cart;
+use Lunar\Models\Contracts\Cart as CartContract;
 
 class CalculateLines
 {
     /**
      * Called just before cart totals are calculated.
      *
-     * @return void
+     * @param  Closure(CartContract): mixed  $next
+     * @return Closure
      */
-    public function handle(Cart $cart, Closure $next)
+    public function handle(CartContract $cart, Closure $next): mixed
     {
+        /** @var Cart $cart */
         foreach ($cart->lines as $line) {
             $cartLine = app(Pipeline::class)
                 ->send($line)

packages/core/src/Pipelines/Cart/CalculateTax.php

@@ -9,16 +9,19 @@
 use Lunar\Facades\ShippingManifest;
 use Lunar\Facades\Taxes;
 use Lunar\Models\Cart;
+use Lunar\Models\Contracts\Cart as CartContract;
 
 class CalculateTax
 {
     /**
      * Called just before cart totals are calculated.
      *
-     * @return void
+     * @param  Closure(CartContract): mixed  $next
+     * @return Closure
      */
-    public function handle(Cart $cart, Closure $next)
+    public function handle(CartContract $cart, Closure $next): mixed
     {
+        /** @var Cart $cart */
         $taxBreakDownAmounts = collect();
 
         foreach ($cart->lines as $cartLine) {

packages/core/src/Pipelines/CartLine/GetUnitPrice.php

@@ -6,17 +6,20 @@
 use Lunar\DataTypes\Price;
 use Lunar\Facades\Pricing;
 use Lunar\Models\CartLine;
+use Lunar\Models\Contracts\CartLine as CartLineContract;
 use Spatie\LaravelBlink\BlinkFacade as Blink;
 
 class GetUnitPrice
 {
     /**
      * Called just before cart totals are calculated.
      *
-     * @return mixed
+     * @param  Closure(CartLineContract): mixed  $next
+     * @return Closure
      */
-    public function handle(CartLine $cartLine, Closure $next)
+    public function handle(CartLineContract $cartLine, Closure $next)
     {
+        /** @var CartLine $cart */
         $purchasable = $cartLine->purchasable;
         $cart = $cartLine->cart;
 

packages/core/src/Pipelines/Order/Creation/CleanUpOrderLines.php

@@ -3,15 +3,18 @@
 namespace Lunar\Pipelines\Order\Creation;
 
 use Closure;
+use Lunar\Models\Contracts\Order as OrderContract;
 use Lunar\Models\Order;
 
 class CleanUpOrderLines
 {
     /**
+     * @param  Closure(OrderContract): mixed  $next
      * @return Closure
      */
-    public function handle(Order $order, Closure $next)
+    public function handle(OrderContract $order, Closure $next): mixed
     {
+        /** @var Order $order */
         $cart = $order->cart;
 
         $purchasableIds = $cart->lines->pluck('purchasable_id');

packages/core/src/Pipelines/Order/Creation/CreateOrderAddresses.php

@@ -3,23 +3,29 @@
 namespace Lunar\Pipelines\Order\Creation;
 
 use Closure;
+use Illuminate\Support\Facades\App;
+use Lunar\Models\Contracts\Order as OrderContract;
+use Lunar\Models\Contracts\OrderAddress as OrderAddressContract;
 use Lunar\Models\Order;
 use Lunar\Models\OrderAddress;
 
 class CreateOrderAddresses
 {
     /**
+     * @param  Closure(OrderContract): mixed  $next
      * @return Closure
      */
-    public function handle(Order $order, Closure $next)
+    public function handle(OrderContract $order, Closure $next): mixed
     {
+        /** @var Order $order */
         $orderAddresses = $order->addresses;
 
         foreach ($order->cart->addresses as $address) {
+            /** @var OrderAddress $addressModel */
             $addressModel = $orderAddresses->first(function ($orderAddress) use ($address) {
                 return $orderAddress->type == $address->type &&
                     $orderAddress->postcode == $address->postcode;
-            }) ?: new OrderAddress;
+            }) ?: App::make(OrderAddressContract::class);
 
             $addressModel->fill(
                 collect(

packages/core/src/Pipelines/Order/Creation/CreateOrderLines.php

@@ -3,16 +3,21 @@
 namespace Lunar\Pipelines\Order\Creation;
 
 use Closure;
+use Illuminate\Support\Facades\App;
+use Lunar\Models\Contracts\Order as OrderContract;
+use Lunar\Models\Contracts\OrderLine as OrderLineContract;
 use Lunar\Models\Order;
 use Lunar\Models\OrderLine;
 
 class CreateOrderLines
 {
     /**
+     * @param  Closure(OrderContract): mixed  $next
      * @return Closure
      */
-    public function handle(Order $order, Closure $next)
+    public function handle(OrderContract $order, Closure $next): mixed
     {
+        /** @var Order $order */
         if (! $order->id) {
             $order->save();
         }
@@ -22,10 +27,11 @@ public function handle(Order $order, Closure $next)
         $cart->recalculate();
 
         foreach ($cart->lines as $cartLine) {
+            /** @var OrderLine $orderLine */
             $orderLine = $order->lines->first(function ($line) use ($cartLine) {
                 return $line->purchasable_id == $cartLine->purchasable_id &&
                     $line->purchasable_type == $cartLine->purchasable_type;
-            }) ?: new OrderLine;
+            }) ?: App::make(OrderLineContract::class);
 
             $orderLine->fill([
                 'order_id' => $order->id,

packages/core/src/Pipelines/Order/Creation/CreateShippingLine.php

@@ -3,28 +3,34 @@
 namespace Lunar\Pipelines\Order\Creation;
 
 use Closure;
+use Illuminate\Support\Facades\App;
 use Lunar\DataTypes\ShippingOption;
+use Lunar\Models\Contracts\Order as OrderContract;
+use Lunar\Models\Contracts\OrderLine as OrderLineContract;
 use Lunar\Models\Order;
 use Lunar\Models\OrderLine;
 
 class CreateShippingLine
 {
     /**
+     * @param  Closure(OrderContract): mixed  $next
      * @return Closure
      */
-    public function handle(Order $order, Closure $next)
+    public function handle(OrderContract $order, Closure $next): mixed
     {
+        /** @var Order $order */
         $cart = $order->cart->recalculate();
 
         // If we have a shipping address with a shipping option.
         if (($shippingAddress = $cart->shippingAddress) &&
             ($shippingOption = $cart->getShippingOption())
         ) {
+            /** @var OrderLine $shippingLine */
             $shippingLine = $order->lines->first(function ($orderLine) use ($shippingOption) {
                 return $orderLine->type == 'shipping' &&
                     $orderLine->purchasable_type == ShippingOption::class &&
                     $orderLine->identifier == $shippingOption->getIdentifier();
-            }) ?: new OrderLine;
+            }) ?: App::make(OrderLineContract::class);
 
             $shippingLine->fill([
                 'order_id' => $order->id,

packages/core/src/Pipelines/Order/Creation/FillOrderFromCart.php

@@ -3,17 +3,21 @@
 namespace Lunar\Pipelines\Order\Creation;
 
 use Closure;
+use Illuminate\Support\Facades\App;
 use Lunar\Actions\Orders\GenerateOrderReference;
-use Lunar\Models\Currency;
+use Lunar\Models\Contracts\Currency as CurrencyContract;
+use Lunar\Models\Contracts\Order as OrderContract;
 use Lunar\Models\Order;
 
 class FillOrderFromCart
 {
     /**
+     * @param  Closure(OrderContract): mixed  $next
      * @return Closure
      */
-    public function handle(Order $order, Closure $next)
+    public function handle(OrderContract $order, Closure $next): mixed
     {
+        /** @var Order $order */
         $cart = $order->cart->calculate();
 
         $order->fill([
@@ -33,7 +37,7 @@ public function handle(Order $order, Closure $next)
             'tax_total' => $cart->taxTotal->value,
             'currency_code' => $cart->currency->code,
             'exchange_rate' => $cart->currency->exchange_rate,
-            'compare_currency_code' => Currency::getDefault()?->code,
+            'compare_currency_code' => App::make(CurrencyContract::class)::getDefault()?->code,
             'meta' => $cart->meta,
         ])->save();
 

packages/core/src/Pipelines/Order/Creation/MapDiscountBreakdown.php

@@ -3,15 +3,18 @@
 namespace Lunar\Pipelines\Order\Creation;
 
 use Closure;
+use Lunar\Models\Contracts\Order as OrderContract;
 use Lunar\Models\Order;
 
 class MapDiscountBreakdown
 {
     /**
+     * @param  Closure(OrderContract): mixed  $next
      * @return Closure
      */
-    public function handle(Order $order, Closure $next)
+    public function handle(OrderContract $order, Closure $next): mixed
     {
+        /** @var Order $order */
         $cart = $order->cart;
 
         $cartLinesMappedToOrderLines = [];