diff --git a/CHANGELOG.md b/CHANGELOG.md index 325c2a8..597772a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }}) +* Updated lando/php to v1.7.1. + ## v1.6.1 - [December 11, 2024](https://github.com/lando/acquia/releases/tag/v1.6.1) * Optimized for `midcore` diff --git a/builders/acquia-php.js b/builders/acquia-php.js index 9ab7802..d0e294c 100644 --- a/builders/acquia-php.js +++ b/builders/acquia-php.js @@ -1,31 +1,31 @@ 'use strict'; -const _ = require('lodash'); -const fs = require('fs'); const path = require('path'); const landoPhpPath = path.join(__dirname, '../node_modules/@lando/php'); const LandoPhp = require(`${landoPhpPath}/builders/php.js`); -const loadScripts = options => { - const lando = _.get(options, '_app._lando'); - // Move the script to the confDir and make executable. - if (fs.existsSync(path.join(landoPhpPath, 'scripts'))) { - const confDir = path.join(lando.config.userConfRoot, 'scripts'); - const dest = lando.utils.moveConfig(path.join(landoPhpPath, 'scripts'), confDir); - lando.utils.makeExecutable(fs.readdirSync(dest), dest); - lando.log.debug('automoved scripts from %s to %s and set to mode 755', - path.join(landoPhpPath, 'scripts'), confDir); - } -}; - -// Builder +/** + * Acquia PHP builder class that extends Lando PHP builder. + * Uses the bundled version of @lando/php plugin instead of user's version. + * + * @module acquia-php + */ module.exports = { name: 'acquia-php', parent: '_appserver', - builder: (parent, config) => class AcquiaPhp extends LandoPhp.builder(parent, LandoPhp.config) { + /** + * Builder function that returns the AcquiaPhp class + * @param {Object} parent - Parent builder class + * @return {Class} AcquiaPhp class extending LandoPhp builder + */ + builder: parent => class AcquiaPhp extends LandoPhp.builder(parent, LandoPhp.config) { + /** + * Create a new AcquiaPhp instance + * @param {string} id - Service id + * @param {Object} options - Service options + * @param {Object} factory - App factory instance + */ constructor(id, options = {}, factory) { - options = _.merge({}, config, options); - loadScripts(options); super(id, options, factory); } }, diff --git a/package-lock.json b/package-lock.json index b156aaa..38c7149 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,13 +6,13 @@ "packages": { "": { "name": "@lando/acquia", - "version": "1.5.3", + "version": "1.6.1", "license": "GPL-3.0", "dependencies": { "@lando/mailhog": "^1.2.3", "@lando/memcached": "^1.3.3", "@lando/mysql": "^1.4.4", - "@lando/php": "^1.6.3", + "@lando/php": "^1.7.1", "@lando/postgres": "^1.4.4", "axios": "^1.6.7", "js-yaml": "^4.1.0", @@ -1677,15 +1677,14 @@ "license": "MIT" }, "node_modules/@lando/php": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/@lando/php/-/php-1.6.3.tgz", - "integrity": "sha512-UIYJ5fh2hCTQDal17UxuT+8A+CvEEfnjNtrXObArsb1G4qXrJdwwF9G3boQ57L3aj8Y5eLSmgClBC1wMw4xOUw==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@lando/php/-/php-1.7.1.tgz", + "integrity": "sha512-yndqYlVy51k0GWVwbNas4MvY0mXTYyC9XJeUnyyx7kzX84j3TwnLt8/MYHXMaP6e/SsMp1nrb3Isi11NKYDrtg==", "bundleDependencies": [ "@lando/nginx", "lodash", "semver" ], - "license": "GPL-3.0", "dependencies": { "@lando/nginx": "^1.4.4", "lodash": "^4.17.21", diff --git a/package.json b/package.json index 14b3891..b0ae09c 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@lando/mailhog": "^1.2.3", "@lando/memcached": "^1.3.3", "@lando/mysql": "^1.4.4", - "@lando/php": "^1.6.3", + "@lando/php": "^1.7.1", "@lando/postgres": "^1.4.4", "axios": "^1.6.7", "js-yaml": "^4.1.0",