Fix container resolution and morph map for extended models

.github/workflows/tests.yml

@@ -13,12 +13,13 @@ jobs:
         laravel: [11.*, 10.*]
         dependency-version: [prefer-stable]
         testsuite: [core, admin, shipping, stripe]
+        extend-models: ["true", "false"]
         include:
           - laravel: 11.*
             testbench: 9.*
           - laravel: 10.*
             testbench: 8.*
-    name: ${{ matrix.testsuite }} - PHP ${{ matrix.php }} - L${{ matrix.laravel }} ${{ matrix.dependency-version == 'prefer-lowest' && '↓' || '↑' }}
+    name: ${{ matrix.testsuite }} - PHP ${{ matrix.php }} - L${{ matrix.laravel }} ${{ matrix.dependency-version == 'prefer-lowest' && '↓' || '↑' }} ${{ matrix.extend-models == 'true' && 'E' || '' }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -47,4 +48,5 @@ jobs:
           APP_ENV: testing
           DB_CONNECTION: testing
           DB_DATABASE: ":memory:"
+          LUNAR_TESTING_REPLACE_MODELS: ${{ matrix.extend-models }}
         run: ./vendor/bin/pest --testsuite ${{ matrix.testsuite }}

.phpactor.json

@@ -0,0 +1,4 @@
+{
+    "$schema": "/Users/theimer/.local/share/nvim/mason/packages/phpactor/source/phpactor.schema.json",
+    "language_server_phpstan.enabled": true
+}

composer.json

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

packages/admin/src/Filament/Resources/AttributeGroupResource.php

@@ -14,14 +14,14 @@
 use Lunar\Admin\Support\Resources\BaseResource;
 use Lunar\Admin\Support\Tables\Columns\TranslatedTextColumn;
 use Lunar\Facades\AttributeManifest;
-use Lunar\Models\Contracts\AttributeGroup;
+use Lunar\Models\Contracts\AttributeGroup as AttributeGroupContract;
 use Lunar\Models\Language;
 
 class AttributeGroupResource extends BaseResource
 {
     protected static ?string $permission = 'settings:manage-attributes';
 
-    protected static ?string $model = AttributeGroup::class;
+    protected static ?string $model = AttributeGroupContract::class;
 
     protected static ?int $navigationSort = 1;
 

packages/admin/src/Filament/Resources/BrandResource.php

@@ -15,13 +15,13 @@
 use Lunar\Admin\Filament\Resources\BrandResource\Pages;
 use Lunar\Admin\Support\Forms\Components\Attributes;
 use Lunar\Admin\Support\Resources\BaseResource;
-use Lunar\Models\Contracts\Brand;
+use Lunar\Models\Contracts\Brand as BrandContract;
 
 class BrandResource extends BaseResource
 {
     protected static ?string $permission = 'catalog:manage-products';
 
-    protected static ?string $model = Brand::class;
+    protected static ?string $model = BrandContract::class;
 
     protected static ?int $navigationSort = 3;
 

packages/admin/src/Filament/Resources/BrandResource/Pages/ManageBrandCollections.php

@@ -11,6 +11,7 @@
 use Lunar\Admin\Support\Pages\BaseManageRelatedRecords;
 use Lunar\Admin\Support\Tables\Columns\TranslatedTextColumn;
 use Lunar\Models\Collection;
+use Lunar\Models\Contracts\Collection as CollectionContract;
 
 class ManageBrandCollections extends BaseManageRelatedRecords
 {
@@ -54,7 +55,7 @@ function (Forms\Components\Select $select) {
                             ->getSearchResultsUsing(static function (Forms\Components\Select $component, string $search): array {
                                 return Collection::search($search)
                                     ->get()
-                                    ->mapWithKeys(fn (Collection $record): array => [$record->getKey() => $record->breadcrumb->push($record->translateAttribute('name'))->join(' > ')])
+                                    ->mapWithKeys(fn (CollectionContract $record): array => [$record->getKey() => $record->breadcrumb->push($record->translateAttribute('name'))->join(' > ')])
                                     ->all();
                             });
                     }

packages/admin/src/Filament/Resources/BrandResource/Pages/ManageBrandProducts.php

@@ -12,6 +12,7 @@
 use Lunar\Admin\Filament\Resources\BrandResource;
 use Lunar\Admin\Filament\Resources\ProductResource;
 use Lunar\Admin\Support\Pages\BaseManageRelatedRecords;
+use Lunar\Models\Contracts\Product as ProductContract;
 use Lunar\Models\Product;
 
 class ManageBrandProducts extends BaseManageRelatedRecords
@@ -73,7 +74,7 @@ public function table(Table $table): Table
                         ->getSearchResultsUsing(static function (Forms\Components\Select $component, string $search): array {
                             return Product::search($search)
                                 ->get()
-                                ->mapWithKeys(fn (Product $record): array => [$record->getKey() => $record->translateAttribute('name')])
+                                ->mapWithKeys(fn (ProductContract $record): array => [$record->getKey() => $record->translateAttribute('name')])
                                 ->all();
                         }),
                 ])

packages/admin/src/Filament/Resources/BrandResource/Pages/ManageBrandUrls.php

@@ -4,11 +4,11 @@
 
 use Lunar\Admin\Filament\Resources\BrandResource;
 use Lunar\Admin\Support\Resources\Pages\ManageUrlsRelatedRecords;
-use Lunar\Models\Brand;
+use Lunar\Models\Contracts\Brand as BrandContract;
 
 class ManageBrandUrls extends ManageUrlsRelatedRecords
 {
     protected static string $resource = BrandResource::class;
 
-    protected static string $model = Brand::class;
+    protected static string $model = BrandContract::class;
 }

packages/admin/src/Filament/Resources/ChannelResource.php

@@ -15,13 +15,13 @@
 use Illuminate\Support\Str;
 use Lunar\Admin\Filament\Resources\ChannelResource\Pages;
 use Lunar\Admin\Support\Resources\BaseResource;
-use Lunar\Models\Contracts\Channel;
+use Lunar\Models\Contracts\Channel as ChannelContract;
 
 class ChannelResource extends BaseResource
 {
     protected static ?string $permission = 'settings:core';
 
-    protected static ?string $model = Channel::class;
+    protected static ?string $model = ChannelContract::class;
 
     protected static ?int $navigationSort = 1;
 

packages/admin/src/Filament/Resources/CollectionGroupResource.php

@@ -11,13 +11,13 @@
 use Illuminate\Support\Str;
 use Lunar\Admin\Filament\Resources\CollectionGroupResource\Pages;
 use Lunar\Admin\Support\Resources\BaseResource;
-use Lunar\Models\Contracts\CollectionGroup;
+use Lunar\Models\Contracts\CollectionGroup as CollectionGroupContract;
 
 class CollectionGroupResource extends BaseResource
 {
     protected static ?string $permission = 'catalog:manage-products';
 
-    protected static ?string $model = CollectionGroup::class;
+    protected static ?string $model = CollectionGroupContract::class;
 
     protected static ?int $navigationSort = 3;
 

packages/admin/src/Filament/Resources/CollectionGroupResource/Widgets/CollectionTreeView.php

@@ -20,6 +20,7 @@
 use Lunar\Admin\Support\Actions\Collections\MoveCollection;
 use Lunar\Facades\DB;
 use Lunar\Models\Collection;
+use Lunar\Models\Contracts\Collection as CollectionContract;
 
 class CollectionTreeView extends Widget implements HasActions, HasForms
 {
@@ -191,12 +192,12 @@ public function moveAction()
                     ->label(
                         __('lunarpanel::components.collection-tree-view.actions.move.form.target_id.label')
                     )
-                    ->model(Collection::class)
+                    ->model(Collection::modelClass())
                     ->searchable()
                     ->getSearchResultsUsing(static function (Forms\Components\Select $component, string $search): array {
-                        return get_search_builder(Collection::class, $search)
+                        return get_search_builder(Collection::modelClass(), $search)
                             ->get()
-                            ->mapWithKeys(fn (Collection $record): array => [$record->getKey() => $record->breadcrumb->push($record->translateAttribute('name'))->join(' > ')])
+                            ->mapWithKeys(fn (CollectionContract $record): array => [$record->getKey() => $record->breadcrumb->push($record->translateAttribute('name'))->join(' > ')])
                             ->all();
                     }),
             ])->after(

packages/admin/src/Filament/Resources/CollectionResource.php

@@ -11,13 +11,13 @@
 use Lunar\Admin\Filament\Resources\CollectionResource\Pages;
 use Lunar\Admin\Support\Forms\Components\Attributes;
 use Lunar\Admin\Support\Resources\BaseResource;
-use Lunar\Models\Contracts\Collection;
+use Lunar\Models\Contracts\Collection as CollectionContract;
 
 class CollectionResource extends BaseResource
 {
     protected static ?string $permission = 'catalog:manage-collections';
 
-    protected static ?string $model = Collection::class;
+    protected static ?string $model = CollectionContract::class;
 
     protected static int $globalSearchResultsLimit = 5;
 
@@ -38,7 +38,7 @@ public static function getNavigationItems(): array
         return [];
     }
 
-    public static function getCollectionBreadcrumbs(Collection $collection): array
+    public static function getCollectionBreadcrumbs(CollectionContract $collection): array
     {
         $crumbs = [
             CollectionGroupResource::getUrl('index') => CollectionGroupResource::getPluralLabel(),

packages/admin/src/Filament/Resources/CollectionResource/Pages/EditCollection.php

@@ -10,6 +10,7 @@
 use Lunar\Admin\Support\Pages\BaseEditRecord;
 use Lunar\Facades\DB;
 use Lunar\Models\Collection;
+use Lunar\Models\Contracts\Collection as CollectionContract;
 
 class EditCollection extends BaseEditRecord
 {
@@ -51,22 +52,22 @@ protected function getDefaultHeaderActions(): array
         return [
             DeleteAction::make('delete')->form([
                 Forms\Components\Select::make('target_collection')
-                    ->model(Collection::class)
+                    ->model(Collection::modelClass())
                     ->searchable()
                     ->getSearchResultsUsing(static function (Forms\Components\Select $component, string $search) use ($record): array {
-                        return get_search_builder(Collection::class, $search)
+                        return get_search_builder(Collection::modelClass(), $search)
                             ->get()
                             ->reject(
                                 fn ($result) => $result->isDescendantOf($record)
                             )
-                            ->mapWithKeys(fn (Collection $record): array => [$record->getKey() => $record->translateAttribute('name')])
+                            ->mapWithKeys(fn (CollectionContract $record): array => [$record->getKey() => $record->translateAttribute('name')])
                             ->all();
                     })->helperText(
                         'Choose which collection the children of this collection should be transferred to.'
                     )->hidden(
                         fn () => ! $record->children()->count()
                     ),
-            ])->before(function (Collection $collection, array $data) {
+            ])->before(function (CollectionContract $collection, array $data) {
 
                 $targetId = $data['target_collection'] ?? null;
 

packages/admin/src/Filament/Resources/CollectionResource/Pages/ManageCollectionProducts.php

@@ -14,6 +14,7 @@
 use Lunar\Admin\Filament\Resources\CollectionResource;
 use Lunar\Admin\Filament\Resources\ProductResource;
 use Lunar\Admin\Support\Pages\BaseManageRelatedRecords;
+use Lunar\Models\Contracts\Product as ProductContract;
 use Lunar\Models\Product;
 
 class ManageCollectionProducts extends BaseManageRelatedRecords
@@ -91,7 +92,7 @@ public function table(Table $table): Table
 
                             return get_search_builder($relationModel, $search)
                                 ->get()
-                                ->mapWithKeys(fn (Product $record): array => [$record->getKey() => $record->translateAttribute('name')])
+                                ->mapWithKeys(fn (ProductContract $record): array => [$record->getKey() => $record->translateAttribute('name')])
                                 ->all();
                         }),
                 ])->action(function (array $arguments, array $data, Form $form, Table $table) {

packages/admin/src/Filament/Resources/CollectionResource/Pages/ManageCollectionUrls.php

@@ -4,13 +4,13 @@
 
 use Lunar\Admin\Filament\Resources\CollectionResource;
 use Lunar\Admin\Support\Resources\Pages\ManageUrlsRelatedRecords;
-use Lunar\Models\Collection;
+use Lunar\Models\Contracts\Collection as CollectionContract;
 
 class ManageCollectionUrls extends ManageUrlsRelatedRecords
 {
     protected static string $resource = CollectionResource::class;
 
-    protected static string $model = Collection::class;
+    protected static string $model = CollectionContract::class;
 
     public function getBreadcrumbs(): array
     {

packages/admin/src/Filament/Resources/CurrencyResource.php

@@ -11,13 +11,13 @@
 use Illuminate\Database\Eloquent\Model;
 use Lunar\Admin\Filament\Resources\CurrencyResource\Pages;
 use Lunar\Admin\Support\Resources\BaseResource;
-use Lunar\Models\Contracts\Currency;
+use Lunar\Models\Contracts\Currency as CurrencyContract;
 
 class CurrencyResource extends BaseResource
 {
     protected static ?string $permission = 'settings:core';
 
-    protected static ?string $model = Currency::class;
+    protected static ?string $model = CurrencyContract::class;
 
     protected static ?int $navigationSort = 1;
 

packages/admin/src/Filament/Resources/CustomerGroupResource.php

@@ -13,13 +13,13 @@
 use Lunar\Admin\Filament\Resources\CustomerGroupResource\Pages;
 use Lunar\Admin\Support\Forms\Components\Attributes;
 use Lunar\Admin\Support\Resources\BaseResource;
-use Lunar\Models\Contracts\CustomerGroup;
+use Lunar\Models\Contracts\CustomerGroup as CustomerGroupContract;
 
 class CustomerGroupResource extends BaseResource
 {
     protected static ?string $permission = 'settings:core';
 
-    protected static ?string $model = CustomerGroup::class;
+    protected static ?string $model = CustomerGroupContract::class;
 
     protected static ?int $navigationSort = 1;
 

packages/admin/src/Filament/Resources/CustomerResource.php

@@ -16,13 +16,13 @@
 use Lunar\Admin\Filament\Resources\CustomerResource\RelationManagers\UserRelationManager;
 use Lunar\Admin\Filament\Resources\CustomerResource\Widgets\CustomerStatsOverviewWidget;
 use Lunar\Admin\Support\Resources\BaseResource;
-use Lunar\Models\Contracts\Customer;
+use Lunar\Models\Contracts\Customer as CustomerContract;
 
 class CustomerResource extends BaseResource
 {
     protected static ?string $permission = 'sales:manage-customers';
 
-    protected static ?string $model = Customer::class;
+    protected static ?string $model = CustomerContract::class;
 
     protected static ?int $navigationSort = 2;
 

packages/admin/src/Filament/Resources/CustomerResource/RelationManagers/AddressRelationManager.php

@@ -8,7 +8,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Lunar\Admin\Events\CustomerAddressEdited;
 use Lunar\Admin\Support\RelationManagers\BaseRelationManager;
-use Lunar\Models\Address;
+use Lunar\Models\Contracts\Address as AddressContract;
 use Lunar\Models\State;
 
 class AddressRelationManager extends BaseRelationManager
@@ -71,7 +71,7 @@ public function getDefaultTable(Table $table): Table
                     ->after(
                         fn (Model $record) => CustomerAddressEdited::dispatch($record)
                     )
-                    ->fillForm(fn (Address $record): array => [
+                    ->fillForm(fn (AddressContract $record): array => [
                         'title' => $record->title,
                         'first_name' => $record->first_name,
                         'last_name' => $record->last_name,

packages/admin/src/Filament/Resources/CustomerResource/RelationManagers/OrdersRelationManager.php

@@ -6,7 +6,7 @@
 use Filament\Tables\Table;
 use Lunar\Admin\Filament\Resources\OrderResource;
 use Lunar\Admin\Support\RelationManagers\BaseRelationManager;
-use Lunar\Models\Order;
+use Lunar\Models\Contracts\Order as OrderContract;
 
 class OrdersRelationManager extends BaseRelationManager
 {
@@ -18,7 +18,7 @@ public function getDefaultTable(Table $table): Table
             OrderResource::getTableColumns()
         )->actions([
             Tables\Actions\Action::make('viewOrder')
-                ->url(fn (Order $record): string => route('filament.lunar.resources.orders.order', $record)),
+                ->url(fn (OrderContract $record): string => route('filament.lunar.resources.orders.order', $record)),
         ]);
     }
 }

packages/admin/src/Filament/Resources/DiscountResource.php

@@ -23,14 +23,14 @@
 use Lunar\DiscountTypes\AmountOff;
 use Lunar\DiscountTypes\BuyXGetY;
 use Lunar\Facades\Discounts;
-use Lunar\Models\Contracts\Discount;
+use Lunar\Models\Contracts\Discount as DiscountContract;
 use Lunar\Models\Currency;
 
 class DiscountResource extends BaseResource
 {
     protected static ?string $permission = 'sales:manage-discounts';
 
-    protected static ?string $model = Discount::class;
+    protected static ?string $model = DiscountContract::class;
 
     protected static ?int $navigationSort = 3;
 

packages/admin/src/Filament/Resources/DiscountResource/RelationManagers/ProductConditionRelationManager.php

@@ -7,6 +7,7 @@
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Model;
 use Lunar\Admin\Support\RelationManagers\BaseRelationManager;
+use Lunar\Models\Contracts\Product as ProductContract;
 use Lunar\Models\Product;
 
 class ProductConditionRelationManager extends BaseRelationManager
@@ -38,20 +39,20 @@ public function getDefaultTable(Table $table): Table
             ->paginated(false)
             ->modifyQueryUsing(
                 fn ($query) => $query->whereIn('type', ['condition'])
-                    ->wherePurchasableType(Product::class)
+                    ->wherePurchasableType(Product::modelClass())
                     ->whereHas('purchasable')
             )
             ->headerActions([
                 Tables\Actions\CreateAction::make()->form([
                     Forms\Components\MorphToSelect::make('purchasable')
                         ->searchable(true)
                         ->types([
-                            Forms\Components\MorphToSelect\Type::make(Product::class)
+                            Forms\Components\MorphToSelect\Type::make(Product::modelClass())
                                 ->titleAttribute('name.en')
                                 ->getSearchResultsUsing(static function (Forms\Components\Select $component, string $search): array {
-                                    return get_search_builder(Product::class, $search)
+                                    return get_search_builder(Product::modelClass(), $search)
                                         ->get()
-                                        ->mapWithKeys(fn (Product $record): array => [$record->getKey() => $record->attr('name')])
+                                        ->mapWithKeys(fn (ProductContract $record): array => [$record->getKey() => $record->attr('name')])
                                         ->all();
                                 }),
                         ]),