From c80699192cedbfb2bcc12005818c5017d15159df Mon Sep 17 00:00:00 2001
From: Matthew Setter <matthew@matthewsetter.com>
Date: Wed, 19 Mar 2025 08:48:24 +1000
Subject: [PATCH 1/2] Add an initial Docker configuration

This change adds the initial Docker setup, providing an environment
where the tests can be run, regardless of the user's operating system.
It provides three services; one for PHP, one for MySQL, and one for
PostgreSQL. The PHP environment has all of the dependencies and
extensions required to interact with MySQL, PostgreSQL, and SQLite,
along with any required binaries. It also updates PHPUnit's
configuration, where required, to sync with that configuration.

The change also removes the Vagrantfile as it's no longer required.

Signed-off-by: Matthew Setter <matthew@matthewsetter.com>
---
 README.md                              | 40 ++++++++++----
 Vagrantfile                            | 74 --------------------------
 bin/install-deps.sh                    |  7 +++
 compose.yml                            | 34 ++++++++++++
 docker/databases/mysql/Dockerfile      |  3 ++
 docker/databases/postgresql/Dockerfile |  4 ++
 docker/php/Dockerfile                  | 26 +++++++++
 docker/php/conf.d/error_reporting.ini  |  1 +
 docker/php/conf.d/xdebug.ini           |  6 +++
 phpunit.xml.dist                       | 20 +++----
 10 files changed, 121 insertions(+), 94 deletions(-)
 delete mode 100644 Vagrantfile
 create mode 100644 bin/install-deps.sh
 create mode 100644 compose.yml
 create mode 100644 docker/databases/mysql/Dockerfile
 create mode 100644 docker/databases/postgresql/Dockerfile
 create mode 100644 docker/php/Dockerfile
 create mode 100644 docker/php/conf.d/error_reporting.ini
 create mode 100644 docker/php/conf.d/xdebug.ini

diff --git a/README.md b/README.md
index 8516616a0..c20e5fe4b 100644
--- a/README.md
+++ b/README.md
@@ -40,35 +40,53 @@ $ ./vendor/bin/phpunit --testsuite "integration test" # integration tests only
 
 Unit tests do not require additional functionality beyond having the appropriate database extensions present and loaded in your PHP binary.
 
-### Integration tests
+#### Integration tests
 
 To run the integration tests, you need databases.
-The repository includes a `Vagrantfile` which allows you to fire up a [vagrant box](https://app.vagrantup.com) with several of our target databases, including:
+So, the repository includes a [Docker Compose][docker-compose] configuration which allows you to start a test environment that provides several of our target databases, including _MySQL_ and _PostgreSQL_, and SQLite.
 
-- MySQL
-- PostgreSQL
-- SQL Server
+To start up the configuration, run the following command:
 
-To start up vagrant:
+```bash
+$ docker compose up -d
+```
+
+To test that the environment is up and running, run the following command:
 
 ```bash
-$ vagrant up
+$ docker compose ps
 ```
 
-Copy `phpunit.xml.dist` to `phpunit.xml`, and change the following ENV var declaration values to "true":
+You should see output similar to the following:
+
+```bash
+docker compose ps
+NAME                      IMAGE                                            COMMAND                SERVICE      CREATED       STATUS       PORTS
+laminas-db-mysql-1        docker.io/library/laminas-db-mysql:latest        "mysqld"               mysql        7 hours ago   Up 7 hours   
+laminas-db-php-1          docker.io/library/laminas-db-php:latest          "apache2-foreground"   php          7 hours ago   Up 7 hours   
+laminas-db-postgresql-1   docker.io/library/laminas-db-postgresql:latest   "postgres"             postgresql   7 hours ago   Up 7 hours
+```
+
+If you see three containers listed, then they're all running, and you are ready to run the test suite.
+So, copy `phpunit.xml.dist` to `phpunit.xml`, and change the following environment variable to "true" to enable the three databases:
 
 - TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL
-- TESTS_LAMINAS_DB_ADAPTER_DRIVER_SQLSRV
 - TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL
 - TESTS_LAMINAS_DB_ADAPTER_DRIVER_SQLITE_MEMORY
 
-From there, you can run the integration tests:
+From there, you can run the integration tests by running the following command:
 
 ```bash
-$ ./vendor/bin/phpunit --testsuite "integration test"
+$ docker compose exec php composer test-integration
 ```
 
+> [!TIP]
+> If you want to grow your Docker Compose knowledge, grab a (free) copy of [Deploy with Docker Compose][deploy-with-docker-compose].
+
 -----
 
 - File issues at https://github.com/laminas/laminas-db/issues
 - Documentation is at https://docs.laminas.dev/laminas-db/
+
+[docker-compose]: https://docs.docker.com/compose/intro/features-uses/
+[deploy-with-docker-compose]: https://deploywithdockercompose.com
\ No newline at end of file
diff --git a/Vagrantfile b/Vagrantfile
deleted file mode 100644
index ab8f9eeb5..000000000
--- a/Vagrantfile
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-$install_software = <<SCRIPT
-export DEBIAN_FRONTEND=noninteractive
-apt-get -yq update
-
-# INSTALL PostgreSQL
-apt-get -yq install postgresql
-
-# Allow external connections to PostgreSQL as postgres
-sed -i "s/#listen_addresses = 'localhost'/listen_addresses = '*'/" /etc/postgresql/12/main/postgresql.conf
-sed -i "s/peer/trust/" /etc/postgresql/12/main/pg_hba.conf
-echo 'host all all 0.0.0.0/0 trust' >> /etc/postgresql/12/main/pg_hba.conf
-service postgresql restart
-
-# INSTALL MySQL
-debconf-set-selections <<< "mysql-server mysql-server/root_password password Password123"
-debconf-set-selections <<< "mysql-server mysql-server/root_password_again password Password123"
-apt-get -yq install mysql-server
-
-# Allow external connections to MySQL as root (with password Password123)
-sed -i 's/127\.0\.0\.1/0\.0\.0\.0/g' /etc/mysql/mysql.conf.d/mysqld.cnf
-mysql -u root -pPassword123 -e 'USE mysql; UPDATE `user` SET `Host`="%" WHERE `User`="root" AND `Host`="localhost"; DELETE FROM `user` WHERE `Host` != "%" AND `User`="root"; FLUSH PRIVILEGES;'
-mysql -h localhost -u root -pPassword123 -e "ALTER USER 'root'@'%' IDENTIFIED WITH mysql_native_password BY 'Password123';"
-service mysql restart
-
-# INSTALL SQL Server
-# More info here: https://docs.microsoft.com/en-us/sql/linux/sample-unattended-install-ubuntu?view=sql-server-ver15
-MSSQL_SA_PASSWORD='Password123'
-MSSQL_PID=developer
-SQL_INSTALL_AGENT='y'
-curl -s https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
-repoargs="$(curl https://packages.microsoft.com/config/ubuntu/20.04/mssql-server-2019.list)"
-add-apt-repository "${repoargs}"
-repoargs="$(curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list)"
-add-apt-repository "${repoargs}"
-apt-get -yq update
-apt-get -yq install mssql-server
-
-MSSQL_SA_PASSWORD=$MSSQL_SA_PASSWORD \
-     MSSQL_PID=$MSSQL_PID \
-     /opt/mssql/bin/mssql-conf -n setup accept-eula
-
-echo "Installing mssql-tools and unixODBC developer..."
-ACCEPT_EULA=Y apt-get install -y mssql-tools unixodbc-dev
-
-echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> /home/vagrant/.bash_profile
-echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> /home/vagrant/.bashrc
-source /home/vagrant/.bashrc
-SCRIPT
-
-
-$setup_vagrant_user_environment = <<SCRIPT
-if ! grep "cd /vagrant" /home/vagrant/.profile > /dev/null; then
-  echo "cd /vagrant" >> /home/vagrant/.profile
-fi
-SCRIPT
-
-Vagrant.configure(2) do |config|
-  config.vm.box = 'bento/ubuntu-20.04'
-  config.vm.provider "virtualbox" do |v|
-    v.memory = 4096
-    v.cpus = 2
-  end
-
-  config.vm.network "private_network", ip: "192.168.20.20"
-
-  config.vm.provision 'shell', inline: $install_software
-  config.vm.provision 'shell', privileged: false, inline: '/vagrant/.ci/mysql_fixtures.sh'
-  config.vm.provision 'shell', privileged: false, inline: '/vagrant/.ci/pgsql_fixtures.sh'
-  config.vm.provision 'shell', privileged: false, inline: '/vagrant/.ci/sqlsrv_fixtures.sh'
-  config.vm.provision 'shell', inline: $setup_vagrant_user_environment
-end
diff --git a/bin/install-deps.sh b/bin/install-deps.sh
new file mode 100644
index 000000000..df3c3a4ca
--- /dev/null
+++ b/bin/install-deps.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+/usr/bin/composer validate && \
+/usr/bin/composer --ignore-platform-reqs install \
+    --no-ansi --no-progress --no-scripts \
+    --classmap-authoritative --no-interaction \
+    --quiet
\ No newline at end of file
diff --git a/compose.yml b/compose.yml
new file mode 100644
index 000000000..33857dd6f
--- /dev/null
+++ b/compose.yml
@@ -0,0 +1,34 @@
+services:
+  php:
+    build:
+      context: ./
+      dockerfile: docker/php/Dockerfile
+      args:
+        - PHP_VERSION=${PHP_VERSION:-8.3.19}
+    depends_on:
+      - mysql
+      - postgresql
+
+  mysql:
+    build:
+      context: ./
+      dockerfile: docker/databases/mysql/Dockerfile
+      args:
+        - VERSION=${MYSQL_VERSION:-8.0.41}
+    environment:
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-laminasdb_test}
+      - MYSQL_USER=${MYSQL_USER:-user}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD:-password}
+      - MYSQL_RANDOM_ROOT_PASSWORD=${MYSQL_RANDOM_ROOT_PASSWORD:-yes}
+
+  postgresql:
+    build:
+      context: ./
+      dockerfile: docker/databases/postgresql/Dockerfile
+      args:
+        - VERSION=${VERSION:-17.4}
+        - ALPINE_VERSION=${ALPINE_VERSION:-3.21}
+    environment:
+      - POSTGRES_DB=${POSTGRES_DB:-laminasdb_test}
+      - POSTGRES_USER=${POSTGRES_USER:-postgres}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-postgres}
\ No newline at end of file
diff --git a/docker/databases/mysql/Dockerfile b/docker/databases/mysql/Dockerfile
new file mode 100644
index 000000000..69c3f20e8
--- /dev/null
+++ b/docker/databases/mysql/Dockerfile
@@ -0,0 +1,3 @@
+ARG VERSION=8.4.5
+
+FROM mysql:${VERSION}-bookworm AS base
\ No newline at end of file
diff --git a/docker/databases/postgresql/Dockerfile b/docker/databases/postgresql/Dockerfile
new file mode 100644
index 000000000..c4609c28d
--- /dev/null
+++ b/docker/databases/postgresql/Dockerfile
@@ -0,0 +1,4 @@
+ARG VERSION=17.4
+ARG ALPINE_VERSION=3.21
+
+FROM postgres:${VERSION}-alpine${ALPINE_VERSION} AS base
\ No newline at end of file
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
new file mode 100644
index 000000000..58ebc2f38
--- /dev/null
+++ b/docker/php/Dockerfile
@@ -0,0 +1,26 @@
+ARG PHP_VERSION=8.3.19
+
+FROM php:${PHP_VERSION}-apache-bookworm AS base
+
+# Copy Composer from the official Docker Hub repository to the local filesystem
+COPY --from=composer:2.8.6 /usr/bin/composer /usr/bin/
+
+# Install the database extensions for MySQL, PostgreSQL, and SQLite, their
+# dependencies, and any other tools that are required for the environment to be
+# used fully and completely.
+RUN apt-get update \
+    && apt-get install -y git libpq-dev libsqlite3-dev \
+    && docker-php-ext-install mysqli pdo pdo_mysql pdo_pgsql pdo_sqlite pgsql \
+    && apt-get clean
+
+# Allow the www-data login so that it can run Composer instead of using root
+RUN usermod -s /usr/bin/bash www-data
+
+# Copy all of the files from the context to the current directory setting the
+# correct owner
+COPY --chown=www-data:www-data . .
+
+RUN chmod +x bin/install-deps.sh
+
+# Validate and install PHP's dependencies
+RUN su --preserve-environment www-data --command "bin/install-deps.sh"
\ No newline at end of file
diff --git a/docker/php/conf.d/error_reporting.ini b/docker/php/conf.d/error_reporting.ini
new file mode 100644
index 000000000..d040e65d6
--- /dev/null
+++ b/docker/php/conf.d/error_reporting.ini
@@ -0,0 +1 @@
+error_reporting=E_ALL
\ No newline at end of file
diff --git a/docker/php/conf.d/xdebug.ini b/docker/php/conf.d/xdebug.ini
new file mode 100644
index 000000000..e29c8bd46
--- /dev/null
+++ b/docker/php/conf.d/xdebug.ini
@@ -0,0 +1,6 @@
+zend_extension=xdebug
+
+[xdebug]
+xdebug.mode=develop,debug
+xdebug.client_host=host.docker.internal
+xdebug.start_with_request=yes
\ No newline at end of file
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 09cf43f96..0d4ce670a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -34,10 +34,17 @@
         -->
         <!-- Integration Test Variables -->
         <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL" value="false"/>
-        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL_HOSTNAME" value="192.168.20.20"/>
-        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL_USERNAME" value="root"/>
-        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL_PASSWORD" value="Password123"/>
+        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL_HOSTNAME" value="mysql"/>
+        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL_USERNAME" value="user"/>
+        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL_PASSWORD" value="password"/>
         <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL_DATABASE" value="laminasdb_test"/>
+        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL" value="false"/>
+        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL_HOSTNAME" value="postgresql"/>
+        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL_USERNAME" value="postgres"/>
+        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL_PASSWORD" value="postgres"/>
+        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL_DATABASE" value="laminasdb_test"/>
+        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_SQLITE_MEMORY" value="false"/>
+        <!--
         <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_SQLSRV" value="false"/>
         <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_SQLSRV_HOSTNAME" value="192.168.20.20"/>
         <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_SQLSRV_USERNAME" value="sa"/>
@@ -53,11 +60,6 @@
         <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_IBMDB2_USERNAME" value=""/>
         <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_IBMDB2_PASSWORD" value=""/>
         <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_IBMDB2_DATABASE" value=""/>
-        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL" value="false"/>
-        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL_HOSTNAME" value="192.168.20.20"/>
-        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL_USERNAME" value="postgres"/>
-        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL_PASSWORD" value="postgres"/>
-        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL_DATABASE" value="laminasdb_test"/>
-        <env name="TESTS_LAMINAS_DB_ADAPTER_DRIVER_SQLITE_MEMORY" value="true"/>
+        -->
     </php>
 </phpunit>

From f15189d074ad355401024e8a07098af879dcf566 Mon Sep 17 00:00:00 2001
From: Matthew Setter <matthew@matthewsetter.com>
Date: Wed, 19 Mar 2025 17:01:18 +1000
Subject: [PATCH 2/2] Revise the Docker Compose configuration

This removes the Composer setup from the startup script, replacing it
with mounting the files from the local filesystem as volume mounts. It
also exposes the database ports so that they can be connected to
locally, should the need arise, using database clients. It adds health
checks to help ensure a robust service configuration. And, it loads SQL
scripts to initialise the MySQL and PostgreSQL databases.

Signed-off-by: Matthew Setter <matthew@matthewsetter.com>
---
 compose.yml                             | 22 +++++++++++++++++++++-
 test/integration/TestFixtures/mysql.sql |  6 +++---
 test/integration/TestFixtures/pgsql.sql |  8 ++++++--
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/compose.yml b/compose.yml
index 33857dd6f..d192f5f4d 100644
--- a/compose.yml
+++ b/compose.yml
@@ -5,6 +5,8 @@ services:
       dockerfile: docker/php/Dockerfile
       args:
         - PHP_VERSION=${PHP_VERSION:-8.3.19}
+    volumes:
+      - ./:/var/www/html
     depends_on:
       - mysql
       - postgresql
@@ -15,11 +17,19 @@ services:
       dockerfile: docker/databases/mysql/Dockerfile
       args:
         - VERSION=${MYSQL_VERSION:-8.0.41}
+    ports:
+      - "3306:3306"
     environment:
       - MYSQL_DATABASE=${MYSQL_DATABASE:-laminasdb_test}
       - MYSQL_USER=${MYSQL_USER:-user}
       - MYSQL_PASSWORD=${MYSQL_PASSWORD:-password}
       - MYSQL_RANDOM_ROOT_PASSWORD=${MYSQL_RANDOM_ROOT_PASSWORD:-yes}
+    volumes:
+      - ./test/integration/TestFixtures/mysql.sql:/docker-entrypoint-initdb.d/mysql.sql
+    healthcheck:
+      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
+      timeout: 20s
+      retries: 10
 
   postgresql:
     build:
@@ -28,7 +38,17 @@ services:
       args:
         - VERSION=${VERSION:-17.4}
         - ALPINE_VERSION=${ALPINE_VERSION:-3.21}
+    ports:
+      - "5432:5432"
+    volumes:
+      - ./test/integration/TestFixtures/pgsql.sql:/docker-entrypoint-initdb.d/pgsql.sql
     environment:
       - POSTGRES_DB=${POSTGRES_DB:-laminasdb_test}
       - POSTGRES_USER=${POSTGRES_USER:-postgres}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-postgres}
\ No newline at end of file
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-postgres}
+    healthcheck:
+      test: ["CMD-SHELL", "sh -c 'pg_isready -U ${POSTGRES_USER:-postgres} -d ${POSTGRES_DB:-laminasdb_test}'"]
+      interval: 30s
+      timeout: 60s
+      retries: 5
+      start_period: 80s
\ No newline at end of file
diff --git a/test/integration/TestFixtures/mysql.sql b/test/integration/TestFixtures/mysql.sql
index d1a49b03a..ddddd7eac 100644
--- a/test/integration/TestFixtures/mysql.sql
+++ b/test/integration/TestFixtures/mysql.sql
@@ -1,5 +1,5 @@
 DROP TABLE IF EXISTS test;
-CREATE TABLE test (
+CREATE TABLE IF NOT EXISTS test (
     id INT NOT NULL AUTO_INCREMENT,
     name VARCHAR(255) NOT NULL,
     value VARCHAR(255) NOT NULL,
@@ -13,7 +13,7 @@ INSERT INTO test (name, value) VALUES
 ('123', 'bar');
 
 DROP TABLE IF EXISTS test_charset;
-CREATE TABLE test_charset (
+CREATE TABLE IF NOT EXISTS test_charset (
     id INT NOT NULL AUTO_INCREMENT,
     field$ VARCHAR(255) NOT NULL,
     field_ VARCHAR(255) NOT NULL,
@@ -25,7 +25,7 @@ INSERT INTO test_charset (field$, field_) VALUES
 ('bar', 'baz');
 
 DROP TABLE IF EXISTS test_audit_trail;
-CREATE TABLE test_audit_trail (
+CREATE TABLE IF NOT EXISTS test_audit_trail (
     id INT NOT NULL AUTO_INCREMENT,
     test_id INT NOT NULL,
     test_value_old VARCHAR(255) NOT NULL,
diff --git a/test/integration/TestFixtures/pgsql.sql b/test/integration/TestFixtures/pgsql.sql
index ebdbfd1b6..3fe43cc3a 100644
--- a/test/integration/TestFixtures/pgsql.sql
+++ b/test/integration/TestFixtures/pgsql.sql
@@ -1,20 +1,24 @@
+DROP TABLE IF EXISTS test;
 CREATE TABLE IF NOT EXISTS test (
     id SERIAL PRIMARY KEY,
     name VARCHAR(255) NOT NULL,
     value VARCHAR(255) NOT NULL
 );
 
-INSERT INTO test (name, value) VALUES
+INSERT INTO test (name, value) 
+VALUES
 ('foo', 'bar'),
 ('bar', 'baz');
 
+DROP TABLE IF EXISTS test_charset;
 CREATE TABLE IF NOT EXISTS test_charset (
     id SERIAL PRIMARY KEY,
     field$ VARCHAR(255) NOT NULL,
     field_ VARCHAR(255) NOT NULL
 );
 
-INSERT INTO test_charset (field$, field_) VALUES
+INSERT INTO test_charset (field$, field_) 
+VALUES
 ('foo', 'bar'),
 ('bar', 'baz');