From a7a78988437e2f6ed6176eaf4f2c7d592ce96288 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20J=2E=20Garc=C3=ADa=20Lagar?= <ajgarcia@c17.net>
Date: Wed, 3 Apr 2024 09:00:44 +0200
Subject: [PATCH 1/3] Drop PHP <8.1 support

---
 .github/workflows/ci.yml   | 43 ++++++++++++++++++++++++++++++++
 .github/workflows/test.yml | 51 --------------------------------------
 CHANGELOG.md               |  4 +++
 composer.json              |  3 ++-
 4 files changed, 49 insertions(+), 52 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..8ea7f2f
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,43 @@
+name: ci
+
+on:
+    push:
+        branches: ['main']
+    pull_request:
+        branches: ['*']
+    schedule:
+        -   cron: '0 0 * * *'
+
+jobs:
+    tests:
+        name: Tests
+        runs-on: ubuntu-latest
+        timeout-minutes: 15
+        strategy:
+            matrix:
+                php: ['8.1', '8.2', '8.3']
+                prefer: ['']
+                include:
+                    -   php: '8.1'
+                        prefer: '--prefer-lowest'
+        steps:
+            -   uses: actions/checkout@v4
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ matrix.php }}
+                    tools: composer:v2
+                    coverage: none
+            -   name: Get composer cache directory
+                id: composer-cache
+                run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+            -   name: Cache dependencies
+                uses: actions/cache@v4
+                with:
+                    path: ${{ steps.composer-cache.outputs.dir }}
+                    key: ${{ runner.os }}-composer-${{ matrix.prefer }}-${{ hashFiles('**/composer.json') }}
+                    restore-keys: ${{ runner.os }}-composer-${{ matrix.prefer }}-
+            -   name: Install dependencies
+                run: composer update --no-interaction --no-progress ${{ matrix.prefer }}
+            -   name: PHPUnit
+                run: vendor/bin/phpunit
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 32131a7..0000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-name: test
-
-on:
-    push:
-    pull_request:
-    schedule:
-        -   cron: '0 5 10 * *'
-
-jobs:
-    tests:
-        runs-on: ubuntu-latest
-        continue-on-error: ${{ matrix.can-fail }}
-        strategy:
-            fail-fast: false
-            matrix:
-                php: ['7.4', '8.0', '8.1']
-                composer-flags: ['--prefer-stable']
-                can-fail: [false]
-                include:
-                # Lowest supported versions
-                -   php: '7.4'
-                    composer-flags: '--prefer-stable --prefer-lowest'
-                    can-fail: false
-                # Development versions
-                -   php: '8.1'
-                    composer-flags: ''
-                    can-fail: true
-
-        name: "PHP ${{ matrix.php }} - Composer ${{ matrix.composer-flags }}"
-
-        steps:
-            -   name: Checkout code
-                uses: actions/checkout@v2
-
-            -   name: Cache dependencies
-                uses: actions/cache@v1
-                with:
-                    path: ~/.composer/cache/files
-                    key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
-
-            -   name: Setup PHP
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ matrix.php }}
-                    coverage: none
-
-            -   name: Install dependencies
-                run: composer update --ansi ${{ matrix.composer-flags }}
-
-            -   name: Execute tests
-                run: composer test || ${{ matrix.can-fail }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 916c3de..2f97bd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Removed
+
+- Drop PHP <8.1 support
+
 ## [0.4.0] - 2022-06-09
 
 ### Added
diff --git a/composer.json b/composer.json
index d55c20e..c148368 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "php": ">=7.4",
+        "php": "^8.1",
         "doctrine/dbal": "^2.13 | ^3.3"
     },
     "require-dev": {
@@ -36,6 +36,7 @@
         }
     },
     "minimum-stability": "dev",
+    "prefer-stable": true,
     "extra": {
         "branch-alias": {
             "dev-main": "0.4.x-dev"

From 8bea3a3566433cf65c983397b8ed8527aa940d37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20J=2E=20Garc=C3=ADa=20Lagar?= <ajgarcia@c17.net>
Date: Wed, 3 Apr 2024 09:33:54 +0200
Subject: [PATCH 2/3] Drop DBAL <3 support

---
 CHANGELOG.md  | 1 +
 composer.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f97bd3..d48b567 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Removed
 
 - Drop PHP <8.1 support
+- Drop DBAL <3 support
 
 ## [0.4.0] - 2022-06-09
 
diff --git a/composer.json b/composer.json
index c148368..ea426f4 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
     ],
     "require": {
         "php": "^8.1",
-        "doctrine/dbal": "^2.13 | ^3.3"
+        "doctrine/dbal": "^3.3"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5"

From 2f396861f57fbb55ffaf26d78e79015fc99e9bf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20J=2E=20Garc=C3=ADa=20Lagar?= <ajgarcia@c17.net>
Date: Wed, 3 Apr 2024 09:34:43 +0200
Subject: [PATCH 3/3] Add DBAL 4 support

---
 CHANGELOG.md  | 4 ++++
 composer.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d48b567..88dade4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Added
+
+- Add DBAL 4 support
+
 ### Removed
 
 - Drop PHP <8.1 support
diff --git a/composer.json b/composer.json
index ea426f4..b29a9eb 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
     ],
     "require": {
         "php": "^8.1",
-        "doctrine/dbal": "^3.3"
+        "doctrine/dbal": "^3.3 || ^4"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5"