Skip to content

Commit b783c17

Browse files
pounardpounard
committed
no issue - simplify dev.sh and local testing docker stack, incremental github ci updates, remove mysql 5.7, add postgresql 18
1 parent 65a599b commit b783c17

21 files changed

Lines changed: 336 additions & 568 deletions

File tree

‎.github/workflows/build-and-publish-ci-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- name: Check out the repo
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v6
2626

2727
- name: Log in to Docker Hub
2828
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a

‎.github/workflows/build-and-publish-franken-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: Check out the repo
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v6
2222

2323
- name: Log in to Docker Hub
2424
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a

‎.github/workflows/coding-standards.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
steps:
3333
- name: "Checkout code"
34-
uses: "actions/checkout@v4"
34+
uses: "actions/checkout@v6"
3535

3636
- name: "Install PHP"
3737
uses: "shivammathur/setup-php@v2"

‎.github/workflows/continuous-integration.yml‎

Lines changed: 14 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656

5757
steps:
5858
- name: "Checkout"
59-
uses: "actions/checkout@v4"
59+
uses: "actions/checkout@v6"
6060
with:
6161
fetch-depth: 2
6262

@@ -75,14 +75,6 @@ jobs:
7575

7676
- name: "Run PHPUnit"
7777
env:
78-
DBAL_DRIVER: "${{ matrix.extension }}"
79-
DBAL_DBNAME: "test_db"
80-
DBAL_HOST: "postgres"
81-
DBAL_PASSWORD: "postgres"
82-
DBAL_PORT: "5432"
83-
DBAL_ROOT_PASSWORD: "postgres"
84-
DBAL_ROOT_USER: "postgres"
85-
DBAL_USER: "postgres"
8678
DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/test_db?serverVersion=${{ matrix.postgres-version }}&charset=utf8"
8779
run: "vendor/bin/phpunit"
8880

@@ -96,7 +88,7 @@ jobs:
9688
strategy:
9789
matrix:
9890
php-version:
99-
- "8.4"
91+
- "8.5"
10092
postgres-version:
10193
- "10"
10294
- "15"
@@ -119,7 +111,7 @@ jobs:
119111

120112
steps:
121113
- name: "Checkout"
122-
uses: "actions/checkout@v4"
114+
uses: "actions/checkout@v6"
123115
with:
124116
fetch-depth: 2
125117

@@ -138,14 +130,6 @@ jobs:
138130

139131
- name: "Run PHPUnit"
140132
env:
141-
DBAL_DRIVER: "${{ matrix.extension }}"
142-
DBAL_DBNAME: "test_db"
143-
DBAL_HOST: "postgres"
144-
DBAL_PASSWORD: "postgres"
145-
DBAL_PORT: "5432"
146-
DBAL_ROOT_PASSWORD: "postgres"
147-
DBAL_ROOT_USER: "postgres"
148-
DBAL_USER: "postgres"
149133
DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/test_db?serverVersion=${{ matrix.postgres-version }}&charset=utf8"
150134
run: "vendor/bin/phpunit"
151135

@@ -159,15 +143,15 @@ jobs:
159143
strategy:
160144
matrix:
161145
php-version:
162-
- "8.4"
146+
- "8.5"
163147
mariadb-version:
164148
- "10.11.6" # LTS (Feb 2028)
165149
- "11.4.5" # LTS (May 2029)
166150
- "11.7.2" # STS
167151
extension:
168152
- "mysqli"
169153
include:
170-
- php-version: "8.4"
154+
- php-version: "8.5"
171155
mariadb-version: "11.4.5"
172156
extension: "pdo_mysql"
173157

@@ -186,7 +170,7 @@ jobs:
186170

187171
steps:
188172
- name: "Checkout"
189-
uses: "actions/checkout@v4"
173+
uses: "actions/checkout@v6"
190174
with:
191175
fetch-depth: 2
192176

@@ -204,14 +188,6 @@ jobs:
204188

205189
- name: "Run PHPUnit"
206190
env:
207-
DBAL_DRIVER: "${{ matrix.extension }}"
208-
DBAL_DBNAME: "test_db"
209-
DBAL_HOST: "mariadb"
210-
DBAL_PASSWORD: "password"
211-
DBAL_PORT: "3306"
212-
DBAL_ROOT_PASSWORD: "password"
213-
DBAL_ROOT_USER: "root"
214-
DBAL_USER: "root"
215191
DATABASE_URL: "mysql://root:password@mariadb:3306/test_db?serverVersion=mariadb-${{ matrix.mariadb-version }}"
216192
run: "vendor/bin/phpunit"
217193

@@ -225,12 +201,12 @@ jobs:
225201
strategy:
226202
matrix:
227203
php-version:
228-
- "8.4"
204+
- "8.5"
229205
mysql-version:
230-
- "5.7"
231206
- "8.0"
232207
- "8.2"
233208
- "8.3"
209+
- "8.4"
234210
extension:
235211
- "mysqli"
236212
- "pdo_mysql"
@@ -249,7 +225,7 @@ jobs:
249225

250226
steps:
251227
- name: "Checkout"
252-
uses: "actions/checkout@v4"
228+
uses: "actions/checkout@v6"
253229
with:
254230
fetch-depth: 2
255231

@@ -267,14 +243,6 @@ jobs:
267243

268244
- name: "Run PHPUnit"
269245
env:
270-
DBAL_DRIVER: "${{ matrix.extension }}"
271-
DBAL_DBNAME: "test_db"
272-
DBAL_HOST: "mysql"
273-
DBAL_PASSWORD: "password"
274-
DBAL_PORT: "3306"
275-
DBAL_ROOT_PASSWORD: "password"
276-
DBAL_ROOT_USER: "root"
277-
DBAL_USER: "root"
278246
DATABASE_URL: "mysql://root:password@mysql:3306/test_db"
279247
run: "vendor/bin/phpunit"
280248

@@ -290,7 +258,7 @@ jobs:
290258
# strategy:
291259
# matrix:
292260
# php-version:
293-
# - "8.4"
261+
# - "8.5"
294262
# mssql-version:
295263
# - "2019"
296264
# - "2022"
@@ -313,7 +281,7 @@ jobs:
313281

314282
# steps:
315283
# - name: "Checkout"
316-
# uses: "actions/checkout@v4"
284+
# uses: "actions/checkout@v6"
317285
# with:
318286
# fetch-depth: 2
319287

@@ -331,14 +299,7 @@ jobs:
331299

332300
# - name: "Run PHPUnit"
333301
# env:
334-
# DBAL_DRIVER: "${{ matrix.extension }}"
335-
# DBAL_DBNAME: "test_db"
336-
# DBAL_HOST: "mssql"
337-
# DBAL_PASSWORD: "P@ssword123"
338-
# DBAL_PORT: "1433"
339-
# DBAL_ROOT_PASSWORD: "P@ssword123"
340-
# DBAL_ROOT_USER: "sa"
341-
# DBAL_USER: "sa"
302+
# DATABASE_DRIVER: "${{ matrix.extension }}"
342303
# DATABASE_URL: "mssql://sa:P%40ssword123@mssql:1433/test_db?serverVersion=2019&driverOptions[TrustServerCertificate]=true"
343304

344305
# run: "vendor/bin/phpunit"
@@ -355,14 +316,14 @@ jobs:
355316
os:
356317
- "ubuntu-22.04"
357318
php-version:
358-
- "8.4"
319+
- "8.5"
359320
extension:
360321
- "pdo_sqlite"
361322
- "sqlite3"
362323

363324
steps:
364325
- name: "Checkout"
365-
uses: "actions/checkout@v4"
326+
uses: "actions/checkout@v6"
366327
with:
367328
fetch-depth: 2
368329

@@ -380,9 +341,5 @@ jobs:
380341

381342
- name: "Run PHPUnit"
382343
env:
383-
DBAL_DRIVER: "${{ matrix.extension }}"
384-
DBAL_DBNAME: "test_db"
385-
DBAL_HOST: "127.0.0.1"
386-
DBAL_PATH: "test_db.sqlite"
387344
DATABASE_URL: "sqlite:///test_db.sqlite"
388345
run: "vendor/bin/phpunit"

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
## Next
44

55
* [feature] 🌟 String pattern anonymizer, build complex strings by fetching values from other anonymizers.
6+
* [bc] Officially drop support for MySQL 5.7 - code is still there and working but automated unit testing has been disabled.
7+
* [internal] Add automated testing for MariaDB 12.
8+
* [internal] Rewrote `dev.sh` local unit testing script to be simpler, reorganized the local unit testing Docker stack.
69

710
## 2.0.3
811

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"prefer-stable": true,
1414
"require": {
1515
"php": ">=8.1",
16-
"makinacorpus/query-builder": "^1.6.2",
16+
"makinacorpus/query-builder": "^1.7.1",
1717
"psr/log": "^3.0",
1818
"symfony/config": "^6.0|^7.0",
1919
"symfony/console": "^6.0|^7.0",

0 commit comments

Comments
 (0)