Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-and-publish-ci-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Check out the repo
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Log in to Docker Hub
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-publish-franken-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

steps:
- name: Check out the repo
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Log in to Docker Hub
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

steps:
- name: "Checkout code"
uses: "actions/checkout@v4"
uses: "actions/checkout@v6"

- name: "Install PHP"
uses: "shivammathur/setup-php@v2"
Expand Down
71 changes: 14 additions & 57 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:

steps:
- name: "Checkout"
uses: "actions/checkout@v4"
uses: "actions/checkout@v6"
with:
fetch-depth: 2

Expand All @@ -75,14 +75,6 @@ jobs:

- name: "Run PHPUnit"
env:
DBAL_DRIVER: "${{ matrix.extension }}"
DBAL_DBNAME: "test_db"
DBAL_HOST: "postgres"
DBAL_PASSWORD: "postgres"
DBAL_PORT: "5432"
DBAL_ROOT_PASSWORD: "postgres"
DBAL_ROOT_USER: "postgres"
DBAL_USER: "postgres"
DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/test_db?serverVersion=${{ matrix.postgres-version }}&charset=utf8"
run: "vendor/bin/phpunit"

Expand All @@ -96,7 +88,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.4"
- "8.5"
postgres-version:
- "10"
- "15"
Expand All @@ -119,7 +111,7 @@ jobs:

steps:
- name: "Checkout"
uses: "actions/checkout@v4"
uses: "actions/checkout@v6"
with:
fetch-depth: 2

Expand All @@ -138,14 +130,6 @@ jobs:

- name: "Run PHPUnit"
env:
DBAL_DRIVER: "${{ matrix.extension }}"
DBAL_DBNAME: "test_db"
DBAL_HOST: "postgres"
DBAL_PASSWORD: "postgres"
DBAL_PORT: "5432"
DBAL_ROOT_PASSWORD: "postgres"
DBAL_ROOT_USER: "postgres"
DBAL_USER: "postgres"
DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/test_db?serverVersion=${{ matrix.postgres-version }}&charset=utf8"
run: "vendor/bin/phpunit"

Expand All @@ -159,15 +143,15 @@ jobs:
strategy:
matrix:
php-version:
- "8.4"
- "8.5"
mariadb-version:
- "10.11.6" # LTS (Feb 2028)
- "11.4.5" # LTS (May 2029)
- "11.7.2" # STS
extension:
- "mysqli"
include:
- php-version: "8.4"
- php-version: "8.5"
mariadb-version: "11.4.5"
extension: "pdo_mysql"

Expand All @@ -186,7 +170,7 @@ jobs:

steps:
- name: "Checkout"
uses: "actions/checkout@v4"
uses: "actions/checkout@v6"
with:
fetch-depth: 2

Expand All @@ -204,14 +188,6 @@ jobs:

- name: "Run PHPUnit"
env:
DBAL_DRIVER: "${{ matrix.extension }}"
DBAL_DBNAME: "test_db"
DBAL_HOST: "mariadb"
DBAL_PASSWORD: "password"
DBAL_PORT: "3306"
DBAL_ROOT_PASSWORD: "password"
DBAL_ROOT_USER: "root"
DBAL_USER: "root"
DATABASE_URL: "mysql://root:password@mariadb:3306/test_db?serverVersion=mariadb-${{ matrix.mariadb-version }}"
run: "vendor/bin/phpunit"

Expand All @@ -225,12 +201,12 @@ jobs:
strategy:
matrix:
php-version:
- "8.4"
- "8.5"
mysql-version:
- "5.7"
- "8.0"
- "8.2"
- "8.3"
- "8.4"
extension:
- "mysqli"
- "pdo_mysql"
Expand All @@ -249,7 +225,7 @@ jobs:

steps:
- name: "Checkout"
uses: "actions/checkout@v4"
uses: "actions/checkout@v6"
with:
fetch-depth: 2

Expand All @@ -267,14 +243,6 @@ jobs:

- name: "Run PHPUnit"
env:
DBAL_DRIVER: "${{ matrix.extension }}"
DBAL_DBNAME: "test_db"
DBAL_HOST: "mysql"
DBAL_PASSWORD: "password"
DBAL_PORT: "3306"
DBAL_ROOT_PASSWORD: "password"
DBAL_ROOT_USER: "root"
DBAL_USER: "root"
DATABASE_URL: "mysql://root:password@mysql:3306/test_db"
run: "vendor/bin/phpunit"

Expand All @@ -290,7 +258,7 @@ jobs:
# strategy:
# matrix:
# php-version:
# - "8.4"
# - "8.5"
# mssql-version:
# - "2019"
# - "2022"
Expand All @@ -313,7 +281,7 @@ jobs:

# steps:
# - name: "Checkout"
# uses: "actions/checkout@v4"
# uses: "actions/checkout@v6"
# with:
# fetch-depth: 2

Expand All @@ -331,14 +299,7 @@ jobs:

# - name: "Run PHPUnit"
# env:
# DBAL_DRIVER: "${{ matrix.extension }}"
# DBAL_DBNAME: "test_db"
# DBAL_HOST: "mssql"
# DBAL_PASSWORD: "P@ssword123"
# DBAL_PORT: "1433"
# DBAL_ROOT_PASSWORD: "P@ssword123"
# DBAL_ROOT_USER: "sa"
# DBAL_USER: "sa"
# DATABASE_DRIVER: "${{ matrix.extension }}"
# DATABASE_URL: "mssql://sa:P%40ssword123@mssql:1433/test_db?serverVersion=2019&driverOptions[TrustServerCertificate]=true"

# run: "vendor/bin/phpunit"
Expand All @@ -355,14 +316,14 @@ jobs:
os:
- "ubuntu-22.04"
php-version:
- "8.4"
- "8.5"
extension:
- "pdo_sqlite"
- "sqlite3"

steps:
- name: "Checkout"
uses: "actions/checkout@v4"
uses: "actions/checkout@v6"
with:
fetch-depth: 2

Expand All @@ -380,9 +341,5 @@ jobs:

- name: "Run PHPUnit"
env:
DBAL_DRIVER: "${{ matrix.extension }}"
DBAL_DBNAME: "test_db"
DBAL_HOST: "127.0.0.1"
DBAL_PATH: "test_db.sqlite"
DATABASE_URL: "sqlite:///test_db.sqlite"
run: "vendor/bin/phpunit"
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
## Next

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

## 2.0.3

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"prefer-stable": true,
"require": {
"php": ">=8.1",
"makinacorpus/query-builder": "^1.6.2",
"makinacorpus/query-builder": "^1.7.1",
"psr/log": "^3.0",
"symfony/config": "^6.0|^7.0",
"symfony/console": "^6.0|^7.0",
Expand Down
Loading