Skip to content

Commit db4020a

Browse files
committed
update @lando/php to 1.7.1
1 parent 1100ef3 commit db4020a

File tree

4 files changed

+23
-22
lines changed

4 files changed

+23
-22
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
22

3-
* Updated to [@lando/php@1.7.0](https://github.com/lando/php/releases/tag/v1.7.0).
3+
* Updated to [@lando/php@1.7.1](https://github.com/lando/php/releases/tag/v1.7.1).
44
* Updated globally installed Drush to `v8.5.0`.
55

66
## v1.11.0 - [December 9, 2024](https://github.com/lando/drupal/releases/tag/v1.11.0)

builders/drupal-php.js

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
11
'use strict';
22

3-
const _ = require('lodash');
4-
const fs = require('fs');
53
const path = require('path');
64
const landoPhpPath = path.join(__dirname, '../node_modules/@lando/php');
75
const LandoPhp = require(`${landoPhpPath}/builders/php.js`);
86

9-
const loadScripts = options => {
10-
const lando = _.get(options, '_app._lando');
11-
// Move the script to the confDir and make executable.
12-
if (fs.existsSync(path.join(landoPhpPath, 'scripts'))) {
13-
const confDir = path.join(lando.config.userConfRoot, 'scripts');
14-
const dest = lando.utils.moveConfig(path.join(landoPhpPath, 'scripts'), confDir);
15-
lando.utils.makeExecutable(fs.readdirSync(dest), dest);
16-
lando.log.debug('automoved scripts from %s to %s and set to mode 755',
17-
path.join(landoPhpPath, 'scripts'), confDir);
18-
}
19-
};
20-
21-
// Builder
7+
/**
8+
* Drupal PHP builder class that extends Lando PHP builder.
9+
* Uses the bundled version of @lando/php plugin instead of user's version.
10+
*
11+
* @module drupal-php
12+
*/
2213
module.exports = {
2314
name: 'drupal-php',
2415
parent: '_appserver',
16+
/**
17+
* Builder function that returns the DrupalPhp class
18+
* @param {Object} parent - Parent builder class
19+
* @return {Class} DrupalPhp class extending LandoPhp builder
20+
*/
2521
builder: parent => class DrupalPhp extends LandoPhp.builder(parent, LandoPhp.config) {
22+
/**
23+
* Create a new DrupalPhp instance
24+
* @param {string} id - Service id
25+
* @param {Object} options - Service options
26+
* @param {Object} factory - App factory instance
27+
*/
2628
constructor(id, options = {}, factory) {
27-
loadScripts(options);
2829
options.nginxServiceType = 'drupal-nginx';
2930
super(id, options, factory);
3031
}

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"@lando/mariadb": "^1.6.3",
4747
"@lando/mssql": "^1.4.3",
4848
"@lando/mysql": "^1.4.4",
49-
"@lando/php": "^1.7.0",
49+
"@lando/php": "^1.7.1",
5050
"@lando/postgres": "^1.4.4",
5151
"lodash": "^4.17.21",
5252
"semver": "^7.5.4"

0 commit comments

Comments
 (0)