@lando/drupal 1.12.0 → 1.14.0

package/node_modules/@lando/mariadb/README.md

@@ -49,5 +49,8 @@ Made with [contributors-img](https://contrib.rocks).
 
 ## Other Selected Resources
 
-* [LICENSE](https://github.com/lando/mariadb/blob/main/LICENSE.md)
-* [The best professional advice ever](https://www.youtube.com/watch?v=tkBVDh7my9Q)
+* [LICENSE](/LICENSE)
+* [TERMS OF USE](https://docs.lando.dev/terms)
+* [PRIVACY POLICY](https://docs.lando.dev/privacy)
+* [CODE OF CONDUCT](https://docs.lando.dev/coc)
+

package/node_modules/@lando/mariadb/builders/mariadb.js

@@ -9,28 +9,32 @@ module.exports = {
   name: 'mariadb',
   config: {
     version: '10.3',
-    supported: ['11.5', '11.4', '11.3', '11.2', '11.1', '11.0', '10.11', '10.10', '10.9',
-      '10.8', '10.7', '10.6', '10.5', '10.4', '10.3', '10.2', '10.1'],
-    legacy: ['11.0', '10.10', '10.9', '10.8', '10.7', '10.2',
-      '10.1'],
+    supported: ['11.8', '11.7', '11.6', '11.5', '11.4', '11.3', '11.2',
+      '11.1', '11.0', '10.11', '10.10', '10.9', '10.8', '10.7', '10.6',
+      '10.5', '10.4', '10.3', '10.2', '10.1'],
+    legacy: ['11.7', '11.6', '11.5', '11.3', '11.2', '11.1', '11.0',
+      '10.10', '10.9', '10.8', '10.7', '10.4', '10.3', '10.2', '10.1'],
     pinPairs: {
-      '11.5': 'bitnami/mariadb:11.5.2-debian-12-r2',
-      '11.4': 'bitnami/mariadb:11.4.3-debian-12-r1',
-      '11.3': 'bitnami/mariadb:11.3.2-debian-12-r9',
-      '11.2': 'bitnami/mariadb:11.2.5-debian-12-r2',
-      '11.1': 'bitnami/mariadb:11.1.6-debian-12-r0',
-      '11.0': 'bitnami/mariadb:11.0.6-debian-12-r0',
-      '10.11': 'bitnami/mariadb:10.11.9-debian-12-r1',
-      '10.10': 'bitnami/mariadb:10.10.7-debian-11-r6',
-      '10.9': 'bitnami/mariadb:10.9.8-debian-11-r22',
-      '10.8': 'bitnami/mariadb:10.8.8-debian-11-r5',
-      '10.7': 'bitnami/mariadb:10.7.8-debian-11-r6',
-      '10.6': 'bitnami/mariadb:10.6.18-debian-12-r0',
-      '10.5': 'bitnami/mariadb:10.5.25-debian-12-r0',
-      '10.4': 'bitnami/mariadb:10.4.34-debian-12-r0',
-      '10.3': 'bitnami/mariadb:10.3.39-debian-11-r5',
-      '10.2': 'bitnami/mariadb:10.2.44-debian-11-r9',
-      '10.1': 'bitnami/mariadb:10.1.47-debian-10-r13',
+      '11.8': 'bitnamilegacy/mariadb:11.8.3-debian-12-r0',
+      '11.7': 'bitnamilegacy/mariadb:11.7.2-debian-12-r0',
+      '11.6': 'bitnamilegacy/mariadb:11.6.2-debian-12-r0',
+      '11.5': 'bitnamilegacy/mariadb:11.5.2-debian-12-r7',
+      '11.4': 'bitnamilegacy/mariadb:11.4.7-debian-12-r2',
+      '11.3': 'bitnamilegacy/mariadb:11.3.2-debian-12-r9',
+      '11.2': 'bitnamilegacy/mariadb:11.2.6-debian-12-r2',
+      '11.1': 'bitnamilegacy/mariadb:11.1.6-debian-12-r0',
+      '11.0': 'bitnamilegacy/mariadb:11.0.6-debian-12-r0',
+      '10.11': 'bitnamilegacy/mariadb:10.11.11-debian-12-r11',
+      '10.10': 'bitnamilegacy/mariadb:10.10.7-debian-11-r6',
+      '10.9': 'bitnamilegacy/mariadb:10.9.8-debian-11-r22',
+      '10.8': 'bitnamilegacy/mariadb:10.8.8-debian-11-r5',
+      '10.7': 'bitnamilegacy/mariadb:10.7.8-debian-11-r6',
+      '10.6': 'bitnamilegacy/mariadb:10.6.20-debian-12-r2',
+      '10.5': 'bitnamilegacy/mariadb:10.5.27-debian-12-r2',
+      '10.4': 'bitnamilegacy/mariadb:10.4.34-debian-12-r7',
+      '10.3': 'bitnamilegacy/mariadb:10.3.39-debian-11-r5',
+      '10.2': 'bitnamilegacy/mariadb:10.2.44-debian-11-r9',
+      '10.1': 'bitnamilegacy/mariadb:10.1.47',
     },
     patchesSupported: true,
     confSrc: path.resolve(__dirname, '..', 'config'),
@@ -59,7 +63,7 @@ module.exports = {
       if (!options.healthcheck) options.healthcheck = require('../utils/get-default-healthcheck')(options);
 
       const mariadb = {
-        image: `bitnami/mariadb:${options.version}`,
+        image: `bitnamilegacy/mariadb:${options.version}`,
         command: '/launch.sh',
         environment: {
           ALLOW_EMPTY_PASSWORD: 'yes',

package/node_modules/@lando/mariadb/netlify.toml

@@ -41,9 +41,16 @@
   [plugins.inputs.audits]
     output_path = "reports/lighthouse.html"
 
-
-
 # We need this so preview environments and the base site look ok on their own
+[[redirects]]
+  from = "https://lando-mariadb.netlify.app"
+  to = "https://lando-mariadb.netlify.app/plugins/mariadb/index.html"
+  status = 301
+  force = true
+[[redirects]]
+  from = "https://lando-mariadb.netlify.app/*"
+  to = "https://docs.lando.dev/:splat"
+  status = 301
 [[redirects]]
   from = "/"
   to = "/plugins/mariadb"

package/node_modules/@lando/mariadb/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@lando/mariadb",
   "description": "A Lando plugin that provides a tight integration with mariadb.",
-  "version": "1.6.3",
+  "version": "1.8.0",
   "author": "Mike Pirog @pirog",
-  "license": "GPL-3.0",
+  "license": "MIT",
   "repository": "lando/mariadb",
   "bugs": "https://github.com/lando/mariadb/issues/new/choose",
   "homepage": "https://github.com/lando/mariadb",
@@ -14,7 +14,7 @@
     "mariadb"
   ],
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "lando": {},
   "main": "index.js",
@@ -48,7 +48,7 @@
   "devDependencies": {
     "@babel/eslint-parser": "^7.16.0",
     "@lando/leia": "^1.0.0-beta.3",
-    "@lando/vitepress-theme-default-plus": "^1.1.0-beta.24",
+    "@lando/vitepress-theme-default-plus": "^1.1.1",
     "chai": "^4.3.4",
     "command-line-test": "^1.0.10",
     "eslint": "^7.32.0",
@@ -62,9 +62,9 @@
     "lodash"
   ],
   "dist": {
-    "integrity": "sha512-lRNFeEZkrIJV03mrt2s2DUWEwEI/E760tYyzb3OfSfkVtJLbUOe9vz7rKr06BzxdY/zSWHt4DAIMix9Qq0dXgg==",
-    "shasum": "0728729f8f452a75b9430492284186b4a394bf68",
-    "filename": "lando-mariadb-1.6.3.tgz",
-    "unpackedSize": 1472258
+    "integrity": "sha512-PmnBqSulIxzB3/RfG4quKqBVdCyy9gw0DNBhz9sDiGjf3Pm2N5+QEEko+zNzhlLNy0C4nbfeQy3pCEyw1otclg==",
+    "shasum": "2ba1368e8c58386f966e631f88b7a1c335217080",
+    "filename": "lando-mariadb-1.8.0.tgz",
+    "unpackedSize": 1429885
   }
 }

package/node_modules/@lando/mysql/.lando.yml

@@ -5,7 +5,7 @@ proxy:
 services:
   cli:
     api: 4
-    image: node:18
+    image: node:20
     command: sleep infinity
     ports:
       - 5173:5173/http

package/node_modules/@lando/mysql/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.6.0 - [August 31, 2025](https://github.com/lando/mysql/releases/tag/v1.6.0)
+
+* Switched images to [bitnamilegacy](https://github.com/bitnami/containers/issues/83267) namespace
+* Updated `mysql:8.4` to `8.4.3`
+
 ## v1.5.0 - [January 6, 2025](https://github.com/lando/mysql/releases/tag/v1.5.0)
 
 * Added support for MySQL 8.4

package/node_modules/@lando/mysql/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Lando Alliance
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/node_modules/@lando/mysql/README.md

@@ -49,5 +49,8 @@ Made with [contributors-img](https://contrib.rocks).
 
 ## Other Selected Resources
 
-* [LICENSE](https://github.com/lando/mysql/blob/main/LICENSE.md)
-* [The best professional advice ever](https://www.youtube.com/watch?v=tkBVDh7my9Q)
+* [LICENSE](/LICENSE)
+* [TERMS OF USE](https://docs.lando.dev/terms)
+* [PRIVACY POLICY](https://docs.lando.dev/privacy)
+* [CODE OF CONDUCT](https://docs.lando.dev/coc)
+

package/node_modules/@lando/mysql/builders/mysql.js

@@ -9,11 +9,15 @@ module.exports = {
   name: 'mysql',
   config: {
     version: '5.7',
-    supported: ['8.4', '8.0', '5.7'],
+    supported: ['8', '8.4', '8.3', '8.2', '8.1', '8.0', '5.7'],
     pinPairs: {
-      '8.4': 'bitnami/mysql:8.4.3-debian-12-r4',
-      '8.0': 'bitnami/mysql:8.0.40-debian-12-r4',
-      '5.7': 'bitnami/mysql:5.7.43-debian-11-r73',
+      '8': 'bitnamilegacy/mysql:8.4.5-debian-12-r0',
+      '8.4': 'bitnamilegacy/mysql:8.4.5-debian-12-r0',
+      '8.3': 'bitnamilegacy/mysql:8.3.0-debian-12-r9',
+      '8.2': 'bitnamilegacy/mysql:8.2.0-debian-11-r8',
+      '8.1': 'bitnamilegacy/mysql:8.1.0-debian-11-r57',
+      '8.0': 'bitnamilegacy/mysql:8.0.40-debian-12-r5',
+      '5.7': 'bitnamilegacy/mysql:5.7.43-debian-11-r73',
     },
     patchesSupported: true,
     confSrc: path.resolve(__dirname, '..', 'config'),
@@ -47,7 +51,7 @@ module.exports = {
 
       // Build the default stuff here
       const mysql = {
-        image: `bitnami/mysql:${options.version}`,
+        image: `bitnamilegacy/mysql:${options.version}`,
         command: '/launch.sh',
         environment: {
           ALLOW_EMPTY_PASSWORD: 'yes',

package/node_modules/@lando/mysql/netlify.toml

@@ -40,6 +40,15 @@
     output_path = "reports/lighthouse.html"
 
 # We need this so preview environments and the base site look ok on their own
+[[redirects]]
+  from = "https://lando-mysql.netlify.app"
+  to = "https://lando-mysql.netlify.app/plugins/mysql/index.html"
+  status = 301
+  force = true
+[[redirects]]
+  from = "https://lando-mysql.netlify.app/*"
+  to = "https://docs.lando.dev/:splat"
+  status = 301
 [[redirects]]
   from = "/"
   to = "/plugins/mysql"

package/node_modules/@lando/mysql/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@lando/mysql",
   "description": "A Lando plugin that provides a tight integration with MySQL.",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "author": "Mike Pirog @pirog",
-  "license": "GPL-3.0",
+  "license": "MIT",
   "repository": "lando/mysql",
   "bugs": "https://github.com/lando/mysql/issues/new/choose",
   "homepage": "https://github.com/lando/mysql",
@@ -14,7 +14,7 @@
     "mysql"
   ],
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "lando": {},
   "main": "index.js",
@@ -48,7 +48,7 @@
   "devDependencies": {
     "@babel/eslint-parser": "^7.16.0",
     "@lando/leia": "^1.0.0-beta.3",
-    "@lando/vitepress-theme-default-plus": "^1.1.0-beta.24",
+    "@lando/vitepress-theme-default-plus": "^1.1.1",
     "chai": "^4.3.4",
     "command-line-test": "^1.0.10",
     "eslint": "^7.32.0",
@@ -62,9 +62,9 @@
     "lodash"
   ],
   "dist": {
-    "integrity": "sha512-6Vo5ldpXsUNlwXbDBLTiZKcx0H58FBJQ4Cv3+oI54MnAuUwWc0DpmHfa5eKR39wNuqxXrMXulS7igDE62FRhvQ==",
-    "shasum": "2eb72be5a0a4beeeebb6384d7913def1ddded538",
-    "filename": "lando-mysql-1.5.0.tgz",
-    "unpackedSize": 1471270
+    "integrity": "sha512-cuoAwfjGpcrsLcunOAi697Ot9NgKUy/EcHDwgB9PUwdMo+EPk+7K+WdBRUXyg4p/CcwdfT+qdkFPw0jJhjsFKQ==",
+    "shasum": "e026302a27da04338208d1bca579c4dc9b15f123",
+    "filename": "lando-mysql-1.6.0.tgz",
+    "unpackedSize": 1428568
   }
 }

package/node_modules/@lando/php/.lando.yml

@@ -5,7 +5,7 @@ proxy:
 services:
   cli:
     api: 4
-    image: node:18
+    image: node:20
     command: sleep infinity
     ports:
       - 5173:5173/http

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,36 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## 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
+* 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`
+* Switched images to [bitnamilegacy](https://github.com/bitnami/containers/issues/83267) namespace
+* Updated to [@lando/nginx@1.5.0](https://github.com/lando/nginx/releases/tag/v1.5.0)
+
 ## v1.7.1 - [January 15, 2025](https://github.com/lando/php/releases/tag/v1.7.1)
 
 * Improved the `php` service builder to mount a unique scripts directory per service to prevent version conflicts.

package/node_modules/@lando/php/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Lando Alliance
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

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
 
@@ -54,5 +57,8 @@ Made with [contributors-img](https://contrib.rocks).
 
 ## Other Selected Resources
 
-* [LICENSE](https://github.com/lando/php/blob/main/LICENSE.md)
-* [The best professional advice ever](https://www.youtube.com/watch?v=tkBVDh7my9Q)
+* [LICENSE](/LICENSE)
+* [TERMS OF USE](https://docs.lando.dev/terms)
+* [PRIVACY POLICY](https://docs.lando.dev/privacy)
+* [CODE OF CONDUCT](https://docs.lando.dev/coc)
+

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:X or recipe-mysql:X (e.g., backdrop-mysql:8.0, drupal-mysql:8.4)
+    const mysqlMatch = type.match(/(?:^|-)mysql:(\d+(?:\.\d+)?)/);
+    if (mysqlMatch && !mysqlVersion) mysqlVersion = mysqlMatch[1];
+    // Match mariadb:X or recipe-mariadb:X (e.g., backdrop-mariadb:10.6, drupal-mariadb:11.4)
+    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: '.',
@@ -218,13 +247,6 @@ module.exports = {
       } else if (typeof options.composer_version === 'number') {
         options.composer_version = options.composer_version.toString();
       }
-      const usingComposer1 = options.composer_version && semver.satisfies(options.composer_version, '1.x');
-
-      // Add prestissimo as a global package for Composer 1.x performance improvements. Requires PHP >= 5.3
-      if (usingComposer1 && phpSemver && semver.gte(phpSemver, '5.3.0')) {
-        options.composer = options.composer || {};
-        options.composer = {'hirak/prestissimo': '*', ...options.composer};
-      }
 
       // Add build step to enable xdebug
       if (options.xdebug) {
@@ -238,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,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/node_modules/@lando/php/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/node_modules/@lando/php/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 \