Add support for Statamic 5 (#51)

aerni · May 9, 2024 · d0f9732 · d0f9732
1 parent 25490b7
commit d0f9732
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
@@ -10,11 +10,13 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         php: [8.2, 8.3]
-        laravel: [10.*]
+        laravel: [10.*, 11.*]
         stability: [prefer-lowest, prefer-stable]
         include:
           - laravel: 10.*
             testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

diff --git a/composer.json b/composer.json
@@ -19,11 +19,11 @@
     "require": {
         "php": "^8.2",
         "jonassiewertsen/statamic-livewire": "^3.0",
-        "laravel/framework": "^10.0",
+        "laravel/framework": "^10.0 || ^11.0",
         "laravel/prompts": "^0.1.13",
         "livewire/livewire": "^3.2",
         "spatie/invade": "^2.0",
-        "statamic/cms": "^4.9"
+        "statamic/cms": "^5.0"
     },
     "require-dev": {
         "orchestra/testbench": "^8.19",

diff --git a/src/Commands/MakeTheme.php b/src/Commands/MakeTheme.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
+use Illuminate\Support\Str;
 use Statamic\Console\RunsInPlease;
 
 use function Laravel\Prompts\confirm;
@@ -21,7 +22,7 @@ class MakeTheme extends Command
     public function handle(): void
     {
         $name = $this->argument('name') ?? text(label: 'What do you want to name the theme?', required: true);
-        $path = resource_path('views/'.config('livewire-forms.view_path').'/'.snake_case($name));
+        $path = resource_path('views/'.config('livewire-forms.view_path').'/'.Str::snake($name));
 
         if (! File::exists($path) || confirm(label: 'A theme with this name already exists. Do you want to overwrite it?', default: false)) {
             File::copyDirectory(__DIR__.'/../../resources/views/default/', $path);

diff --git a/src/Commands/MakeView.php b/src/Commands/MakeView.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
+use Illuminate\Support\Str;
 use Statamic\Console\RunsInPlease;
 
 use function Laravel\Prompts\confirm;
@@ -22,7 +23,7 @@ public function handle(): void
     {
         $name = $this->argument('name') ?? text(label: 'What do you want to name the view?', required: true);
         $stub = File::get(__DIR__.'/../../resources/views/default.blade.php');
-        $filename = str_slug($name).'.blade.php';
+        $filename = Str::slug($name).'.blade.php';
         $path = resource_path('views/'.config('livewire-forms.view_path')."/{$filename}");
 
         if (! File::exists($path) || confirm(label: 'A view with this name already exists. Do you want to overwrite it?', default: false)) {

diff --git a/src/Fields/Properties/WithRules.php b/src/Fields/Properties/WithRules.php
@@ -2,14 +2,15 @@
 
 namespace Aerni\LivewireForms\Fields\Properties;
 
+use Illuminate\Support\Arr;
 use Statamic\Fields\Validator;
 
 trait WithRules
 {
     protected function rulesProperty(string|array|null $rules = null): array
     {
         $rules = is_null($rules)
-            ? array_flatten($this->field->rules())
+            ? Arr::flatten($this->field->rules())
             : Validator::explodeRules($rules);
 
         return [$this->key => $rules];

diff --git a/src/Fields/Select.php b/src/Fields/Select.php
@@ -6,6 +6,7 @@
 use Aerni\LivewireForms\Fields\Properties\WithMultiple;
 use Aerni\LivewireForms\Fields\Properties\WithOptions;
 use Aerni\LivewireForms\Fields\Properties\WithPlaceholder;
+use Illuminate\Support\Arr;
 
 class Select extends Field
 {
@@ -45,7 +46,7 @@ protected function defaultProperty(mixed $default = null): string|array|null
 
     protected function rulesProperty(string|array|null $rules = null): array
     {
-        $rules = array_first(parent::rulesProperty($rules));
+        $rules = Arr::first(parent::rulesProperty($rules));
 
         if ($this->multiple && $this->max_items) {
             $rules[] = "max:{$this->max_items}";

diff --git a/src/Fields/Toggle.php b/src/Fields/Toggle.php
@@ -3,6 +3,7 @@
 namespace Aerni\LivewireForms\Fields;
 
 use Aerni\LivewireForms\Fields\Properties\WithInlineLabel;
+use Illuminate\Support\Arr;
 
 class Toggle extends Field
 {
@@ -12,7 +13,7 @@ class Toggle extends Field
 
     protected function rulesProperty(string|array|null $rules = null): array
     {
-        $rules = array_first(parent::rulesProperty($rules));
+        $rules = Arr::first(parent::rulesProperty($rules));
 
         if (in_array('required', $rules)) {
             $rules[] = 'accepted';

diff --git a/src/Livewire/Concerns/HandlesValidation.php b/src/Livewire/Concerns/HandlesValidation.php
@@ -2,6 +2,7 @@
 
 namespace Aerni\LivewireForms\Livewire\Concerns;
 
+use Illuminate\Support\Arr;
 use Livewire\Attributes\Locked;
 
 trait HandlesValidation
@@ -45,7 +46,7 @@ public function bootHandlesValidation(): void
 
     public function resetStepErrorBag(string|array $keys): void
     {
-        array_forget($this->stepErrors, $keys);
+        Arr::forget($this->stepErrors, $keys);
 
         $this->setErrorBag($this->stepErrors);
     }