Force EloquentModelSynth and EloquentCollectionSynth sync (#1155)

* force EloquentModelSynth and EloquentCollectionSynth sync * fix phpstan * wip * Remove support php 8.3 gc * wip
Power-Components · Sep 16, 2023 · 192484f · 192484f
1 parent 30c38f3
commit 192484f
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 50 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -39,7 +39,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [ 8.3, 8.2, 8.1 ]
+        php: [ 8.2, 8.1 ]
         laravel: [ 10.* ]
         dependency-version: [ prefer-stable ]
 

diff --git a/composer.json b/composer.json
@@ -20,12 +20,12 @@
     "require": {
         "php": "^8.1",
         "doctrine/dbal": "2.12.1 | ^3.6.6",
-        "livewire/livewire": "^3.0.2"
+        "livewire/livewire": "^3.0.5"
     },
     "require-dev": {
-        "pestphp/pest": "^2.17.0",
-        "orchestra/testbench": "^8.10.1",
-        "composer/composer": "^2.6.2",
+        "pestphp/pest": "^2.18.2",
+        "orchestra/testbench": "^8.10.2",
+        "composer/composer": "^2.6.3",
         "laravel/pint": "^1.13.1",
         "nunomaduro/larastan": "^2.6.4",
         "laradumps/laradumps-core": "^0.3.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/PowerGridComponent.php b/src/PowerGridComponent.php
@@ -91,6 +91,7 @@ public function mount(): void
 
         $this->throwFeatureDetail();
         $this->throwColumnAction();
+        $this->throwInjectMorphMarkers();
 
         $this->columns = $this->columns();
 
@@ -118,7 +119,10 @@ private function throwFeatureDetail(): void
         ) {
             throw new Exception('The Feature Responsive cannot be used with Detail');
         }
+    }
 
+    private function throwInjectMorphMarkers(): void
+    {
         if (
             array_key_exists('detail', $this->setUp)
             && config('livewire.inject_morph_markers') === true

diff --git a/src/Providers/PowerGridServiceProvider.php b/src/Providers/PowerGridServiceProvider.php
@@ -4,6 +4,8 @@
 
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
+use Livewire\Features\SupportLegacyModels\{EloquentCollectionSynth, EloquentModelSynth};
+use Livewire\Livewire;
 use PowerComponents\LivewirePowerGrid\Commands\{CreateCommand, PublishCommand, UpdateCommand};
 use PowerComponents\LivewirePowerGrid\Components\Actions\Macros;
 use PowerComponents\LivewirePowerGrid\Components\Filters\FilterManager;
@@ -27,6 +29,9 @@ public function boot(): void
         $this->publishViews();
         $this->publishConfigs();
         $this->loadTranslationsFrom(__DIR__ . '/../../resources/lang', $this->packageName);
+
+        Livewire::propertySynthesizer(EloquentModelSynth::class);
+        Livewire::propertySynthesizer(EloquentCollectionSynth::class);
     }
 
     public function register(): void