@lando/drupal 1.11.0 → 1.13.0

package/node_modules/@lando/mariadb/.node-version

@@ -1 +1 @@
-18
+20

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

@@ -1,7 +1,14 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## v1.7.0 - [August 30, 2025](https://github.com/lando/mariadb/releases/tag/v1.7.0)
+
+* Switched images to [bitnamilegacy](https://github.com/bitnami/containers/issues/83267) namespace
+* Updated `mariadb:11.4` to `11.4.7`
+
 ## v1.6.3 - [December 6, 2024](https://github.com/lando/mariadb/releases/tag/v1.6.3)
 
+* Added support for MariaDB 11.6 and 11.7.
+* Bumped all available MariaDB minor versions.
 * Updated the version index.md to get Docuverse page to build correctly.
 
 ## v1.6.2 - [December 4, 2024](https://github.com/lando/mariadb/releases/tag/v1.6.2)
@@ -19,7 +26,7 @@
 ## v1.5.0 - [September 26, 2024](https://github.com/lando/mariadb/releases/tag/v1.5.0)
 
 * Added MariaDB 11.5.
-* Updated pinned image versions to be ARM compatible. 
+* Updated pinned image versions to be ARM compatible.
 
 ## v1.4.0 - [September 24, 2024](https://github.com/lando/mariadb/releases/tag/v1.4.0)
 

package/node_modules/@lando/mariadb/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/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,31 @@ 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.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.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 +62,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.7.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-wyl7/a+vPWwj3OvOd12kbMRCA98PdbLscClQeTZTEmm6ngu/SX4wHtOFVt7n8bZXnqi35PlUF6etz1OzVDk1XQ==",
+    "shasum": "f4731311c8a6ee835c43a943557749fcd46b899a",
+    "filename": "lando-mariadb-1.7.0.tgz",
+    "unpackedSize": 1429697
   }
 }

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,15 @@
 ## {{ 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
+* Updated 8.0 to patch 40
+
 ## v1.4.4 - [December 7, 2024](https://github.com/lando/mysql/releases/tag/v1.4.4)
 
 * Optimized for `midcore`

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,13 +9,17 @@ module.exports = {
   name: 'mysql',
   config: {
     version: '5.7',
-    supported: ['8.0', '5.7'],
+    supported: ['8', '8.4', '8.3', '8.2', '8.1', '8.0', '5.7'],
     pinPairs: {
-      '8.0': 'bitnami/mysql:8.0.39-debian-12-r5',
-      '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,
-    authentication: 'caching_sha2_password',
     confSrc: path.resolve(__dirname, '..', 'config'),
     creds: {
       database: 'database',
@@ -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.4.4",
+  "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-b2k9E1ArWb3VNdPxxfEiEB05XCO7HtoTkf0O44E7SlPeYUfTTsBP6bPk60SJ6SJFA3V5KHl9TAPfXIhVemONtg==",
-    "shasum": "2db77cc0602dc1a32f67205a058837954250ec60",
-    "filename": "lando-mysql-1.4.4.tgz",
-    "unpackedSize": 1471119
+    "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/CHANGELOG.md

@@ -1,13 +1,47 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
+## 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.
+
+## v1.7.0 - [January 8, 2025](https://github.com/lando/php/releases/tag/v1.7.0)
+
+* Added logic to allow default `composer` version to be set based on PHP version.
+* Added `2.2` and `2.2-latest` shorthand options to install the latest stable 2.2 LTS version of `composer`.
+* Set default `composer` version to `2-latest`
+* Set default `composer` version to `2.2-latest` for PHP 5.3-7.2
+* Set default `composer` version to `1-latest` for PHP <= 5.2
+* Removed `composer` installation from images to prefer installing during app build
+* Fixed bug causing `composer` 2.2.x to be installed when `composer_version` was set to a single digit version such as `1`
+* Fixed mismatched `libsqlite3-dev` and `libsqlite3-0` versions in PHP 8.3 and 8.4 images
+* Fixed regression causing ImageMagick `convert` to not be available in images with `imagick` extension enabled
+
+## v1.6.4 - [December 14, 2024](https://github.com/lando/php/releases/tag/v1.6.4)
+
+* Fixed issue causing `xdebug` extension to not be disabled by default in PHP 8.3 and 8.4 images.
+* Added `install-php-extensions` script to PHP 7.4-8.2 images.
+* Added MariaDB client tools to PHP 7.4-8.4 images [#120](https://github.com/lando/php/issues/120).
+* Added `xhprof` extension to PHP 7.4-8.4 images.
+* Updated `sqlite3` to 3.45.1 in PHP 8.3-8.4 images.
+
 ## v1.6.3 - [December 7, 2024](https://github.com/lando/php/releases/tag/v1.6.3)
 
 * Optimized for `midcore`
 
 ## v1.6.2 - [December 6, 2024](https://github.com/lando/php/releases/tag/v1.6.2)
 
+* Updated PHP 8.1-8.3 base images to Debian 12 (bookworm).
+* Added `install-php-extensions` script to PHP 8.3 and 8.4 images.
+* Added `imagick` extension to PHP 8.3 and 8.4 images.
+* Updated 8.4RC image to 8.4 stable.
+* Added `xdebug` extension to PHP 8.4 images.
 * Updated the version index.md to get Docuverse page to build correctly.
-
 * Updated to [@lando/vitepress-theme-default-plus@v1.1.0-beta.24](https://github.com/lando/vitepress-theme-default-plus/releases/tag/v1.1.0-beta.24).
 * Updated GitHub Actions to build images only on changes to images or workflows.
 

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

@@ -54,5 +54,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

@@ -5,6 +5,29 @@ const _ = require('lodash');
 const path = require('path');
 const semver = require('semver');
 const addBuildStep = require('./../utils/add-build-step');
+
+/**
+ * Get the appropriate Composer version based on the PHP version.
+ * @param {semver} phpSemver - The PHP semantic version.
+ * @return {string|boolean} - The Composer version or false if we cannot parse the version.
+ */
+const getDefaultComposerVersion = phpSemver => {
+  // Don't set a default composer version if we cannot
+  // parse the version such as with `custom`.
+  if (!phpSemver) return false;
+
+  if (semver.lt(phpSemver, '5.3.2')) {
+    // Use Composer 1 for PHP < 5.3.2
+    return '1';
+  } else if (semver.lt(phpSemver, '7.3.0')) {
+    // Use Composer 2.2 LTS for PHP < 7.3
+    return '2.2';
+  } else {
+    // Use Composer 2 for PHP >= 7.3
+    return '2';
+  }
+};
+
 /*
  * Helper to get nginx config
  */
@@ -30,13 +53,25 @@ const nginxConfig = options => ({
 const xdebugConfig = host => ([
   `client_host=${host}`,
   'discover_client_host=1',
- 'log=/tmp/xdebug.log',
- 'remote_enable=true',
+  'log=/tmp/xdebug.log',
+  'remote_enable=true',
   `remote_host=${host}`,
 ].join(' '));
 
-/*
- * Helper to build a package string
+/**
+ * Helper function to build a package string by combining package name and version
+ *
+ * @param {string} pkg - The package name
+ * @param {string} version - The package version
+ * @return {string} The formatted package string, either "pkg:version" or just "pkg" if version is empty
+ *
+ * @example
+ * // Returns "php:7.4"
+ * pkger('php', '7.4');
+ *
+ * @example
+ * // Returns "mysql"
+ * pkger('mysql', '');
  */
 const pkger = (pkg, version) => (!_.isEmpty(version)) ? `${pkg}:${version}` : pkg;
 
@@ -108,7 +143,7 @@ module.exports = {
     ],
     confSrc: path.resolve(__dirname, '..', 'config'),
     command: ['sh -c \'a2enmod rewrite && apache2-foreground\''],
-    composer_version: '2.2.22',
+    composer_version: true,
     phpServer: 'apache',
     defaultFiles: {
       _php: 'php.ini',
@@ -126,6 +161,7 @@ module.exports = {
       php: '/usr/local/etc/php/conf.d/zzz-lando-my-custom.ini',
       pool: '/usr/local/etc/php-fpm.d/zz-lando.conf',
     },
+    scriptsDir: path.resolve(__dirname, '..', 'scripts'),
     sources: [],
     suffix: '5',
     ssl: false,
@@ -137,12 +173,20 @@ module.exports = {
   parent: '_appserver',
   builder: (parent, config) => class LandoPhp extends parent {
     constructor(id, options = {}, factory) {
+      const debug = _.get(options, '_app._lando').log.debug;
+
+      // Merge the user config onto the default options
       options = parseConfig(_.merge({}, config, options));
+
+      // Get the semver of the PHP version, NULL if we cannot parse it
+      const phpSemver = semver.coerce(options.version);
+      phpSemver && debug('Parsed PHP semantic version: %s', phpSemver);
+
       // Mount our default php config
       options.volumes.push(`${options.confDest}/${options.defaultFiles._php}:${options.remoteFiles._php}`);
       options.volumes.push(`${options.confDest}/${options.defaultFiles.pool}:${options.remoteFiles.pool}`);
       // Shift on the docker entrypoint if this is a more recent version
-      if (options.version !== 'custom' && semver.gt(semver.coerce(options.version), '5.5.0')) {
+      if (phpSemver && semver.gt(phpSemver, '5.5.0')) {
         options.command.unshift('docker-php-entrypoint');
       }
 
@@ -168,22 +212,31 @@ module.exports = {
       };
       options.info = {via: options.via};
 
-      // Add our composer things to run step
-      if (!_.isEmpty(options.composer)) {
-        const commands =
-          require('../utils/get-install-commands')(options.composer, pkger, ['composer', 'global', 'require', '-n']);
-        addBuildStep(commands, options._app, options.name, 'build_internal');
+      // Determine the appropriate composer version to install if not specified
+      if (options.composer_version === true || options.composer_version === '') {
+        options.composer_version = getDefaultComposerVersion(phpSemver);
+      } else if (typeof options.composer_version === 'number') {
+        options.composer_version = options.composer_version.toString();
       }
 
-      // Add activate steps for xdebug
+      // Add build step to enable xdebug
       if (options.xdebug) {
         addBuildStep(['docker-php-ext-enable xdebug'], options._app, options.name, 'build_as_root_internal');
       }
 
-      // Install the desired composer version
+      // Add build step to install our Composer global packages
+      if (!_.isEmpty(options.composer)) {
+        const commands =
+          require('../utils/get-install-commands')(options.composer, pkger, ['composer', 'global', 'require', '-n']);
+        addBuildStep(commands, options._app, options.name, 'build_internal');
+      }
+
+      // Install the desired composer version as the first `build_internal` build step
       if (options.composer_version) {
-        const commands = [`/helpers/install-composer.sh ${options.composer_version}`];
-        addBuildStep(commands, options._app, options.name, 'build_internal', true);
+        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);
       }
 
       // Add in nginx if we need to

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

@@ -72,11 +72,7 @@ RUN \
     intl \
     gettext \
     pcntl \
-  && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.1 \
-  && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
-  && su -c "composer global require -n hirak/prestissimo" -s /bin/sh www-data \
   && apt-get -y clean \
   && apt-get -y autoclean \
   && apt-get -y autoremove \

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

@@ -72,12 +72,7 @@ RUN \
     intl \
     gettext \
     pcntl \
-  # Install composer
-  && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.1 \
-  && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
-  && su -c "composer global require -n hirak/prestissimo" -s /bin/sh www-data \
   && apt-get -y clean \
   && apt-get -y autoclean \
   && apt-get -y autoremove \

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

@@ -72,11 +72,7 @@ RUN \
     intl \
     gettext \
     pcntl \
-  && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.1 \
-  && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
-  && su -c "composer global require -n hirak/prestissimo" -s /bin/sh www-data \
   && apt-get -y clean \
   && apt-get -y autoclean \
   && apt-get -y autoremove \

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

@@ -72,11 +72,7 @@ RUN \
     intl \
     gettext \
     pcntl \
-  && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.1 \
-  && php -r "unlink('composer-setup.php');" \
   && chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \
-  && su -c "composer global require -n hirak/prestissimo" -s /bin/sh www-data \
   && apt-get -y clean \
   && apt-get -y autoclean \
   && apt-get -y autoremove \