@lando/laravel 1.11.0 → 1.12.1

package/AGENTS.md

@@ -0,0 +1,117 @@
+# AGENTS.md
+
+This file provides guidance to AI coding assistants when working with code in this repository.
+
+## Project Overview
+
+This is the official Lando plugin for Laravel (`@lando/laravel`). It provides a recipe that configures PHP, web server, database, and caching services for Laravel development environments.
+
+## Common Commands
+
+```bash
+# Install dependencies
+npm install
+
+# Run linting
+npm run lint
+
+# Run unit tests
+npm run test:unit
+
+# Run both lint and unit tests
+npm test
+
+# Run integration tests (Leia)
+npm run test:leia
+
+# Run a single integration test
+npx leia examples/laravel-defaults/README.md -c 'Destroy tests'
+
+# Documentation development
+npm run docs:dev      # Start dev server
+npm run docs:build    # Build docs
+```
+
+## Architecture
+
+### Plugin Structure
+
+- **builders/** - Service builders that extend Lando's base services
+  - `laravel.js` - Main recipe builder, configures all services and tooling
+  - `laravel-php.js`, `laravel-nginx.js`, `laravel-mysql.js`, etc. - Service-specific builders that extend `@lando/php`, `@lando/mysql`, etc.
+
+- **config/** - Configuration templates
+  - `default.conf.tpl` - Nginx vhost template
+  - `php.ini`, `mysql.cnf`, `mysql8.cnf` - Service configs
+
+- **inits/** - Initialization logic for `lando init` command
+
+- **examples/** - Working Lando apps for development and testing. Each example has a `plugins: "@lando/laravel": ../..` directive to use the local source.
+
+- **test/** - Unit tests (Mocha/Chai). Name files as `*.spec.js`.
+
+### Recipe Configuration Flow
+
+The main `builders/laravel.js` exports a recipe that:
+1. Accepts user config (php version, database type, cache, via, webroot, xdebug)
+2. Merges defaults with user overrides
+3. Configures services: appserver (PHP), database, optional cache
+4. Sets up tooling: composer, php, artisan, db-import/export, database CLI
+
+### Dependencies
+
+This plugin depends on other Lando service plugins:
+- `@lando/php` - PHP/Apache/Nginx services
+- `@lando/mysql`, `@lando/mariadb`, `@lando/postgres`, `@lando/mssql` - Databases
+- `@lando/redis`, `@lando/memcached` - Caching
+
+## Testing
+
+### Unit Tests
+Place in `test/` with `.spec.js` extension. Run with `npm run test:unit`.
+
+### Leia Integration Tests
+Integration tests are written as shell commands in markdown (example READMEs). The markdown follows a specific format with "Start up tests", "Verification commands", and "Destroy tests" sections. See `examples/*/README.md` for examples.
+
+**Note:** Integration tests in `examples/` are run by the `pr-laravel-tests.yml` GitHub Actions workflow on pull requests, but only if they are explicitly listed in the workflow's test matrix. New examples must be added to the matrix in `pr-laravel-tests.yml` to be included in CI.
+
+## GitHub Actions
+
+CI/CD workflows are defined in `.github/workflows/`:
+
+### PR Workflows (run on every pull request)
+
+| Workflow | File | Purpose |
+|----------|------|---------|
+| **Laravel Tests** | `pr-laravel-tests.yml` | Runs Leia integration tests for examples explicitly listed in the workflow matrix. Tests against Lando 3-edge and 3-stable on Ubuntu. |
+| **Unit Tests** | `pr-unit-tests.yml` | Runs `npm run test:unit` across Windows, Ubuntu, and macOS. |
+| **Lint Code** | `pr-linter.yml` | Runs `npm run lint` to check code style. |
+| **Docs Tests** | `pr-docs-tests.yml` | Builds documentation to verify no broken builds. |
+
+### Release Workflow
+
+| Workflow | File | Purpose |
+|----------|------|---------|
+| **Publish to NPM** | `release.yml` | Triggered on GitHub release creation. Runs lint + unit tests, then publishes to npm. Stable releases go to `latest` tag; prereleases go to `edge` tag. |
+
+### Integration Test Matrix
+
+The `pr-laravel-tests.yml` workflow explicitly lists which examples to test. New examples must be added to this list to run in CI.
+
+Each test runs against the example's `README.md` using the [Leia](https://github.com/lando/leia) test runner.
+
+## Development Workflow
+
+1. Use examples directory - apps there reference the local plugin source
+2. To test against an external app, add to its Landofile:
+   ```yaml
+   plugins:
+     "@lando/laravel": /path/to/this/plugin
+   ```
+
+## Code Style
+
+- ESLint with Google config, max 140 char lines
+- Node.js 20+
+- JSDoc required for function declarations
+- 2-space indentation

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.12.1 - [February 22, 2026](https://github.com/lando/laravel/releases/tag/v1.12.1)
+
+* Updated to [@lando/php@1.11.1](https://github.com/lando/php/releases/tag/v1.11.1) for PHP 8.5 support, database client auto-detection, and more.
+
+## v1.12.0 - [February 19, 2026](https://github.com/lando/laravel/releases/tag/v1.12.0)
+
+* Updated to [@lando/php@1.10.0](https://github.com/lando/php/releases/tag/v1.10.0)
+* Fixed release workflow to trigger on `published` instead of `created` events
+
 ## v1.11.0 - [December 30, 2025](https://github.com/lando/laravel/releases/tag/v1.11.0)
 
 * Updated to [@lando/mariadb@1.8.0](https://github.com/lando/mariadb/releases/tag/v1.8.0)

package/README.md

@@ -42,9 +42,9 @@ We try to log all changes big and small in both [THE CHANGELOG](https://github.c
 
 
 ## Maintainers
-
 * [@pirog](https://github.com/pirog)
 * [@reynoldsalec](https://github.com/reynoldsalec)
+* [@AaronFeledy](https://github.com/AaronFeledy)
 
 ## Contributors
 

package/node_modules/@lando/php/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/node_modules/@lando/php/CHANGELOG.md

@@ -1,5 +1,28 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.11.1 - [February 20, 2026](https://github.com/lando/php/releases/tag/v1.11.1)
+
+* Fixed database type detection when no version is specified
+* Added npm edge-to-latest tag promotion on release
+
+## v1.11.0 - [February 19, 2026](https://github.com/lando/php/releases/tag/v1.11.0)
+
+* Fixed database client auto-detection for recipe-based services [#223](https://github.com/lando/php/pull/223)
+
+## 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

package/node_modules/@lando/php/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/node_modules/@lando/php/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 or mysql:X, including recipe prefixes (e.g., backdrop-mysql, backdrop-mysql:8.0)
+    const mysqlMatch = type.match(/(?:^|-)mysql(?::(\d+(?:\.\d+)?))?(?:$|[^a-z])/);
+    if (mysqlMatch && !mysqlVersion) mysqlVersion = mysqlMatch[1] || '8.0';
+    // Match mariadb or mariadb:X, including recipe prefixes (e.g., backdrop-mariadb:10.6)
+    const mariaMatch = type.match(/(?:^|-)mariadb(?::(\d+(?:\.\d+)?))?(?:$|[^a-z])/);
+    if (mariaMatch && !mariaVersion) mariaVersion = mariaMatch[1] || '11.4';
+  }
+
+  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
  *
@@ -163,8 +191,9 @@ module.exports = {
     },
     scriptsDir: path.resolve(__dirname, '..', 'scripts'),
     sources: [],
-    suffix: '6',
+    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/node_modules/@lando/php/images/5.6-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:5.6-apache-6 .
+# docker build -t devwithlando/php:5.6-apache-7 .
 
 FROM php:5.6-apache-stretch
 

package/node_modules/@lando/php/images/5.6-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:5.6-fpm-6 .
+# docker build -t devwithlando/php:5.6-fpm-7 .
 
 FROM php:5.6-fpm-stretch
 

package/node_modules/@lando/php/images/7.0-apache/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.0-apache-6 .
+# docker build -t devwithlando/php:7.0-apache-7 .
 
 FROM php:7.0-apache-stretch
 

package/node_modules/@lando/php/images/7.0-fpm/Dockerfile

@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.0-fpm-6 .
+# docker build -t devwithlando/php:7.0-fpm-7 .
 
 FROM php:7.0-fpm-stretch
 

package/node_modules/@lando/php/images/7.1-apache/Dockerfile

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

package/node_modules/@lando/php/images/7.1-fpm/Dockerfile

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

package/node_modules/@lando/php/images/7.2-apache/Dockerfile

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

package/node_modules/@lando/php/images/7.2-fpm/Dockerfile

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

package/node_modules/@lando/php/images/7.3-apache/Dockerfile

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

package/node_modules/@lando/php/images/7.3-fpm/Dockerfile

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

package/node_modules/@lando/php/images/7.4-apache/Dockerfile

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

package/node_modules/@lando/php/images/7.4-fpm/Dockerfile

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

package/node_modules/@lando/php/images/8.0-apache/Dockerfile

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

package/node_modules/@lando/php/images/8.0-fpm/Dockerfile

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

package/node_modules/@lando/php/images/8.1-apache/Dockerfile

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

package/node_modules/@lando/php/images/8.1-fpm/Dockerfile

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

package/node_modules/@lando/php/images/8.2-apache/Dockerfile

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

package/node_modules/@lando/php/images/8.2-fpm/Dockerfile

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

package/node_modules/@lando/php/images/8.3-apache/Dockerfile

@@ -1,4 +1,7 @@
-# docker build -t devwithlando/php:8.3-apache-6 .
+# docker build -t devwithlando/php:8.3-apache-7 .
+
+FROM mysql:8.0 AS mysql-client-80
+FROM mysql:8.4 AS mysql-client-84
 
 FROM php:8.3-apache-trixie
 
@@ -54,6 +57,18 @@ 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
+
+# Ensure required MySQL client shared libraries are present
+COPY --from=mysql-client-80 /usr/lib64/libmysqlclient.so* /usr/lib/
+COPY --from=mysql-client-84 /usr/lib64/libmysqlclient.so* /usr/lib/
+
 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/node_modules/@lando/php/images/8.3-fpm/Dockerfile

@@ -1,4 +1,7 @@
-# docker build -t devwithlando/php:8.3-fpm-6 .
+# docker build -t devwithlando/php:8.3-fpm-7 .
+
+FROM mysql:8.0 AS mysql-client-80
+FROM mysql:8.4 AS mysql-client-84
 
 FROM php:8.3-fpm-trixie
 
@@ -54,6 +57,18 @@ 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
+
+# Ensure required MySQL client shared libraries are present
+COPY --from=mysql-client-80 /usr/lib64/libmysqlclient.so* /usr/lib/
+COPY --from=mysql-client-84 /usr/lib64/libmysqlclient.so* /usr/lib/
+
 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/node_modules/@lando/php/images/8.4-apache/Dockerfile

@@ -1,4 +1,7 @@
-# docker build -t devwithlando/php:8.4-apache-6 .
+# docker build -t devwithlando/php:8.4-apache-7 .
+
+FROM mysql:8.0 AS mysql-client-80
+FROM mysql:8.4 AS mysql-client-84
 
 FROM php:8.4-apache-trixie
 
@@ -54,6 +57,18 @@ 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
+
+# Ensure required MySQL client shared libraries are present
+COPY --from=mysql-client-80 /usr/lib64/libmysqlclient.so* /usr/lib/
+COPY --from=mysql-client-84 /usr/lib64/libmysqlclient.so* /usr/lib/
+
 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/node_modules/@lando/php/images/8.4-fpm/Dockerfile

@@ -1,4 +1,7 @@
-# docker build -t devwithlando/php:8.4-fpm-6 .
+# docker build -t devwithlando/php:8.4-fpm-7 .
+
+FROM mysql:8.0 AS mysql-client-80
+FROM mysql:8.4 AS mysql-client-84
 
 FROM php:8.4-fpm-trixie
 
@@ -55,6 +58,18 @@ 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
+
+# Ensure required MySQL client shared libraries are present
+COPY --from=mysql-client-80 /usr/lib64/libmysqlclient.so* /usr/lib/
+COPY --from=mysql-client-84 /usr/lib64/libmysqlclient.so* /usr/lib/
+
 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/node_modules/@lando/php/images/8.5-apache/Dockerfile

@@ -1,4 +1,7 @@
-# docker buildx build -t devwithlando/php:8.5-apache-6 .
+# 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
 
@@ -54,6 +57,18 @@ RUN \
 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
+
+# Ensure required MySQL client shared libraries are present
+COPY --from=mysql-client-80 /usr/lib64/libmysqlclient.so* /usr/lib/
+COPY --from=mysql-client-84 /usr/lib64/libmysqlclient.so* /usr/lib/
+
 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/node_modules/@lando/php/images/8.5-fpm/Dockerfile

@@ -1,4 +1,7 @@
-# docker buildx build -t devwithlando/php:8.5-fpm-6 .
+# 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
 
@@ -55,6 +58,18 @@ RUN \
 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
+
+# Ensure required MySQL client shared libraries are present
+COPY --from=mysql-client-80 /usr/lib64/libmysqlclient.so* /usr/lib/
+COPY --from=mysql-client-84 /usr/lib64/libmysqlclient.so* /usr/lib/
+
 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/node_modules/@lando/php/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/php",
   "description": "A Lando plugin that provides a tight integration with PHP.",
-  "version": "1.9.0",
+  "version": "1.11.1",
   "author": "Mike Pirog @pirog",
   "license": "MIT",
   "repository": "lando/php",
@@ -66,9 +66,9 @@
     "semver"
   ],
   "dist": {
-    "integrity": "sha512-rVVcfFfqh6pLhya7NOOxI22M3OwadUGbJ30KUv5HfQy7UfcNrhQ0SrvAYsPvL5l5Lt9jSxqrzJN9TotYyOLecQ==",
-    "shasum": "20621106d351773689ba1a2cd86d307be2734f8e",
-    "filename": "lando-php-1.9.0.tgz",
-    "unpackedSize": 3044415
+    "integrity": "sha512-YARvLV+LsZ5LloDW2E7r3stkptHPkCtMh7VrEQu7Wa0pNF1N8TAQJlGxIRrWWuVT/6N7mgw+IWgro3CtPlCKsw==",
+    "shasum": "74c9af6bc8853760d8ca3a57528658580f99e409",
+    "filename": "lando-php-1.11.1.tgz",
+    "unpackedSize": 3059346
   }
 }

package/node_modules/@lando/php/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/node_modules/@lando/php/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]
+# MySQL 8 uses this; MariaDB safely ignores it via loose- prefix
+loose-skip-column-statistics
+MYCNF
+
+echo "MariaDB compatibility wrappers installed"

package/node_modules/@lando/php/scripts/mysql-client-install.sh

@@ -0,0 +1,67 @@
+#!/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
+# Use PREFERRED so SSL is used when available but self-signed certs
+# (e.g. MySQL 5.7 defaults) don't cause verification failures.
+# Preserves SSL for servers that support it
+ssl-mode=PREFERRED
+
+[mysqldump]
+# Prevent column-statistics errors with newer mysqldump
+skip-column-statistics
+ssl-mode=PREFERRED
+MYCNF
+
+if ! mysql --version 2>/dev/null; then
+  echo "Error: MySQL client not available after activation"
+  exit 1
+fi

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/laravel",
   "description": "A Lando plugin that provides a tight integration with Laravel.",
-  "version": "1.11.0",
+  "version": "1.12.1",
   "author": "Mike Pirog @pirog",
   "license": "MIT",
   "repository": "lando/laravel",
@@ -47,7 +47,7 @@
     "@lando/memcached": "^1.4.2",
     "@lando/mssql": "^1.4.3",
     "@lando/mysql": "^1.6.0",
-    "@lando/php": "^1.8.0",
+    "@lando/php": "^1.11.1",
     "@lando/postgres": "^1.5.0",
     "@lando/redis": "^1.2.3",
     "lodash": "^4.17.21"
@@ -76,9 +76,9 @@
     "lodash"
   ],
   "dist": {
-    "integrity": "sha512-AYaryun7iLyehOh0fNG44fdNgRUPFfDeR895u/IoCSJJfQFFNNJID9tLEZOqj3/oWJEZQGbsnfL7peO3gMuVdA==",
-    "shasum": "5285df541adbd3ce70f6c4b9bf248a6d93c07d5f",
-    "filename": "lando-laravel-1.11.0.tgz",
-    "unpackedSize": 13184164
+    "integrity": "sha512-CKW0am1RSHeXCeg3OCF9sJ7phPZCq5a3OiY9yS31+2haf7k8w20DPlqTTjAu811rAwfkOKtPjeG3IbGilBVQEg==",
+    "shasum": "e96504b6bc144a881a50d0d10d2e3db298619ea1",
+    "filename": "lando-laravel-1.12.1.tgz",
+    "unpackedSize": 13203935
   }
 }