@lando/drupal 1.11.0 → 1.12.0

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

@@ -2,8 +2,23 @@
 
 FROM php:8.4-apache-bookworm
 
+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 \
@@ -11,13 +26,18 @@ RUN \
     exiftool \
     git-core \
     gnupg2 \
-    openssl \
+    imagemagick \
+    mariadb-client \
+    mariadb-client-compat \
     postgresql-client-15 \
     pv \
     rsync \
     ssh \
     unzip \
-    wget
+    wget \
+    /tmp/sqlite3.deb \
+    /tmp/libsqlite3-0.deb \
+    /tmp/libsqlite3-dev.deb
 
 RUN \
   install-php-extensions @fix_letsencrypt \
@@ -28,6 +48,7 @@ RUN \
   && install-php-extensions exif \
   && install-php-extensions gd \
   && install-php-extensions gettext \
+  && install-php-extensions imagick \
   && install-php-extensions imap \
   && install-php-extensions intl \
   && install-php-extensions ldap \
@@ -42,10 +63,12 @@ RUN \
   && install-php-extensions pdo_pgsql \
   && install-php-extensions redis \
   && install-php-extensions soap \
-  # && install-php-extensions xdebug \
+  && install-php-extensions xhprof \
   && install-php-extensions zip
 
-RUN install-php-extensions @composer-2
+# Install xdebug but disable it by default
+RUN install-php-extensions xdebug \
+  && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
 
 RUN \
   chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \

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

@@ -2,8 +2,23 @@
 
 FROM php:8.4-fpm-bookworm
 
+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 \
@@ -12,13 +27,18 @@ RUN \
     exiftool \
     git-core \
     gnupg2 \
-    openssl \
+    imagemagick \
+    mariadb-client \
+    mariadb-client-compat \
     postgresql-client-15 \
     pv \
     rsync \
     ssh \
     unzip \
-    wget
+    wget \
+    /tmp/sqlite3.deb \
+    /tmp/libsqlite3-0.deb \
+    /tmp/libsqlite3-dev.deb
 
 RUN \
   install-php-extensions @fix_letsencrypt \
@@ -29,6 +49,7 @@ RUN \
   && install-php-extensions exif \
   && install-php-extensions gd \
   && install-php-extensions gettext \
+  && install-php-extensions imagick \
   && install-php-extensions imap \
   && install-php-extensions intl \
   && install-php-extensions ldap \
@@ -43,10 +64,12 @@ RUN \
   && install-php-extensions pdo_pgsql \
   && install-php-extensions redis \
   && install-php-extensions soap \
-  # && install-php-extensions xdebug \
+  && install-php-extensions xhprof \
   && install-php-extensions zip
 
-RUN install-php-extensions @composer-2
+# Install xdebug but disable it by default
+RUN install-php-extensions xdebug \
+  && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
 
 RUN \
   chsh -s /bin/bash www-data && mkdir -p /var/www/.composer && chown -R www-data:www-data /var/www \

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

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

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.6.3",
+  "version": "1.7.1",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/php",
@@ -66,9 +66,9 @@
     "semver"
   ],
   "dist": {
-    "integrity": "sha512-ob+QIOJAhWamdWvGKl8DNISxFOjsxXWGd7cl3M/afWThMRT+EH7iYyy2MuBzxAF7YbQ3FfxcoGSt3YvH1fRiNg==",
-    "shasum": "6f506661057bf7807c5f156264e9e2822c347fa6",
-    "filename": "lando-php-1.6.3.tgz",
-    "unpackedSize": 3119748
+    "integrity": "sha512-GF7bMuFPLQoPPb1ODyJ2aCLbASR6PLmM9TLJy+5v+2xViS6elMJLe20D51SsFB4K8vzo4o6PIO7WboE5PRn8cg==",
+    "shasum": "3e52a825d6d81d9117e9ce6243e28a1d16c43fea",
+    "filename": "lando-php-1.7.1.tgz",
+    "unpackedSize": 3128531
   }
 }

package/node_modules/@lando/php/scripts/install-composer.sh

@@ -16,6 +16,10 @@ elif [ "$VERSION" = '2-latest' ]; then
   php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --2
 elif [ "$VERSION" = '2' ]; then
   php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --2
+elif [ "$VERSION" = '2.2' ]; then
+  php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --2.2
+elif [ "$VERSION" = '2.2-latest' ]; then
+  php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --2.2
 elif [ "$VERSION" = 'preview' ]; then
   php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --preview
 elif [ "$VERSION" = 'snapshot' ]; then

package/node_modules/@lando/php/utils/add-build-step.js

@@ -3,9 +3,23 @@
 // Modules
 const _ = require('lodash');
 
-/*
- * Helper to get global deps
- * @TODO: this looks pretty testable? should services have libs?
+/**
+ * Helper function to add build steps to a service's configuration
+ *
+ * @param {string|string[]} steps - The build step(s) to add
+ * @param {Object} app - The Lando app object
+ * @param {string} name - The name of the service
+ * @param {string} [step='build_internal'] - The build step type to modify
+ * @param {boolean} [front=false] - Whether to add steps to front of array
+ * @return {void} - Modifies app config object directly
+ *
+ * @example
+ * // Add a build step to the end
+ * addBuildStep('npm install', app, 'web');
+ *
+ * @example
+ * // Add multiple build steps to the front
+ * addBuildStep(['composer install', 'npm install'], app, 'web', 'build_internal', true);
  */
 module.exports = (steps, app, name, step = 'build_internal', front = false) => {
   const current = _.get(app, `config.services.${name}.${step}`, []);

package/node_modules/@lando/php/utils/get-install-commands.js

@@ -3,9 +3,25 @@
 // Modules
 const _ = require('lodash');
 
-/*
- * Helper to get global deps
- * @TODO: this looks pretty testable? should services have libs?
+/**
+ * Helper function to generate installation commands for dependencies
+ *
+ * @param {Object} deps - Dependencies object with package names as keys and versions as values
+ * @param {Function} pkger - Function that generates package installation command
+ * @param {string[]} [prefix=[]] - Command prefix to prepend to each installation command
+ * @return {string[]} Array of formatted installation commands
+ *
+ * @example
+ * // Generate npm install commands
+ * const deps = { 'lodash': '^4.0.0', 'express': '4.17.1' };
+ * const npmInstall = (pkg, version) => ['npm', 'install', `${pkg}@${version}`];
+ * getInstallCommands(deps, npmInstall);
+ * // Returns: ['npm install lodash@^4.0.0', 'npm install express@4.17.1']
+ *
+ * @example
+ * // Generate commands with prefix
+ * getInstallCommands(deps, npmInstall, ['sudo', '-E']);
+ * // Returns: ['sudo -E npm install lodash@^4.0.0', 'sudo -E npm install express@4.17.1']
  */
 module.exports = (deps, pkger, prefix = []) => _(deps)
   .map((version, pkg) => _.flatten([prefix, pkger(pkg, version)]))

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lando/drupal",
   "description": "A Lando plugin that provides a tight integration with Drupal.",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/drupal",
@@ -45,8 +45,8 @@
   "dependencies": {
     "@lando/mariadb": "^1.6.3",
     "@lando/mssql": "^1.4.3",
-    "@lando/mysql": "^1.4.4",
-    "@lando/php": "^1.6.3",
+    "@lando/mysql": "^1.5.0",
+    "@lando/php": "^1.7.1",
     "@lando/postgres": "^1.4.4",
     "lodash": "^4.17.21",
     "semver": "^7.5.4"
@@ -75,9 +75,9 @@
     "semver"
   ],
   "dist": {
-    "integrity": "sha512-/hYlznGXww+cUTiL6NkMsIrUWWr9IIWCSs15SkCN2UHse7Hs+ceXzUMw9ogmKkKHOS1krIOAPNcU2yqIadqi6A==",
-    "shasum": "23ad56f23c283cd40f96e040cca5c4735b72e164",
-    "filename": "lando-drupal-1.11.0.tgz",
-    "unpackedSize": 10658041
+    "integrity": "sha512-iCBPPIwT980yuDdiFcF+QUD3o0QEOjCfm2EU49iJNMXRYXXRutNdDZx9XhDXLyIS7CAIY/QtJsnEZ9yTh18hFA==",
+    "shasum": "21bd6c197804104637f63b90f24827b222ff2cbe",
+    "filename": "lando-drupal-1.12.0.tgz",
+    "unpackedSize": 10667705
   }
 }