Upgrade for Bolt 6

.editorconfig

@@ -0,0 +1,96 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+# Change these settings to your own preference
+indent_style = space
+indent_size = 4
+
+# We recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.feature]
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 4
+
+[*.json]
+indent_style = space
+indent_size = 4
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.php]
+indent_style = space
+indent_size = 4
+
+[*.scss]
+indent_style = space
+indent_size = 2
+
+[*.sh]
+indent_style = tab
+indent_size = 4
+
+[*.vcl]
+indent_style = space
+indent_size = 2
+
+[*.xml]
+indent_style = space
+indent_size = 4
+
+[*.{yaml,yml}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = false
+
+[.github/workflows/*.yml]
+indent_style = space
+indent_size = 2
+
+[.gitmodules]
+indent_style = tab
+indent_size = 4
+
+[*.neon{,.dist}]
+indent_style = tab
+indent_size = 4
+
+[.php_cs{,.dist}]
+indent_style = space
+indent_size = 4
+
+[composer.json]
+indent_style = space
+indent_size = 4
+
+[docker-compose{,.*}.{yaml,yml}]
+indent_style = space
+indent_size = 2
+
+[Dockerfile]
+indent_style = tab
+indent_size = 4
+
+[Makefile]
+indent_style = tab
+indent_size = 4
+
+[package.json]
+indent_style = space
+indent_size = 2
+
+[phpunit.xml{,.dist}]
+indent_style = space
+indent_size = 4

.github/workflows/code_analysis.yaml

@@ -0,0 +1,79 @@
+name: Code Analysis
+
+on:
+  pull_request: null
+  push:
+    branches:
+      - main
+
+jobs:
+  rector_analysis:
+    name: Rector analysis
+    runs-on: ubuntu-latest
+    env:
+      PHP_VERSION: 8.4
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ env.PHP_VERSION }}
+          extensions: json, mbstring, pdo, curl, pdo_sqlite, gd
+          coverage: none
+          tools: symfony-cli
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Cache Composer dependencies
+        uses: actions/cache@v4
+        with:
+          path: /tmp/composer-cache
+          key: ${{ runner.os }}-${{ env.PHP_VERSION }}-${{ hashFiles('**/composer.json') }}
+      - uses: php-actions/composer@v6
+        with:
+          php_version: ${{ env.PHP_VERSION }}
+
+      - run: vendor/bin/rector process -n --no-progress-bar --ansi
+
+  code_analysis:
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version: [ '8.2', '8.3', '8.4' ]
+        actions:
+          - name: Coding Standard
+            # tip: add "--ansi" to commands in CI to make them full of colors
+            run: vendor/bin/ecs check src --ansi
+
+          - name: PHPStan
+            run: vendor/bin/phpstan analyse --ansi
+
+          - name: Check composer.json and composer.lock
+            run: composer validate --strict --ansi
+
+    name: ${{ matrix.actions.name }} - PHP ${{ matrix.php-version }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v6
+      # see https://github.com/shivammathur/setup-php
+      - uses: shivammathur/setup-php@v2
+        with:
+          # test the lowest version, to make sure checks pass on it
+          php-version: ${{ matrix.php-version }}
+          extensions: json, mbstring, pdo, curl, pdo_sqlite, gd
+          coverage: none
+          tools: symfony-cli
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Cache Composer dependencies
+        uses: actions/cache@v4
+        with:
+          path: /tmp/composer-cache
+          key: ${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.json') }}
+      - uses: php-actions/composer@v6
+        with:
+          php_version: ${{ matrix.php-version }}
+
+      - run: ${{ matrix.actions.run }}

composer.json

@@ -1,27 +1,34 @@
 {
     "name": "bolt/forms",
-    "description": "📦 This Bolt extension can be used to handle forms in your Bolt 5 project.",
+    "description": "📦 This Bolt extension can be used to handle forms in your Bolt project.",
     "type": "bolt-extension",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Bolt developers"
+        },
         {
             "name": "Bob den Otter",
             "email": "bobdenotter@gmail.com"
         }
     ],
     "require": {
-        "php": ">=7.2.9",
-        "twig/twig": "^2.12 || ^3.0",
+        "php": ">=8.2",
+        "ext-curl": "*",
         "ext-json": "*",
-        "gregwar/captcha-bundle": "^2.2",
-        "pixelopen/cloudflare-turnstile-bundle": "^0.1.3"
+        "twig/twig": "^3.21",
+        "gregwar/captcha-bundle": "^2.4",
+        "pixelopen/cloudflare-turnstile-bundle": "^0.4"
     },
     "require-dev": {
-        "phpstan/phpstan": "^0.12",
-        "phpstan/phpstan-doctrine": "^0.12",
-        "phpstan/phpstan-symfony": "^0.12",
-        "bolt/core": "^5.1",
-        "symplify/easy-coding-standard": "^10.2"
+        "bolt/core": "^6.0",
+        "phpstan/extension-installer": "1.4.3",
+        "phpstan/phpstan": "2.1.33",
+        "phpstan/phpstan-deprecation-rules": "2.0.3",
+        "phpstan/phpstan-doctrine": "2.0.12",
+        "phpstan/phpstan-symfony": "2.0.9",
+        "rector/rector": "2.2.14",
+        "symplify/easy-coding-standard": "^13"
     },
     "autoload": {
         "psr-4": {
@@ -31,6 +38,18 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "extra": {
+        "branch-alias": {
+            "dev-main": "2.0.x-dev"
+        },
         "entrypoint": "Bolt\\BoltForms\\Extension"
+    },
+    "config": {
+        "allow-plugins": {
+            "symfony/flex": false,
+            "drupol/composer-packages": false,
+            "dealerdirect/phpcodesniffer-composer-installer": false,
+            "symfony/runtime": true,
+            "phpstan/extension-installer": true
+        }
     }
 }