From 57c15693c1a97a24fac1259affb345c3f48995f9 Mon Sep 17 00:00:00 2001
From: Shift <shift@laravelshift.com>
Date: Tue, 27 Feb 2024 18:17:06 +0000
Subject: [PATCH 01/16] Bump dependencies for Laravel 11

---
 composer.json | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 80d14d8e..3ba888d2 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,12 @@
 {
     "name": "kris/laravel-form-builder",
     "description": "Laravel form builder - symfony like",
-    "keywords": ["laravel", "form", "builder","symfony"],
+    "keywords": [
+        "laravel",
+        "form",
+        "builder",
+        "symfony"
+    ],
     "license": "MIT",
     "authors": [
         {
@@ -12,11 +17,11 @@
     "require": {
         "php": ">=7.4",
         "laravelcollective/html": "^6",
-        "illuminate/database": "^6 || ^7 || ^8 || ^9 || ^10",
-        "illuminate/validation": "^6 || ^7 || ^8 || ^9 || ^10"
+        "illuminate/database": "^6 || ^7 || ^8 || ^9 || ^10 || ^11.0",
+        "illuminate/validation": "^6 || ^7 || ^8 || ^9 || ^10 || ^11.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.13 || ^7.0 || ^8"
+        "orchestra/testbench": "^6.13 || ^7.0 || ^8 || ^9.0"
     },
     "extra": {
         "branch-alias": {

From ceb6f4727a324cb18591a863a309f0ec094fee7f Mon Sep 17 00:00:00 2001
From: Rudie Dirkx <github@hotblocks.nl>
Date: Wed, 20 Mar 2024 15:43:47 +0100
Subject: [PATCH 02/16] php-laravel versions matrix I

---
 .github/workflows/test.yml | 24 ++++++++++++------------
 composer.json              | 15 +++++----------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a1202972..6e16a30f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,14 +9,14 @@ env:
 
 jobs:
   test:
-    name: "Build"
+    name: "Build PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}"
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 12
       fail-fast: false
       matrix:
-        php: ['7.4', '8.0', '8.1', '8.2']
-        package-release: [dist]
+        php: ['8.0', '8.1', '8.2', '8.3']
+        laravel: ['9', '10', '11']
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -37,21 +37,21 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: composer-${{ runner.os }}-${{ matrix.php }}-${{ matrix.package-release }}-${{ hashFiles('**/composer.json') }}
+          key: composer-${{ runner.os }}-${{ matrix.php }}-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }}
           restore-keys: |
-            composer-${{ runner.os }}-${{ matrix.php }}-${{ matrix.package-release }}-${{ env.cache-name }}-
-            composer-${{ runner.os }}-${{ matrix.php }}-${{ matrix.package-release }}-
+            composer-${{ runner.os }}-${{ matrix.php }}-${{ matrix.laravel }}-${{ env.cache-name }}-
+            composer-${{ runner.os }}-${{ matrix.php }}-${{ matrix.laravel }}-
             composer-${{ runner.os }}-${{ matrix.php }}-
             composer-${{ runner.os }}-
 
       - name: Install composer dependencies
-        run: composer install --no-progress --no-interaction --prefer-${{ matrix.package-release }}
+        run: composer require laravel/framework:${{ matrix.laravel }} --no-progress --no-interaction ${{ matrix.laravel }}
 
       - name: Run unit tests
         run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
 
-      - name: Upload to Scrutinizer
-        continue-on-error: true
-        run: |
-          composer global require scrutinizer/ocular
-          ~/.composer/vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover
+      # - name: Upload to Scrutinizer
+      #   continue-on-error: true
+      #   run: |
+      #     composer global require scrutinizer/ocular
+      #     ~/.composer/vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover
diff --git a/composer.json b/composer.json
index 3ba888d2..fd305979 100644
--- a/composer.json
+++ b/composer.json
@@ -1,12 +1,7 @@
 {
     "name": "kris/laravel-form-builder",
     "description": "Laravel form builder - symfony like",
-    "keywords": [
-        "laravel",
-        "form",
-        "builder",
-        "symfony"
-    ],
+    "keywords": ["laravel", "form", "builder", "symfony"],
     "license": "MIT",
     "authors": [
         {
@@ -15,13 +10,13 @@
         }
     ],
     "require": {
-        "php": ">=7.4",
+        "php": "^8.0",
         "laravelcollective/html": "^6",
-        "illuminate/database": "^6 || ^7 || ^8 || ^9 || ^10 || ^11.0",
-        "illuminate/validation": "^6 || ^7 || ^8 || ^9 || ^10 || ^11.0"
+        "illuminate/database": "^6 || ^7 || ^8 || ^9 || ^10 || ^11",
+        "illuminate/validation": "^6 || ^7 || ^8 || ^9 || ^10 || ^11"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.13 || ^7.0 || ^8 || ^9.0"
+        "orchestra/testbench": "^6.13 || ^7 || ^8 || ^9"
     },
     "extra": {
         "branch-alias": {

From 1932fe9ab3845fd6da9fbcc350351348751b6406 Mon Sep 17 00:00:00 2001
From: Rudie Dirkx <github@hotblocks.nl>
Date: Wed, 20 Mar 2024 15:45:32 +0100
Subject: [PATCH 03/16] php-laravel versions matrix II

---
 .github/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6e16a30f..51580a49 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,8 +15,8 @@ jobs:
       max-parallel: 12
       fail-fast: false
       matrix:
-        php: ['8.0', '8.1', '8.2', '8.3']
-        laravel: ['9', '10', '11']
+        php: ['8.1', '8.2', '8.3']
+        laravel: ['10', '11']
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -45,7 +45,7 @@ jobs:
             composer-${{ runner.os }}-
 
       - name: Install composer dependencies
-        run: composer require laravel/framework:${{ matrix.laravel }} --no-progress --no-interaction ${{ matrix.laravel }}
+        run: composer require laravel/framework:^${{ matrix.laravel }}.0 --no-progress --no-interaction ${{ matrix.laravel }}
 
       - name: Run unit tests
         run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover

From 5791f967678e2b8c902edd32131c8942d1167a6f Mon Sep 17 00:00:00 2001
From: Rudie Dirkx <github@hotblocks.nl>
Date: Wed, 20 Mar 2024 15:48:09 +0100
Subject: [PATCH 04/16] php-laravel versions matrix III

---
 .github/workflows/test.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 51580a49..b45515d7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,11 +12,11 @@ jobs:
     name: "Build PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}"
     runs-on: ubuntu-latest
     strategy:
-      max-parallel: 12
-      fail-fast: false
+      max-parallel: 6 # 12
+      fail-fast: true # false
       matrix:
-        php: ['8.1', '8.2', '8.3']
-        laravel: ['10', '11']
+        php: ['8.1', '8.2', '8.3'] # ['8.0', '8.1', '8.2', '8.3']
+        laravel: ['10', '11'] # ['9', '10', '11']
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -45,7 +45,7 @@ jobs:
             composer-${{ runner.os }}-
 
       - name: Install composer dependencies
-        run: composer require laravel/framework:^${{ matrix.laravel }}.0 --no-progress --no-interaction ${{ matrix.laravel }}
+        run: composer require illuminate/database:^${{ matrix.laravel }}.0 illuminate/validation:^${{ matrix.laravel }}.0 --no-progress --no-interaction ${{ matrix.laravel }}
 
       - name: Run unit tests
         run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover

From ee29f5a7d8e8430c1ee6c73da70b0fe170ffdcbd Mon Sep 17 00:00:00 2001
From: Rudie Dirkx <github@hotblocks.nl>
Date: Wed, 20 Mar 2024 16:06:47 +0100
Subject: [PATCH 05/16] php-laravel versions matrix IV

---
 .github/workflows/test.yml | 2 +-
 composer.json              | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b45515d7..f5abee88 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -45,7 +45,7 @@ jobs:
             composer-${{ runner.os }}-
 
       - name: Install composer dependencies
-        run: composer require illuminate/database:^${{ matrix.laravel }}.0 illuminate/validation:^${{ matrix.laravel }}.0 --no-progress --no-interaction ${{ matrix.laravel }}
+        run: composer require --no-progress --no-interaction illuminate/database:^${{ matrix.laravel }}.0 illuminate/validation:^${{ matrix.laravel }}.0
 
       - name: Run unit tests
         run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
diff --git a/composer.json b/composer.json
index fd305979..8d587707 100644
--- a/composer.json
+++ b/composer.json
@@ -11,9 +11,9 @@
     ],
     "require": {
         "php": "^8.0",
-        "laravelcollective/html": "^6",
-        "illuminate/database": "^6 || ^7 || ^8 || ^9 || ^10 || ^11",
-        "illuminate/validation": "^6 || ^7 || ^8 || ^9 || ^10 || ^11"
+        "rdx/laravelcollective-html": "^6",
+        "illuminate/database": "^10.0",
+        "illuminate/validation": "^10.0"
     },
     "require-dev": {
         "orchestra/testbench": "^6.13 || ^7 || ^8 || ^9"

From a009114f444fcd0c94bb5daf6808d8a0185cf03e Mon Sep 17 00:00:00 2001
From: Rudie Dirkx <github@hotblocks.nl>
Date: Wed, 20 Mar 2024 16:11:16 +0100
Subject: [PATCH 06/16] php-laravel versions matrix V

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f5abee88..48edf2d0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 6 # 12
-      fail-fast: true # false
+      fail-fast: false
       matrix:
         php: ['8.1', '8.2', '8.3'] # ['8.0', '8.1', '8.2', '8.3']
         laravel: ['10', '11'] # ['9', '10', '11']

From 76eab4ad9c632be5e823f695213dcdb6b730cd5e Mon Sep 17 00:00:00 2001
From: Rudie Dirkx <github@hotblocks.nl>
Date: Wed, 20 Mar 2024 16:17:30 +0100
Subject: [PATCH 07/16] php-laravel versions matrix VI

---
 .github/workflows/test.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 48edf2d0..3be97297 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,8 +15,10 @@ jobs:
       max-parallel: 6 # 12
       fail-fast: false
       matrix:
-        php: ['8.1', '8.2', '8.3'] # ['8.0', '8.1', '8.2', '8.3']
-        laravel: ['10', '11'] # ['9', '10', '11']
+        php: ['8.1', '8.2', '8.3']
+        laravel: ['10', '11']
+        exclude:
+          - {php: '8.1', laravel: '10'}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3

From 10e9813ed006b517691bf5aeb88ac39a50832487 Mon Sep 17 00:00:00 2001
From: Rudie Dirkx <github@hotblocks.nl>
Date: Wed, 20 Mar 2024 16:19:23 +0100
Subject: [PATCH 08/16] php-laravel versions matrix VII

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3be97297..a3b237c4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
         php: ['8.1', '8.2', '8.3']
         laravel: ['10', '11']
         exclude:
-          - {php: '8.1', laravel: '10'}
+          - {php: '8.1', laravel: '11'}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3

From 256550111113f0d2ec44400c3dc9a7878ff8ccfe Mon Sep 17 00:00:00 2001
From: Rudie Dirkx <github@hotblocks.nl>
Date: Sat, 6 Apr 2024 10:03:49 +0200
Subject: [PATCH 09/16] +Laravel 9

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a3b237c4..c4bd6bc4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         php: ['8.1', '8.2', '8.3']
-        laravel: ['10', '11']
+        laravel: ['9', '10', '11']
         exclude:
           - {php: '8.1', laravel: '11'}
     steps:

From 429b6cfba80cdd4feae3257bfd9c4167681ccdd4 Mon Sep 17 00:00:00 2001
From: Rudie Dirkx <github@hotblocks.nl>
Date: Sat, 6 Apr 2024 10:09:27 +0200
Subject: [PATCH 10/16] require versions bug

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 8d587707..2bda75dd 100644
--- a/composer.json
+++ b/composer.json
@@ -12,8 +12,8 @@
     "require": {
         "php": "^8.0",
         "rdx/laravelcollective-html": "^6",
-        "illuminate/database": "^10.0",
-        "illuminate/validation": "^10.0"
+        "illuminate/database": "^6 || ^7 || ^8 || ^9 || ^10 || ^11",
+        "illuminate/validation": "^6 || ^7 || ^8 || ^9 || ^10 || ^11"
     },
     "require-dev": {
         "orchestra/testbench": "^6.13 || ^7 || ^8 || ^9"

From 2c19c0acc22700b305c868aab9fe0553792d2f9e Mon Sep 17 00:00:00 2001
From: Rudie Dirkx <github@hotblocks.nl>
Date: Sun, 21 Apr 2024 15:22:24 +0200
Subject: [PATCH 11/16] phpunit 10.x

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2bda75dd..013cc451 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,8 @@
         "illuminate/validation": "^6 || ^7 || ^8 || ^9 || ^10 || ^11"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.13 || ^7 || ^8 || ^9"
+        "orchestra/testbench": "^6.13 || ^7 || ^8 || ^9",
+        "phpunit/phpunit": "^10.0"
     },
     "extra": {
         "branch-alias": {

From 809175bc1a80518783e4ea96c74b87a2cbd6d606 Mon Sep 17 00:00:00 2001
From: Rudie Dirkx <github@hotblocks.nl>
Date: Sun, 21 Apr 2024 15:32:26 +0200
Subject: [PATCH 12/16] more matrix magic for L9

---
 .github/workflows/test.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c4bd6bc4..d0c9a8c9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,8 +17,12 @@ jobs:
       matrix:
         php: ['8.1', '8.2', '8.3']
         laravel: ['9', '10', '11']
+        phpunit: ['9', '10']
         exclude:
           - {php: '8.1', laravel: '11'}
+          - {phpunit: '9'}
+        include:
+          - {laravel: '9', phpunit: '9'}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -47,7 +51,7 @@ jobs:
             composer-${{ runner.os }}-
 
       - name: Install composer dependencies
-        run: composer require --no-progress --no-interaction illuminate/database:^${{ matrix.laravel }}.0 illuminate/validation:^${{ matrix.laravel }}.0
+        run: composer require --no-progress --no-interaction illuminate/database:^${{ matrix.laravel }}.0 illuminate/validation:^${{ matrix.laravel }}.0 phpunit/phpunit:^${{ matrix.phpunit }}.0
 
       - name: Run unit tests
         run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover

From 61580e27ffbbd18d60cff15a669a09fc1b2dd8a3 Mon Sep 17 00:00:00 2001
From: Rudie Dirkx <github@hotblocks.nl>
Date: Sun, 21 Apr 2024 15:36:23 +0200
Subject: [PATCH 13/16] more matrix magic for L9 II

---
 .github/workflows/test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d0c9a8c9..a71f71f3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ env:
 
 jobs:
   test:
-    name: "Build PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}"
+    name: "Build PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }} PHPUnit ${{ matrix.phpunit }}"
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 6 # 12
@@ -20,6 +20,7 @@ jobs:
         phpunit: ['9', '10']
         exclude:
           - {php: '8.1', laravel: '11'}
+          - {laravel: '9', phpunit: '10'}
           - {phpunit: '9'}
         include:
           - {laravel: '9', phpunit: '9'}

From 665c2eb48e63b75061e3a7055c6f3b9474ec0b6f Mon Sep 17 00:00:00 2001
From: Rudie Dirkx <github@hotblocks.nl>
Date: Sun, 21 Apr 2024 15:38:25 +0200
Subject: [PATCH 14/16] more matrix magic for L9 III

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a71f71f3..48207ca7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ env:
 
 jobs:
   test:
-    name: "Build PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }} PHPUnit ${{ matrix.phpunit }}"
+    name: "PHP ${{ matrix.php }} Lara ${{ matrix.laravel }} Unit ${{ matrix.phpunit }}"
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 6 # 12

From da7d440efbe2fffe50f9cdced7bfc78c8b24d9b6 Mon Sep 17 00:00:00 2001
From: Rudie Dirkx <github@hotblocks.nl>
Date: Sun, 21 Apr 2024 15:43:49 +0200
Subject: [PATCH 15/16] more matrix magic for L9 IV

---
 .github/workflows/test.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 48207ca7..19bcd57b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,7 +23,9 @@ jobs:
           - {laravel: '9', phpunit: '10'}
           - {phpunit: '9'}
         include:
-          - {laravel: '9', phpunit: '9'}
+          - {php: '8.1', laravel: '9', phpunit: '9'}
+          - {php: '8.2', laravel: '9', phpunit: '9'}
+          - {php: '8.3', laravel: '9', phpunit: '9'}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3

From 9061a8efbd41beb377c59446fd2d4063b5f690d8 Mon Sep 17 00:00:00 2001
From: Rudie Dirkx <github@hotblocks.nl>
Date: Sun, 21 Apr 2024 15:48:00 +0200
Subject: [PATCH 16/16] more matrix magic for L9 V

---
 .github/workflows/test.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 19bcd57b..9af7919d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,23 +9,23 @@ env:
 
 jobs:
   test:
-    name: "PHP ${{ matrix.php }} Lara ${{ matrix.laravel }} Unit ${{ matrix.phpunit }}"
+    name: "Lara ${{ matrix.laravel }} PHP ${{ matrix.php }} Unit ${{ matrix.phpunit }}"
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 6 # 12
       fail-fast: false
       matrix:
+        laravel: [9, 10, 11]
         php: ['8.1', '8.2', '8.3']
-        laravel: ['9', '10', '11']
-        phpunit: ['9', '10']
+        phpunit: [9, 10]
         exclude:
-          - {php: '8.1', laravel: '11'}
-          - {laravel: '9', phpunit: '10'}
-          - {phpunit: '9'}
+          - {laravel: 11, php: '8.1'}
+          - {laravel: 9, phpunit: 10}
+          - {phpunit: 9}
         include:
-          - {php: '8.1', laravel: '9', phpunit: '9'}
-          - {php: '8.2', laravel: '9', phpunit: '9'}
-          - {php: '8.3', laravel: '9', phpunit: '9'}
+          - {laravel: 9, php: '8.1', phpunit: 9}
+          - {laravel: 9, php: '8.2', phpunit: 9}
+          - {laravel: 9, php: '8.3', phpunit: 9}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3