Merge branch 'develop' into d9-upgrade

Drupalcz · Sep 23, 2022 · 9420a4b · 9420a4b
2 parents 4c6846b + 420456f
commit 9420a4b
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 7 deletions.
diff --git a/.lando.yml b/.lando.yml
@@ -10,8 +10,6 @@ services:
   appserver:
     type: php:7.4
     composer_version: 2
-    config:
-      php: .lando/php.ini
     overrides:
       # Pass SSH keys.
       volumes:

diff --git a/.lando/config/php/.gitkeep b/.lando/config/php/.gitkeep
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=7.2",
+        "php": ">=7.4",
         "acquia/memcache-settings": "*",
         "bower-asset/dropzone": "^5.1",
         "bower-asset/flexslider": "^2.6",
@@ -64,6 +64,7 @@
         "drupal/viewsreference": "^2.0",
         "drupal/youtube": "^1.0@beta",
         "drush/drush": "^10",
+        "oomphinc/composer-installers-extender": "^2.0",
         "pear/versioncontrol_git": "^0.5.0"
     },
     "replace": {
@@ -86,7 +87,8 @@
             "grasmash/drupal-security-warning": true,
             "acquia/blt": true,
             "drupal/core-composer-scaffold": true,
-            "drupal/core-project-message": true
+            "drupal/core-project-message": true,
+            "oomphinc/composer-installers-extender": true
         }
     },
     "repositories": {

diff --git a/composer.lock b/composer.lock
diff --git a/scripts/create-settings.sh b/scripts/create-settings.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 if [ ! -e docroot/sites/default/settings/local.settings.php ]; then
-  echo -e "<?php\n\n//This is for your customizations." > docroot/sites/default/settings/local.settings.php
+  echo "<?php\n\n// This is for your customizations." > docroot/sites/default/settings/local.settings.php
   echo Settings file was created.
 else
   echo Settings file already exists. Skipping creation.