Merge branch '3.x' into fix-nested-repeaters

.github/workflows/main.yml

@@ -38,7 +38,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:10.*" "doctrine/dbal:^3.0" --no-interaction --no-update
+          composer require "laravel/framework:11.*" --no-interaction --no-update
           composer install
 
       - name: Execute tests
@@ -48,7 +48,7 @@ jobs:
         run: vendor/bin/phpcs
 
   test:
-    name: PHP ${{ matrix.php }} - LARAVEL ${{ matrix.laravel }}
+    name: PHP ${{ matrix.php }} - LARAVEL ${{ matrix.laravel }} - DBAL ${{ matrix.dbal }}
     timeout-minutes: 30
     runs-on: ${{ matrix.os }}
     services:
@@ -67,13 +67,20 @@ jobs:
         os: [ubuntu-latest]
         php: [8.3, 8.2, 8.1, 8.0]
         laravel: [9.*, 10.*, 11.*]
+        dbal: [3.*, 4.*]
         exclude:
+          - laravel: 9.*
+            dbal: 4.*
+          - laravel: 10.*
+            dbal: 4.*
           - laravel: 10.*
             php: 8.0
           - laravel: 11.*
             php: 8.0
           - laravel: 11.*
             php: 8.1
+          - laravel: 11.*
+            dbal: 3.*
         include:
           - laravel: 9.*
             testbench: 7.*
@@ -112,13 +119,13 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ matrix.os }}-${{ matrix.laravel }}-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ matrix.os }}-${{ matrix.laravel }}-${{ matrix.php }}-${{ matrix.dbal }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
-            ${{ matrix.os }}-${{ matrix.laravel }}-${{ matrix.php }}-composer-
+            ${{ matrix.os }}-${{ matrix.laravel }}-${{ matrix.php }}-${{ matrix.dbal }}-composer-
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "doctrine/dbal:^3.0" --no-interaction --no-update
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "doctrine/dbal:${{ matrix.dbal }}" --no-interaction --no-update
           composer install --prefer-dist --no-interaction --no-plugins
 
       - name: Patch TestCase files for PHP < 8.1
@@ -133,7 +140,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: '18.x'
+          node-version: '20.x'
 
       - name: Build npm dependencies.
         run: |

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to `twill` will be documented in this file.
 
+## 3.3.1
+
+### Fixed
+- Fix dbal 4 conflict by [@ifox](https://github.com/ifox) in https://github.com/area17/twill/pull/2596
+
 ## 3.3.0
 
 ### Added

composer.json

@@ -28,7 +28,7 @@
     "ext-pdo": "*",
     "astrotomic/laravel-translatable": "^v11.12",
     "cartalyst/tags": "^12.0 || ^13.0 || ^14.0",
-    "doctrine/dbal": "^3.0",
+    "doctrine/dbal": "^3.0 || ^4.0",
     "guzzlehttp/guzzle": "^7.0",
     "imgix/imgix-php": "^3.0",
     "kalnoy/nestedset": "^6.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@area17/twill",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "private": true,
   "scripts": {
     "inspect": "vue-cli-service inspect --mode production",

src/TwillServiceProvider.php

@@ -58,7 +58,7 @@ class TwillServiceProvider extends ServiceProvider
      *
      * @var string
      */
-    public const VERSION = '3.3.0';
+    public const VERSION = '3.3.1';
 
     /**
      * Service providers to be registered.