Laravel 12 (#1)

* Add support for Laravel 12

* Fix typo

* Rename config file

* Add 🍺 and run formatting

* Apply formatting and cleanup

Author: marcorieser

composer.json

@@ -30,7 +30,7 @@
     },
     "require": {
         "php": "^8.1",
-        "illuminate/support": "^10.0|^11.0",
+        "illuminate/support": "^10.0|^11.0|^12.0",
         "statamic/cms": "^4.23.2|^5.0",
         "livewire/livewire": "^3.0"
     },
@@ -44,5 +44,13 @@
                 "MarcoRieser\\Livewire\\ServiceProvider"
             ]
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "pixelfear/composer-dist-plugin": true
+        }
+    },
+    "require-dev": {
+        "laravel/pint": "^1.21"
     }
 }

config/config.php config/statamic-livewire.php

@@ -14,7 +14,7 @@
     | It's recommended to remove or uncomment those synthesizers that are
     | not used in your application, to avoid overhead by loading those.
     |
-    | This features is experimental. It's ment to be tested and to played
+    | This features is experimental. It's meant to be tested and to played
     | with. As long as it is experimental, it can be changed and removed
     | at any point without a warning.
     |

src/Replacers/AssetsReplacer.php

@@ -12,13 +12,13 @@
 
 class AssetsReplacer implements Replacer
 {
-    public function prepareResponseToCache(Response $responseToBeCached, Response $initialResponse)
+    public function prepareResponseToCache(Response $response, Response $initial): void
     {
-        if (! $content = $responseToBeCached->getContent()) {
+        if (! $content = $response->getContent()) {
             return;
         }
 
-        // Don't disturb Livewire's assets injection when caching is off.
+        // Don't disturb Livewires assets injection when caching is off.
         if (app(Cacher::class) instanceof NullCacher) {
             return;
         }
@@ -47,19 +47,21 @@ public function prepareResponseToCache(Response $responseToBeCached, Response $i
             app(FrontendAssets::class)->hasRenderedScripts = false;
         }
 
-        $responseToBeCached->setContent(
+        $response->setContent(
             SupportAutoInjectedAssets::injectAssets($content, $assetsHead, $assetsBody)
         );
     }
 
-    protected function shouldInjectLivewireAssets()
+    protected function shouldInjectLivewireAssets(): bool
     {
         if (! SupportAutoInjectedAssets::$forceAssetInjection && config('livewire.inject_assets', true) === false) {
             return false;
         }
+
         if ((! SupportAutoInjectedAssets::$hasRenderedAComponentThisRequest) && (! SupportAutoInjectedAssets::$forceAssetInjection)) {
             return false;
         }
+
         if (app(FrontendAssets::class)->hasRenderedScripts) {
             return false;
         }

src/ServiceProvider.php

@@ -15,11 +15,11 @@ class ServiceProvider extends AddonServiceProvider
 
     public function bootAddon(): void
     {
-        $this->mergeConfigFrom(__DIR__.'/../config/config.php', 'statamic-livewire');
+        $this->mergeConfigFrom(__DIR__.'/../config/statamic-livewire.php', 'statamic-livewire');
 
         if ($this->app->runningInConsole()) {
             $this->publishes([
-                __DIR__.'/../config/config.php' => config_path('statamic-livewire.php'),
+                __DIR__.'/../config/statamic-livewire.php' => config_path('statamic-livewire.php'),
             ], 'statamic-livewire');
         }
 

src/Synthesizers/EntryCollectionSynthesizer.php

@@ -2,21 +2,22 @@
 
 namespace MarcoRieser\Livewire\Synthesizers;
 
+use Carbon\CarbonInterface;
 use Illuminate\Support\Carbon;
 use Livewire\Mechanisms\HandleComponents\Synthesizers\Synth;
-use Statamic\Entries\Entry;
 use Statamic\Entries\EntryCollection as StatamicEntryCollection;
+use Statamic\Facades\Entry;
 
 class EntryCollectionSynthesizer extends Synth
 {
-    public static $key = 'statamic-entry-collection';
+    public static string $key = 'statamic-entry-collection';
 
-    public static function match($target)
+    public static function match($target): bool
     {
         return $target instanceof StatamicEntryCollection;
     }
 
-    public function dehydrate($target)
+    public function dehydrate($target): array
     {
         $data = [];
 
@@ -33,7 +34,7 @@ public function dehydrate($target)
         return [$data, []];
     }
 
-    public function hydrate($values)
+    public function hydrate($values): StatamicEntryCollection
     {
         $items = [];
 
@@ -47,11 +48,11 @@ public function hydrate($values)
             if ($value['date']) {
                 $date = $value['date'];
 
-                if (! $date instanceof \Carbon\CarbonInterface) {
+                if (! $date instanceof CarbonInterface) {
                     $date = Carbon::parse($date);
                 }
 
-                $entry->date($date ?? null);
+                $entry->date($date);
             }
 
             $items[] = $entry;

src/Synthesizers/EntrySynthesizer.php

@@ -2,20 +2,22 @@
 
 namespace MarcoRieser\Livewire\Synthesizers;
 
+use Carbon\CarbonInterface;
+use Illuminate\Support\Carbon;
 use Livewire\Mechanisms\HandleComponents\Synthesizers\Synth;
-use Statamic\Entries\Entry as StatamicEntry;
-use Statamic\Facades\Entry;
+use Statamic\Contracts\Entries\Entry;
+use Statamic\Facades\Entry as EntryFacade;
 
 class EntrySynthesizer extends Synth
 {
-    public static $key = 'statamic-entry';
+    public static string $key = 'statamic-entry';
 
-    public static function match($target)
+    public static function match($target): bool
     {
-        return $target instanceof StatamicEntry;
+        return $target instanceof Entry;
     }
 
-    public function dehydrate($entry)
+    public function dehydrate(Entry $entry): array
     {
         return [
             [
@@ -27,16 +29,22 @@ public function dehydrate($entry)
             ], []];
     }
 
-    public function hydrate($value)
+    public function hydrate($value): Entry
     {
-        $entry = Entry::make()
+        $entry = EntryFacade::make()
             ->id($value['id'])
             ->slug($value['slug'] ?? null)
             ->collection($value['collection'] ?? null)
             ->data($value['data']);
 
         if ($value['date']) {
-            $entry->date($value['date'] ?? null);
+            $date = $value['date'];
+
+            if (! $date instanceof CarbonInterface) {
+                $date = Carbon::parse($date);
+            }
+
+            $entry->date($date);
         }
 
         return $entry;

src/Synthesizers/FieldSynthesizer.php

@@ -7,14 +7,14 @@
 
 class FieldSynthesizer extends Synth
 {
-    public static $key = 'statamic-field';
+    public static string $key = 'statamic-field';
 
-    public static function match($target)
+    public static function match($target): bool
     {
         return $target instanceof Field;
     }
 
-    public function dehydrate($target, $dehydrateChild)
+    public function dehydrate($target, $dehydrateChild): array
     {
         $data = [
             'handle' => $target->handle(),
@@ -28,7 +28,7 @@ public function dehydrate($target, $dehydrateChild)
         return [$data, []];
     }
 
-    public function hydrate($value, $meta, $hydrateChild)
+    public function hydrate($value, $meta, $hydrateChild): Field
     {
         foreach ($value as $key => $child) {
             $value[$key] = $hydrateChild($key, $child);

src/Synthesizers/FieldtypeSynthesizer.php

@@ -7,14 +7,14 @@
 
 class FieldtypeSynthesizer extends Synth
 {
-    public static $key = 'statamic-fieldtype';
+    public static string $key = 'statamic-fieldtype';
 
-    public static function match($target)
+    public static function match($target): bool
     {
         return $target instanceof Fieldtype;
     }
 
-    public function dehydrate($target, $dehydrateChild)
+    public function dehydrate($target, $dehydrateChild): array
     {
         $data = [
             'field' => $target->field(),

src/Synthesizers/ValueSynthesizer.php

@@ -9,14 +9,14 @@
 
 class ValueSynthesizer extends Synth
 {
-    public static $key = 'statamic-value';
+    public static string $key = 'statamic-value';
 
-    public static function match($target)
+    public static function match($target): bool
     {
         return $target instanceof Value;
     }
 
-    public function dehydrate($target, $dehydrateChild)
+    public function dehydrate($target, $dehydrateChild): array
     {
         $value = invade($target);
 
@@ -35,7 +35,7 @@ public function dehydrate($target, $dehydrateChild)
         return [$data, []];
     }
 
-    public function hydrate($value, $meta, $hydrateChild)
+    public function hydrate($value, $meta, $hydrateChild): Value
     {
         foreach ($value as $key => $child) {
             $value[$key] = $hydrateChild($key, $child);

src/Tags/Livewire.php

@@ -2,7 +2,10 @@
 
 namespace MarcoRieser\Livewire\Tags;
 
+use Livewire\Features\SupportScriptsAndAssets\SupportScriptsAndAssets;
+use Livewire\Mechanisms\FrontendAssets\FrontendAssets;
 use Statamic\Tags\Tags;
+use function Livewire\store;
 
 class Livewire extends Tags
 {
@@ -37,13 +40,13 @@ public function entangle(): string
         $modifier = $this->params->get('modifier');
         $instanceId = $this->context['__livewire']->getId();
 
-        $expression = ".entangle('{$property}')";
+        $expression = ".entangle('$property')";
 
         if ($modifier) {
-            $expression .= ".{$modifier}";
+            $expression .= ".$modifier";
         }
 
-        return "window.Livewire.find('$instanceId'){$expression}";
+        return "window.Livewire.find('$instanceId')$expression";
     }
 
     /**
@@ -57,14 +60,14 @@ public function this(): string
         $instanceId = $this->context['__livewire']->getId();
 
         if (! count($this->params)) {
-            return "window.Livewire.find('{$instanceId}')";
+            return "window.Livewire.find('$instanceId')";
         }
 
         $action = $this->params->take(1)->toArray();
         $method = key($action);
         $parameters = reset($action);
 
-        return "window.Livewire.find('{$instanceId}').{$method}{$parameters}";
+        return "window.Livewire.find('$instanceId').$method$parameters";
     }
 
     /**
@@ -74,7 +77,7 @@ public function this(): string
      */
     public function styles(): string
     {
-        return \Livewire\Mechanisms\FrontendAssets\FrontendAssets::styles();
+        return FrontendAssets::styles();
     }
 
     /**
@@ -84,7 +87,7 @@ public function styles(): string
      */
     public function scripts(): string
     {
-        return \Livewire\Mechanisms\FrontendAssets\FrontendAssets::scripts();
+        return FrontendAssets::scripts();
     }
 
     /**
@@ -94,7 +97,7 @@ public function scripts(): string
      */
     public function scriptConfig(): string
     {
-        return \Livewire\Mechanisms\FrontendAssets\FrontendAssets::scriptConfig();
+        return FrontendAssets::scriptConfig();
     }
 
     /**
@@ -108,11 +111,11 @@ public function assets(): void
 
         $key = md5($html);
 
-        if (in_array($key, \Livewire\Features\SupportScriptsAndAssets\SupportScriptsAndAssets::$alreadyRunAssetKeys)) {
+        if (in_array($key, SupportScriptsAndAssets::$alreadyRunAssetKeys)) {
             // Skip it...
         } else {
-            \Livewire\Features\SupportScriptsAndAssets\SupportScriptsAndAssets::$alreadyRunAssetKeys[] = $key;
-            \Livewire\store($this->context['__livewire'])->push('assets', $html, $key);
+            SupportScriptsAndAssets::$alreadyRunAssetKeys[] = $key;
+            store($this->context['__livewire'])->push('assets', $html, $key);
         }
     }
 
@@ -127,6 +130,6 @@ public function script(): void
 
         $key = md5($html);
 
-        \Livewire\store($this->context['__livewire'])->push('scripts', $html, $key);
+        store($this->context['__livewire'])->push('scripts', $html, $key);
     }
 }