Skip to content

Commit 9420a4b

Browse files
committed
Merge branch 'develop' into d9-upgrade
2 parents 4c6846b + 420456f commit 9420a4b

5 files changed

Lines changed: 64 additions & 7 deletions

File tree

.lando.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ services:
1010
appserver:
1111
type: php:7.4
1212
composer_version: 2
13-
config:
14-
php: .lando/php.ini
1513
overrides:
1614
# Pass SSH keys.
1715
volumes:

.lando/config/php/.gitkeep

Whitespace-only changes.

composer.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"minimum-stability": "dev",
1313
"prefer-stable": true,
1414
"require": {
15-
"php": ">=7.2",
15+
"php": ">=7.4",
1616
"acquia/memcache-settings": "*",
1717
"bower-asset/dropzone": "^5.1",
1818
"bower-asset/flexslider": "^2.6",
@@ -64,6 +64,7 @@
6464
"drupal/viewsreference": "^2.0",
6565
"drupal/youtube": "^1.0@beta",
6666
"drush/drush": "^10",
67+
"oomphinc/composer-installers-extender": "^2.0",
6768
"pear/versioncontrol_git": "^0.5.0"
6869
},
6970
"replace": {
@@ -86,7 +87,8 @@
8687
"grasmash/drupal-security-warning": true,
8788
"acquia/blt": true,
8889
"drupal/core-composer-scaffold": true,
89-
"drupal/core-project-message": true
90+
"drupal/core-project-message": true,
91+
"oomphinc/composer-installers-extender": true
9092
}
9193
},
9294
"repositories": {

composer.lock

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

scripts/create-settings.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#! /bin/sh
22

33
if [ ! -e docroot/sites/default/settings/local.settings.php ]; then
4-
echo -e "<?php\n\n//This is for your customizations." > docroot/sites/default/settings/local.settings.php
4+
echo "<?php\n\n// This is for your customizations." > docroot/sites/default/settings/local.settings.php
55
echo Settings file was created.
66
else
77
echo Settings file already exists. Skipping creation.

0 commit comments

Comments
 (0)