@lando/php 1.8.0 → 1.10.0

package/AGENTS.md

@@ -0,0 +1,81 @@
+# PROJECT KNOWLEDGE BASE
+
+**Generated:** 2026-01-09
+**Commit:** 355c304
+**Branch:** main
+
+## OVERVIEW
+
+Lando PHP plugin - provides PHP services (5.3-8.5) via nginx/apache/cli with composer, xdebug support. Part of @lando ecosystem.
+
+## STRUCTURE
+
+```
+lando--php/
+├── builders/         # Service builders (php.js = main logic)
+├── config/           # PHP/nginx config templates
+├── utils/            # Helper functions
+├── examples/         # Version-specific test fixtures (php-*)
+├── test/             # Unit tests (placeholder)
+├── docs/             # Project documentation markdown files and associated Vitepress site
+├── scripts/          # Helper scripts for build/install/etc
+└── images/           # Docker image definitions for various PHP versions
+```
+
+## WHERE TO LOOK
+
+| Task | Location | Notes |
+|------|----------|-------|
+| PHP version logic | `builders/php.js` | LandoPhp class, version detection |
+| Nginx wrapper | `builders/php-nginx.js` | Extends @lando/nginx |
+| Composer install | `builders/php.js:getDefaultComposerVersion()` | Version auto-detection |
+| Xdebug config | `builders/php.js:xdebugConfig()` | Per-version handling |
+| PHP config templates | `config/*.conf.tpl` | EJS templates |
+| Add CLI/build steps | `utils/add-build-step.js` | Front/back insertion |
+| Install command gen | `utils/get-install-commands.js` | Package manager abstraction |
+
+## CODE MAP
+
+| Symbol | Type | Location | Role |
+|--------|------|----------|------|
+| `LandoPhp` | class | builders/php.js:18 | Main service builder |
+| `getDefaultComposerVersion` | fn | builders/php.js | Composer version detection |
+| `nginxConfig` | fn | builders/php.js | Nginx service config |
+| `xdebugConfig` | fn | builders/php.js | Xdebug version handling |
+| `parseApache/Cli/Nginx` | fns | builders/php.js | Via-specific parsing |
+| `addBuildStep` | fn | utils/add-build-step.js | Build step insertion |
+| `getInstallCommands` | fn | utils/get-install-commands.js | Install command gen |
+| `cloneOverrides` | fn | utils/clone-overrides.js | Deep clone sans image/build |
+
+## CONVENTIONS
+
+- **ESLint**: Google style, max-len 140, JSDoc required for functions
+- **Images**: `devwithlando/php:{version}-{via}` format
+- **Versions**: Supported 5.3-8.5, legacy removed at 8.x
+- **Via options**: apache (default), nginx, cli
+- **Composer**: v1 for PHP <7.2, v2 otherwise
+
+## ANTI-PATTERNS
+
+- Don't modify `index.js` - intentionally empty placeholder
+- Don't add dependencies without checking @lando/nginx compatibility
+- examples/* are test fixtures - structured identically per version
+
+## COMMANDS
+
+```bash
+# Development
+npm run lint              # ESLint check
+npm run test:unit         # Mocha unit tests
+npm run test:leia         # Leia integration tests
+
+# Coverage
+nyc covers: lib/, recipes/, services/, types/
+```
+
+## NOTES
+
+- `plugin.yml` has `legacy: true` for Lando v3 compatibility
+- Root `.lando.yml` is for docs site (vitepress), not plugin testing
+- Test file `test/auth.spec.js` is placeholder ("should have tests")
+- PHP config uses EJS templates (`.conf.tpl` extension)

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.10.0 - [February 18, 2026](https://github.com/lando/php/releases/tag/v1.10.0)
+
+* Added database client auto-detection and version matching [#212](https://github.com/lando/php/pull/212)
+* Added Docker image build status badge to README
+* Added GD AVIF support verification for PHP 8.3+ [#219](https://github.com/lando/php/pull/219)
+* Fixed composer install ordering to run before user build steps
+* Fixed MariaDB wrapper script command names and test auto-detection [#212](https://github.com/lando/php/pull/212)
+* Fixed typo in documentation
+* Updated Docker image base version to Debian 13
+* Updated Docker image tags from -6 to -7
+* Updated Node.js 14.x to 20.x in test examples [#215](https://github.com/lando/php/pull/215)
+* Updated `actions/cache` from 4 to 5
+* Updated `actions/checkout` from 4 to 6
+
+## v1.9.0 - [December 5, 2025](https://github.com/lando/php/releases/tag/v1.9.0)
+
+* Added support for PHP 8.5
+* Added Debian 13 (trixie) base images for PHP 8.3-8.5
+* Changed PHP 7.4 and 8.0 images to use MariaDB `archive.mariadb.org` apt repository
+* Fixed expired keys preventing stretch-based images from building
+
 ## v1.8.0 - [September 2, 2025](https://github.com/lando/php/releases/tag/v1.8.0)
 
 * Removed automatic installation of `hirak/prestissimo` for `composer:1`

package/README.md

@@ -1,5 +1,7 @@
 # PHP Lando Plugin
 
+[![Build PHP Images](https://github.com/lando/php/actions/workflows/build-php-images.yml/badge.svg)](https://github.com/lando/php/actions/workflows/build-php-images.yml)
+
 This is the _official_ [Lando](https://lando.dev) plugin for [PHP](https://php.net). When installed it...
 
 * Allows users to run various `php` versions
@@ -16,7 +18,7 @@ Add a `php` service to your Landofile
 ```yaml
 services:
   myservice:
-    type: php:8.1
+    type: php:8.5
     via: nginx
     webroot: www
 ```
@@ -43,6 +45,7 @@ We try to log all changes big and small in both [THE CHANGELOG](https://github.c
 
 * [@pirog](https://github.com/pirog)
 * [@reynoldsalec](https://github.com/reynoldsalec)
+* [@aaronfeledy](https://github.com/AaronFeledy)
 
 ## Contributors
 

package/builders/php.js

@@ -58,6 +58,34 @@ const xdebugConfig = host => ([
   `remote_host=${host}`,
 ].join(' '));
 
+const detectDatabaseClient = (options, debug = () => {}) => {
+  if (options.db_client === false) return null;
+  if (options.db_client && options.db_client !== 'auto') return options.db_client;
+
+  const services = options._app?.config?.services || {};
+  let mysqlVersion = null;
+  let mariaVersion = null;
+
+  for (const service of Object.values(services)) {
+    const type = service?.type || '';
+    // Match mysql:X, mysql:X.Y, or mysql:X.Y.Z formats
+    const mysqlMatch = type.match(/^mysql:(\d+(?:\.\d+)?)/);
+    if (mysqlMatch && !mysqlVersion) mysqlVersion = mysqlMatch[1];
+    // Match mariadb:X, mariadb:X.Y, or mariadb:X.Y.Z formats
+    const mariaMatch = type.match(/^mariadb:(\d+(?:\.\d+)?)/);
+    if (mariaMatch && !mariaVersion) mariaVersion = mariaMatch[1];
+  }
+
+  if (mariaVersion && mysqlVersion) {
+    debug('Both MariaDB (%s) and MySQL (%s) detected; using MariaDB. Set db_client to override.',
+      mariaVersion, mysqlVersion);
+  }
+
+  if (mariaVersion) return `mariadb:${mariaVersion}`;
+  if (mysqlVersion) return `mysql:${mysqlVersion}`;
+  return null;
+};
+
 /**
  * Helper function to build a package string by combining package name and version
  *
@@ -126,7 +154,7 @@ module.exports = {
   name: 'php',
   config: {
     version: '7.4',
-    supported: ['8.4', '8.3', '8.2', '8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4', '5.3'],
+    supported: ['8.5', '8.4', '8.3', '8.2', '8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4', '5.3'],
     legacy: ['7.2', '7.1', '7.0', '5.6', '5.5', '5.4', '5.3'],
     gen2: ['5.5', '5.4', '5.3'],
     path: [
@@ -163,8 +191,9 @@ module.exports = {
     },
     scriptsDir: path.resolve(__dirname, '..', 'scripts'),
     sources: [],
-    suffix: '5',
+    suffix: '7',
     ssl: false,
+    db_client: 'auto',
     via: 'apache',
     volumes: ['/usr/local/bin'],
     webroot: '.',
@@ -231,12 +260,17 @@ module.exports = {
         addBuildStep(commands, options._app, options.name, 'build_internal');
       }
 
-      // Install the desired composer version as the first `build_internal` build step
+      // Install the desired composer version as a `build_as_root_internal` step so it runs
+      // before user build steps — prevents composer from being missing if build_as_root fails
       if (options.composer_version) {
         debug('Installing composer version %s', options.composer_version);
         const commands = [`/etc/lando/service/helpers/install-composer.sh ${options.composer_version}`];
-        const firstStep = true;
-        addBuildStep(commands, options._app, options.name, 'build_internal', firstStep);
+        addBuildStep(commands, options._app, options.name, 'build_as_root_internal');
+      }
+
+      const dbClient = detectDatabaseClient(options, debug);
+      if (dbClient && phpSemver && semver.gte(phpSemver, '8.3.0')) {
+        addBuildStep([`/etc/lando/service/helpers/install-db-client.sh ${dbClient}`], options._app, options.name, 'build_as_root_internal');
       }
 
       // Add in nginx if we need to

package/images/5.6-apache/Dockerfile

@@ -1,15 +1,20 @@
-# docker build -t devwithlando/php:5.6-apache-5 .
+# docker build -t devwithlando/php:5.6-apache-7 .
 
 FROM php:5.6-apache-stretch
 
-# Install dependencies we need
+# Debian Stretch has archived repositories and expired keys
 RUN \
   sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
   && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
   && sed -i '/stretch-updates/d' /etc/apt/sources.list \
   && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
-  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
-  && apt -y update && apt-get install -y \
+  && apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring
+
+# Install dependencies
+RUN \
+  mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+  && apt-get update && apt-get install -y \
     gnupg2 \
     wget \
     bzip2 \

package/images/5.6-fpm/Dockerfile

@@ -1,15 +1,20 @@
-# docker build -t devwithlando/php:5.6-fpm-5 .
+# docker build -t devwithlando/php:5.6-fpm-7 .
 
 FROM php:5.6-fpm-stretch
 
-# Install dependencies we need
+# Debian Stretch has archived repositories and expired keys
 RUN \
   sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
   && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
   && sed -i '/stretch-updates/d' /etc/apt/sources.list \
   && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
-  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
-  && apt -y update && apt-get install -y \
+  && apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring
+
+# Install dependencies
+RUN \
+  mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+  && apt-get update && apt-get install -y \
     gnupg2 \
     wget \
     bzip2 \

package/images/7.0-apache/Dockerfile

@@ -1,15 +1,20 @@
-# docker build -t devwithlando/php:7.0-apache-5 .
+# docker build -t devwithlando/php:7.0-apache-7 .
 
 FROM php:7.0-apache-stretch
 
-# Install dependencies we need
+# Debian Stretch has archived repositories and expired keys
 RUN \
   sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
   && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
   && sed -i '/stretch-updates/d' /etc/apt/sources.list \
   && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
-  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
-  && apt -y update && apt-get install -y \
+  && apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring
+
+# Install dependencies
+RUN \
+  mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+  && apt-get update && apt-get install -y \
     gnupg2 \
     wget \
     bzip2 \

package/images/7.0-fpm/Dockerfile

@@ -1,15 +1,20 @@
-# docker build -t devwithlando/php:7.0-fpm-5 .
+# docker build -t devwithlando/php:7.0-fpm-7 .
 
 FROM php:7.0-fpm-stretch
 
-# Install dependencies we need
+# Debian Stretch has archived repositories and expired keys
 RUN \
   sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
   && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
   && sed -i '/stretch-updates/d' /etc/apt/sources.list \
   && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
-  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
-  && apt -y update && apt-get install -y \
+  && apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring
+
+# Install dependencies
+RUN \
+  mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+  && apt-get update && apt-get install -y \
     gnupg2 \
     wget \
     bzip2 \

package/images/7.1-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.1-apache-5 .
+# docker build -t devwithlando/php:7.1-apache-7 .
 
 FROM php:7.1-apache-buster
 

package/images/7.1-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.1-fpm-5 .
+# docker build -t devwithlando/php:7.1-fpm-7 .
 
 FROM php:7.1-fpm-buster
 

package/images/7.2-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.2-apache-5 .
+# docker build -t devwithlando/php:7.2-apache-7 .
 
 FROM php:7.2-apache-buster
 

package/images/7.2-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.2-fpm-5 .
+# docker build -t devwithlando/php:7.2-fpm-7 .
 
 FROM php:7.2-fpm-buster
 

package/images/7.3-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.3-apache-5 .
+# docker build -t devwithlando/php:7.3-apache-7 .
 
 FROM php:7.3-apache-bullseye
 

package/images/7.3-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.3-fpm-5 .
+# docker build -t devwithlando/php:7.3-fpm-7 .
 
 FROM php:7.3-fpm-bullseye
 

package/images/7.4-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.4-apache-5 .
+# docker build -t devwithlando/php:7.4-apache-7 .
 
 FROM php:7.4-apache-bullseye
 
@@ -8,7 +8,7 @@ RUN \
   # MariaDB client compatibility (https://github.com/lando/php/issues/120)
   mkdir -p /etc/apt/keyrings \
   && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
 
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \

package/images/7.4-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.4-fpm-5 .
+# docker build -t devwithlando/php:7.4-fpm-7 .
 
 FROM php:7.4-fpm-bullseye
 
@@ -8,7 +8,7 @@ RUN \
   # MariaDB client compatibility (https://github.com/lando/php/issues/120)
   mkdir -p /etc/apt/keyrings \
   && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
 
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \

package/images/8.0-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.0-apache-5 .
+# docker build -t devwithlando/php:8.0-apache-7 .
 
 FROM php:8.0-apache-bullseye
 
@@ -8,7 +8,7 @@ RUN \
   # MariaDB client compatibility (https://github.com/lando/php/issues/120)
   mkdir -p /etc/apt/keyrings \
   && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
 
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \

package/images/8.0-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.0-fpm-5 .
+# docker build -t devwithlando/php:8.0-fpm-7 .
 
 FROM php:8.0-fpm-bullseye
 
@@ -8,7 +8,7 @@ RUN \
   # MariaDB client compatibility (https://github.com/lando/php/issues/120)
   mkdir -p /etc/apt/keyrings \
   && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
 
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \

package/images/8.1-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.1-apache-5 .
+# docker build -t devwithlando/php:8.1-apache-7 .
 
 FROM php:8.1-apache-bookworm
 

package/images/8.1-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.1-fpm-5 .
+# docker build -t devwithlando/php:8.1-fpm-7 .
 
 FROM php:8.1-fpm-bookworm
 

package/images/8.2-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.2-apache-5 .
+# docker build -t devwithlando/php:8.2-apache-7 .
 
 FROM php:8.2-apache-bookworm
 

package/images/8.2-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.2-fpm-5 .
+# docker build -t devwithlando/php:8.2-fpm-7 .
 
 FROM php:8.2-fpm-bookworm
 

package/images/8.3-apache/Dockerfile

@@ -1,41 +1,30 @@
-# docker build -t devwithlando/php:8.3-apache-5 .
+# docker build -t devwithlando/php:8.3-apache-7 .
 
-FROM php:8.3-apache-bookworm
+FROM mysql:8.0 AS mysql-client-80
+FROM mysql:8.4 AS mysql-client-84
+
+FROM php:8.3-apache-trixie
 
 ARG TARGETARCH
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
-RUN \
-  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
-  mkdir -p /etc/apt/keyrings \
-  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.11/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
-
-# Drupal 11 requires sqlite3 3.45+
-ARG SQLITE_VERSION=3.45.1
-RUN \
-  curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb"
-
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
   default-mysql-client \
-  exiftool \
-  git-core \
+  libimage-exiftool-perl \
+  git \
   gnupg2 \
   imagemagick \
-  postgresql-client-15 \
+  mariadb-client \
+  mariadb-client-compat \
+  postgresql-client-17 \
   pv \
   rsync \
   ssh \
   unzip \
-  wget \
-  /tmp/sqlite3.deb \
-  /tmp/libsqlite3-0.deb \
-  /tmp/libsqlite3-dev.deb
+  wget
 
 RUN \
   install-php-extensions @fix_letsencrypt \
@@ -68,6 +57,14 @@ RUN \
 RUN install-php-extensions xdebug \
   && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
 
+# Pre-download MySQL client binaries for version-matched installs
+COPY --from=mysql-client-80 /usr/bin/mysql /usr/local/mysql-client/8.0/mysql
+COPY --from=mysql-client-80 /usr/bin/mysqldump /usr/local/mysql-client/8.0/mysqldump
+COPY --from=mysql-client-80 /usr/bin/mysqladmin /usr/local/mysql-client/8.0/mysqladmin
+COPY --from=mysql-client-84 /usr/bin/mysql /usr/local/mysql-client/8.4/mysql
+COPY --from=mysql-client-84 /usr/bin/mysqldump /usr/local/mysql-client/8.4/mysqldump
+COPY --from=mysql-client-84 /usr/bin/mysqladmin /usr/local/mysql-client/8.4/mysqladmin
+
 RUN \
   chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
   && apt-get -y clean \

package/images/8.3-fpm/Dockerfile

@@ -1,42 +1,30 @@
-# docker build -t devwithlando/php:8.3-fpm-5 .
+# docker build -t devwithlando/php:8.3-fpm-7 .
 
-FROM php:8.3-fpm-bookworm
+FROM mysql:8.0 AS mysql-client-80
+FROM mysql:8.4 AS mysql-client-84
+
+FROM php:8.3-fpm-trixie
 
 ARG TARGETARCH
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
-RUN \
-  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
-  mkdir -p /etc/apt/keyrings \
-  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.11/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
-
-# Drupal 11 requires sqlite3 3.45+
-ARG SQLITE_VERSION=3.45.1
-RUN \
-  curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb"
-
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
   default-mysql-client \
-  exiftool \
-  git-core \
+  libimage-exiftool-perl \
+  git \
   gnupg2 \
   imagemagick \
   mariadb-client \
-  postgresql-client-15 \
+  mariadb-client-compat \
+  postgresql-client-17 \
   pv \
   rsync \
   ssh \
   unzip \
-  wget \
-  /tmp/sqlite3.deb \
-  /tmp/libsqlite3-0.deb \
-  /tmp/libsqlite3-dev.deb
+  wget
 
 RUN \
   install-php-extensions @fix_letsencrypt \
@@ -69,6 +57,14 @@ RUN \
 RUN install-php-extensions xdebug \
   && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
 
+# Pre-download MySQL client binaries for version-matched installs
+COPY --from=mysql-client-80 /usr/bin/mysql /usr/local/mysql-client/8.0/mysql
+COPY --from=mysql-client-80 /usr/bin/mysqldump /usr/local/mysql-client/8.0/mysqldump
+COPY --from=mysql-client-80 /usr/bin/mysqladmin /usr/local/mysql-client/8.0/mysqladmin
+COPY --from=mysql-client-84 /usr/bin/mysql /usr/local/mysql-client/8.4/mysql
+COPY --from=mysql-client-84 /usr/bin/mysqldump /usr/local/mysql-client/8.4/mysqldump
+COPY --from=mysql-client-84 /usr/bin/mysqladmin /usr/local/mysql-client/8.4/mysqladmin
+
 RUN \
   chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
   && apt-get -y clean \

package/images/8.4-apache/Dockerfile

@@ -1,43 +1,30 @@
-# docker build -t devwithlando/php:8.4-apache-5 .
+# docker build -t devwithlando/php:8.4-apache-7 .
 
-FROM php:8.4-apache-bookworm
+FROM mysql:8.0 AS mysql-client-80
+FROM mysql:8.4 AS mysql-client-84
+
+FROM php:8.4-apache-trixie
 
 ARG TARGETARCH
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
-RUN \
-  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
-  mkdir -p /etc/apt/keyrings \
-  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/11.4/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
-
-# Drupal 11 requires sqlite3 3.45+
-ARG SQLITE_VERSION=3.45.1
-RUN \
-  curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb"
-
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
     default-mysql-client \
-    exiftool \
-    git-core \
+    libimage-exiftool-perl \
+    git \
     gnupg2 \
     imagemagick \
     mariadb-client \
     mariadb-client-compat \
-    postgresql-client-15 \
+    postgresql-client-17 \
     pv \
     rsync \
     ssh \
     unzip \
-    wget \
-    /tmp/sqlite3.deb \
-    /tmp/libsqlite3-0.deb \
-    /tmp/libsqlite3-dev.deb
+    wget
 
 RUN \
   install-php-extensions @fix_letsencrypt \
@@ -70,6 +57,14 @@ RUN \
 RUN install-php-extensions xdebug \
   && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
 
+# Pre-download MySQL client binaries for version-matched installs
+COPY --from=mysql-client-80 /usr/bin/mysql /usr/local/mysql-client/8.0/mysql
+COPY --from=mysql-client-80 /usr/bin/mysqldump /usr/local/mysql-client/8.0/mysqldump
+COPY --from=mysql-client-80 /usr/bin/mysqladmin /usr/local/mysql-client/8.0/mysqladmin
+COPY --from=mysql-client-84 /usr/bin/mysql /usr/local/mysql-client/8.4/mysql
+COPY --from=mysql-client-84 /usr/bin/mysqldump /usr/local/mysql-client/8.4/mysqldump
+COPY --from=mysql-client-84 /usr/bin/mysqladmin /usr/local/mysql-client/8.4/mysqladmin
+
 RUN \
   chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
   && apt-get -y clean \

package/images/8.4-fpm/Dockerfile

@@ -1,44 +1,31 @@
-# docker build -t devwithlando/php:8.4-fpm-5 .
+# docker build -t devwithlando/php:8.4-fpm-7 .
 
-FROM php:8.4-fpm-bookworm
+FROM mysql:8.0 AS mysql-client-80
+FROM mysql:8.4 AS mysql-client-84
+
+FROM php:8.4-fpm-trixie
 
 ARG TARGETARCH
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
-RUN \
-  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
-  mkdir -p /etc/apt/keyrings \
-  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/11.4/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
-
-# Drupal 11 requires sqlite3 3.45+
-ARG SQLITE_VERSION=3.45.1
-RUN \
-  curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb"
-
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
     bzip2 \
     default-mysql-client \
-    exiftool \
-    git-core \
+    libimage-exiftool-perl \
+    git \
     gnupg2 \
     imagemagick \
     mariadb-client \
     mariadb-client-compat \
-    postgresql-client-15 \
+    postgresql-client-17 \
     pv \
     rsync \
     ssh \
     unzip \
-    wget \
-    /tmp/sqlite3.deb \
-    /tmp/libsqlite3-0.deb \
-    /tmp/libsqlite3-dev.deb
+    wget
 
 RUN \
   install-php-extensions @fix_letsencrypt \
@@ -71,6 +58,14 @@ RUN \
 RUN install-php-extensions xdebug \
   && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
 
+# Pre-download MySQL client binaries for version-matched installs
+COPY --from=mysql-client-80 /usr/bin/mysql /usr/local/mysql-client/8.0/mysql
+COPY --from=mysql-client-80 /usr/bin/mysqldump /usr/local/mysql-client/8.0/mysqldump
+COPY --from=mysql-client-80 /usr/bin/mysqladmin /usr/local/mysql-client/8.0/mysqladmin
+COPY --from=mysql-client-84 /usr/bin/mysql /usr/local/mysql-client/8.4/mysql
+COPY --from=mysql-client-84 /usr/bin/mysqldump /usr/local/mysql-client/8.4/mysqldump
+COPY --from=mysql-client-84 /usr/bin/mysqladmin /usr/local/mysql-client/8.4/mysqladmin
+
 RUN \
   chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
   && apt-get -y clean \

package/images/8.5-apache/Dockerfile

@@ -0,0 +1,73 @@
+# docker buildx build -t devwithlando/php:8.5-apache-7 .
+
+FROM mysql:8.0 AS mysql-client-80
+FROM mysql:8.4 AS mysql-client-84
+
+FROM php:8.5-apache-trixie
+
+ARG TARGETARCH
+
+ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+
+RUN \
+  mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+  && apt -y update && apt-get install -y \
+    default-mysql-client \
+    libimage-exiftool-perl \
+    git \
+    gnupg2 \
+    imagemagick \
+    mariadb-client \
+    mariadb-client-compat \
+    postgresql-client-17 \
+    pv \
+    rsync \
+    ssh \
+    unzip \
+    wget
+
+RUN \
+  install-php-extensions @fix_letsencrypt \
+  && install-php-extensions apcu \
+  && install-php-extensions bcmath \
+  && install-php-extensions bz2 \
+  && install-php-extensions calendar \
+  && install-php-extensions exif \
+  && install-php-extensions gd \
+  && install-php-extensions gettext \
+  && install-php-extensions imagick/imagick@master \
+  && install-php-extensions imap \
+  && install-php-extensions intl \
+  && install-php-extensions ldap \
+  && install-php-extensions mbstring \
+  && install-php-extensions memcached \
+  && install-php-extensions mysqli \
+  && install-php-extensions oauth \
+  && install-php-extensions opcache \
+  && install-php-extensions pcntl \
+  && install-php-extensions pdo \
+  && install-php-extensions pdo_mysql \
+  && install-php-extensions pdo_pgsql \
+  && install-php-extensions redis \
+  && install-php-extensions soap \
+  && install-php-extensions xhprof \
+  && install-php-extensions zip
+
+# Install xdebug but disable it by default
+RUN install-php-extensions xdebug/xdebug@master \
+  && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
+
+# Pre-download MySQL client binaries for version-matched installs
+COPY --from=mysql-client-80 /usr/bin/mysql /usr/local/mysql-client/8.0/mysql
+COPY --from=mysql-client-80 /usr/bin/mysqldump /usr/local/mysql-client/8.0/mysqldump
+COPY --from=mysql-client-80 /usr/bin/mysqladmin /usr/local/mysql-client/8.0/mysqladmin
+COPY --from=mysql-client-84 /usr/bin/mysql /usr/local/mysql-client/8.4/mysql
+COPY --from=mysql-client-84 /usr/bin/mysqldump /usr/local/mysql-client/8.4/mysqldump
+COPY --from=mysql-client-84 /usr/bin/mysqladmin /usr/local/mysql-client/8.4/mysqladmin
+
+RUN \
+  chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
+  && apt-get -y clean \
+  && apt-get -y autoclean \
+  && apt-get -y autoremove \
+  && rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/*

package/images/8.5-fpm/Dockerfile

@@ -0,0 +1,74 @@
+# docker buildx build -t devwithlando/php:8.5-fpm-7 .
+
+FROM mysql:8.0 AS mysql-client-80
+FROM mysql:8.4 AS mysql-client-84
+
+FROM php:8.5-fpm-trixie
+
+ARG TARGETARCH
+
+ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+
+RUN \
+  mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+  && apt -y update && apt-get install -y \
+    bzip2 \
+    default-mysql-client \
+    libimage-exiftool-perl \
+    git \
+    gnupg2 \
+    imagemagick \
+    mariadb-client \
+    mariadb-client-compat \
+    postgresql-client-17 \
+    pv \
+    rsync \
+    ssh \
+    unzip \
+    wget
+
+RUN \
+  install-php-extensions @fix_letsencrypt \
+  && install-php-extensions apcu \
+  && install-php-extensions bcmath \
+  && install-php-extensions bz2 \
+  && install-php-extensions calendar \
+  && install-php-extensions exif \
+  && install-php-extensions gd \
+  && install-php-extensions gettext \
+  && install-php-extensions imagick/imagick@master \
+  && install-php-extensions imap \
+  && install-php-extensions intl \
+  && install-php-extensions ldap \
+  && install-php-extensions mbstring \
+  && install-php-extensions memcached \
+  && install-php-extensions mysqli \
+  && install-php-extensions oauth \
+  && install-php-extensions opcache \
+  && install-php-extensions pcntl \
+  && install-php-extensions pdo \
+  && install-php-extensions pdo_mysql \
+  && install-php-extensions pdo_pgsql \
+  && install-php-extensions redis \
+  && install-php-extensions soap \
+  && install-php-extensions xhprof \
+  && install-php-extensions zip
+
+# Install xdebug but disable it by default
+RUN install-php-extensions xdebug/xdebug@master \
+  && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
+
+# Pre-download MySQL client binaries for version-matched installs
+COPY --from=mysql-client-80 /usr/bin/mysql /usr/local/mysql-client/8.0/mysql
+COPY --from=mysql-client-80 /usr/bin/mysqldump /usr/local/mysql-client/8.0/mysqldump
+COPY --from=mysql-client-80 /usr/bin/mysqladmin /usr/local/mysql-client/8.0/mysqladmin
+COPY --from=mysql-client-84 /usr/bin/mysql /usr/local/mysql-client/8.4/mysql
+COPY --from=mysql-client-84 /usr/bin/mysqldump /usr/local/mysql-client/8.4/mysqldump
+COPY --from=mysql-client-84 /usr/bin/mysqladmin /usr/local/mysql-client/8.4/mysqladmin
+
+RUN \
+  chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
+  && apt-get -y clean \
+  && apt-get -y autoclean \
+  && apt-get -y autoremove \
+  && rm -rf /var/lib/apt/lists/* && rm -rf && rm -rf /var/lib/cache/* && rm -rf /var/lib/log/* && rm -rf /tmp/*

package/netlify.toml

@@ -10,7 +10,7 @@
 [[context.deploy-preview.plugins]]
   package = "netlify-plugin-checklinks"
   [context.deploy-preview.plugins.inputs]
-    todoPatterns = [ "load", "CHANGELOG.html", "/v/", "x.com", "twitter.com", "www.php.net" ]
+    todoPatterns = [ "load", "CHANGELOG.html", "/v/", "x.com", "twitter.com", "www.php.net", "hub.docker.com" ]
     skipPatterns = [ ".rss", ".gif", ".jpg" ]
     checkExternal = true
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/php",
   "description": "A Lando plugin that provides a tight integration with PHP.",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "author": "Mike Pirog @pirog",
   "license": "MIT",
   "repository": "lando/php",
@@ -66,9 +66,9 @@
     "semver"
   ],
   "dist": {
-    "integrity": "sha512-iacB+ZbgZlcZen5zwnsaHCluP9ZpE2hIKzFwQlzMWooXC39LeR5z1Kw6pt0BoC9a9dmmTVoYAMbf/vGwenuwBw==",
-    "shasum": "a63245f0e3fc8a4af8ce2f62cb383af253787ffd",
-    "filename": "lando-php-1.8.0.tgz",
-    "unpackedSize": 3042655
+    "integrity": "sha512-KI1gTQPz98mOetlZpUMjzxZas/yF8quXdzY9QCV+Yqe2FKmG+8vFgvCViMeiRzevKVXAVpfRiXb5InH3gnyq/g==",
+    "shasum": "85545d2e4b9dc77cc8b771899b1fbdb2e4883c4e",
+    "filename": "lando-php-1.10.0.tgz",
+    "unpackedSize": 3057365
   }
 }

package/scripts/install-db-client.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+# Install database client matching the detected database type/version
+# Usage: install-db-client.sh <type>:<version>
+# Examples:
+#   install-db-client.sh mysql:8.4
+#   install-db-client.sh mariadb:11.8
+
+set -e
+
+DB_CLIENT="${1:-}"
+if [[ -z "$DB_CLIENT" ]]; then
+  echo "No database client specified, keeping defaults"
+  exit 0
+fi
+
+DB_TYPE="${DB_CLIENT%%:*}"
+DB_VERSION="${DB_CLIENT##*:}"
+SCRIPTS_DIR="$(dirname "$0")"
+
+case "$DB_TYPE" in
+  mysql)
+    "$SCRIPTS_DIR/mysql-client-install.sh" "$DB_VERSION"
+    ;;
+  mariadb)
+    "$SCRIPTS_DIR/mariadb-compat-install.sh"
+    ;;
+  *)
+    echo "Unknown database type: $DB_TYPE"
+    exit 1
+    ;;
+esac

package/scripts/mariadb-compat-install.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+# Usage: mariadb-compat-install.sh
+# Creates wrapper scripts to map deprecated mysql commands to mariadb equivalents
+# The mariadb-client package is already installed in the base image
+
+set -e
+
+echo "Installing MariaDB compatibility wrappers..."
+
+# Create wrapper scripts for each mysql* command that maps to mariadb* equivalent
+for cmd in mysql mysqldump mysqladmin mysqlcheck mysqlimport mysqlshow; do
+  suffix="${cmd#mysql}"
+  mariadb_cmd="mariadb${suffix:+-}${suffix}"
+
+  if command -v "$mariadb_cmd" &> /dev/null; then
+    cat > "/usr/local/bin/$cmd" << EOF
+#!/bin/bash
+exec -a "\$0" $mariadb_cmd "\$@"
+EOF
+    chmod +x "/usr/local/bin/$cmd"
+    echo "  Created wrapper: $cmd -> $mariadb_cmd"
+  fi
+done
+
+# Create config directory if it doesn't exist
+mkdir -p /etc/mysql/conf.d
+
+# Create MySQL client config with compatibility settings
+cat > /etc/mysql/conf.d/lando.cnf << 'MYCNF'
+[client]
+default-character-set=utf8mb4
+
+[client-mariadb]
+# Prevent SSL errors when connecting to servers without SSL
+disable-ssl-verify-server-cert
+
+[mysqldump]
+# Prevent column-statistics errors with newer mysqldump
+skip-column-statistics
+MYCNF
+
+echo "MariaDB compatibility wrappers installed"

package/scripts/mysql-client-install.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+# Install MySQL client from pre-downloaded binaries
+# Usage: mysql-client-install.sh <version>
+# Examples: mysql-client-install.sh 8.4, mysql-client-install.sh 8.0
+
+set -e
+
+VERSION="${1:-8.4}"
+
+echo "Installing MySQL $VERSION client..."
+
+# Map version to the closest available pre-downloaded version
+# We have 8.0 and 8.4 available
+case "$VERSION" in
+  8.4*|8.3*)
+    CLIENT_VERSION="8.4"
+    ;;
+  8.0*|8.1*|8.2*|5.7*)
+    CLIENT_VERSION="8.0"
+    ;;
+  *)
+    # Default to 8.4 for unknown versions
+    CLIENT_VERSION="8.4"
+    echo "Warning: Unknown MySQL version $VERSION, using $CLIENT_VERSION client"
+    ;;
+esac
+
+CLIENT_DIR="/usr/local/mysql-client/$CLIENT_VERSION"
+
+if [ -d "$CLIENT_DIR" ]; then
+  # Remove MariaDB client symlinks if they exist in /usr/local/bin
+  rm -f /usr/local/bin/mysql /usr/local/bin/mysqldump /usr/local/bin/mysqladmin 2>/dev/null || true
+
+  # Create symlinks to the pre-downloaded MySQL client
+  ln -sf "$CLIENT_DIR/mysql" /usr/local/bin/mysql
+  ln -sf "$CLIENT_DIR/mysqldump" /usr/local/bin/mysqldump
+  ln -sf "$CLIENT_DIR/mysqladmin" /usr/local/bin/mysqladmin
+
+  echo "MySQL $CLIENT_VERSION client activated from pre-downloaded binaries"
+else
+  echo "Warning: Pre-downloaded MySQL client not found at $CLIENT_DIR"
+  echo "Keeping default mariadb-client"
+  exit 0
+fi
+
+# Create config directory if it doesn't exist
+mkdir -p /etc/mysql/conf.d
+
+# Create MySQL client config with compatibility settings
+cat > /etc/mysql/conf.d/lando.cnf << 'MYCNF'
+[client]
+default-character-set=utf8mb4
+
+[mysqldump]
+# Prevent column-statistics errors with newer mysqldump
+skip-column-statistics
+MYCNF
+
+mysql --version 2>/dev/null || echo "Warning: MySQL client not available"