Version 9

.github/workflows/run-tests.yaml

@@ -0,0 +1,45 @@
+name: run-tests
+
+on: ['push', 'pull_request']
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ubuntu-latest]
+        php: [8.2, 8.3]
+        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 }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+          coverage: none
+
+      - name: Setup problem matchers
+        run: |
+          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+
+      - name: Execute tests
+        run: vendor/bin/pest

.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 composer.lock
 vendor
 node_modules

composer.json

@@ -17,26 +17,45 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "jonassiewertsen/statamic-livewire": "^3.0",
-        "laravel/framework": "^10.0",
-        "livewire/livewire": "^3.0",
-        "statamic/cms": "^4.9"
+        "laravel/framework": "^10.0 || ^11.0",
+        "laravel/prompts": "^0.1.13",
+        "livewire/livewire": "^3.2",
+        "spatie/invade": "^2.0",
+        "statamic/cms": "^5.0"
+    },
+    "require-dev": {
+        "orchestra/testbench": "^8.19",
+        "pestphp/pest": "^2.32",
+        "pestphp/pest-plugin-laravel": "^2.2",
+        "pestphp/pest-plugin-livewire": "^2.1"
     },
     "autoload": {
         "psr-4": {
             "Aerni\\LivewireForms\\": "src"
         }
     },
+    "autoload-dev" : {
+        "psr-4" : {
+            "Aerni\\LivewireForms\\Tests\\" : "tests"
+        }
+    },
     "config": {
         "optimize-autoloader": true,
         "preferred-install": "dist",
         "sort-packages": true,
         "allow-plugins": {
             "composer/package-versions-deprecated": true,
-            "pixelfear/composer-dist-plugin": true
+            "pixelfear/composer-dist-plugin": true,
+            "pestphp/pest-plugin": true
         }
     },
+    "scripts": {
+        "test": [
+            "./vendor/bin/pest"
+        ]
+    },
     "extra": {
         "statamic": {
             "name": "Livewire Forms",

config/livewire-forms.php

@@ -4,48 +4,59 @@
 
     /*
     |--------------------------------------------------------------------------
-    | Default View
+    | Field Models
     |--------------------------------------------------------------------------
     |
-    | This view will be used if you don't specify one on the component.
+    | You may change the model of each fieldtype with your own implementation.
     |
     */
 
-    'view' => 'default',
+    'models' => [
+        Aerni\LivewireForms\Fieldtypes\Captcha::class => Aerni\LivewireForms\Fields\Captcha::class,
+        Statamic\Fieldtypes\Assets\Assets::class => Aerni\LivewireForms\Fields\Assets::class,
+        Statamic\Fieldtypes\Checkboxes::class => Aerni\LivewireForms\Fields\Checkboxes::class,
+        Statamic\Fieldtypes\Hidden::class => Aerni\LivewireForms\Fields\Hidden::class,
+        Statamic\Fieldtypes\Integer::class => Aerni\LivewireForms\Fields\Integer::class,
+        Statamic\Fieldtypes\Radio::class => Aerni\LivewireForms\Fields\Radio::class,
+        Statamic\Fieldtypes\Select::class => Aerni\LivewireForms\Fields\Select::class,
+        Statamic\Fieldtypes\Spacer::class => Aerni\LivewireForms\Fields\Spacer::class,
+        Statamic\Fieldtypes\Text::class => Aerni\LivewireForms\Fields\Text::class,
+        Statamic\Fieldtypes\Textarea::class => Aerni\LivewireForms\Fields\Textarea::class,
+        Statamic\Fieldtypes\Toggle::class => Aerni\LivewireForms\Fields\Toggle::class,
+    ],
 
     /*
     |--------------------------------------------------------------------------
-    | Default Theme
+    | View Path
     |--------------------------------------------------------------------------
     |
-    | This theme will be used if you don't specify one on the component.
+    | The path under resources/views where the form views are published and loaded from.
     |
     */
 
-    'theme' => 'default',
+    'view_path' => 'livewire/forms',
 
     /*
     |--------------------------------------------------------------------------
-    | Field Models
+    | Default View
     |--------------------------------------------------------------------------
     |
-    | You may change the model of each fieldtype with your own implementation.
+    | The default view that is used if you don't specify one on the component.
     |
     */
 
-    'models' => [
-        \Aerni\LivewireForms\Fieldtypes\Captcha::class => \Aerni\LivewireForms\Fields\Captcha::class,
-        \Statamic\Fieldtypes\Assets\Assets::class => \Aerni\LivewireForms\Fields\Assets::class,
-        \Statamic\Fieldtypes\Checkboxes::class => \Aerni\LivewireForms\Fields\Checkbox::class,
-        \Statamic\Fieldtypes\Hidden::class => \Aerni\LivewireForms\Fields\Hidden::class,
-        \Statamic\Fieldtypes\Integer::class => \Aerni\LivewireForms\Fields\Integer::class,
-        \Statamic\Fieldtypes\Radio::class => \Aerni\LivewireForms\Fields\Radio::class,
-        \Statamic\Fieldtypes\Select::class => \Aerni\LivewireForms\Fields\Select::class,
-        \Statamic\Fieldtypes\Spacer::class => \Aerni\LivewireForms\Fields\Spacer::class,
-        \Statamic\Fieldtypes\Text::class => \Aerni\LivewireForms\Fields\Text::class,
-        \Statamic\Fieldtypes\Textarea::class => \Aerni\LivewireForms\Fields\Textarea::class,
-        \Statamic\Fieldtypes\Toggle::class => \Aerni\LivewireForms\Fields\Toggle::class,
-    ],
+    'view' => 'default',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Theme
+    |--------------------------------------------------------------------------
+    |
+    | The default theme that is used if you don't specify one on the component.
+    |
+    */
+
+    'theme' => 'default',
 
     /*
     |--------------------------------------------------------------------------