diff --git a/.lando.yml b/.lando.yml index 3b6c8f40b..33385d19d 100644 --- 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 new file mode 100644 index 000000000..e69de29bb diff --git a/composer.json b/composer.json index 52e8242bb..22dc228ae 100644 --- 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 index 8fb91eaa1..a7119d2a0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "fdcc0cf991c281a5cdd94629ea616720", + "content-hash": "777a905ed872ba8260f75187b94e050d", "packages": [ { "name": "acquia/memcache-settings", @@ -7526,6 +7526,63 @@ }, "time": "2022-09-04T07:30:47+00:00" }, + { + "name": "oomphinc/composer-installers-extender", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/oomphinc/composer-installers-extender.git", + "reference": "cbf4b6f9a24153b785d09eee755b995ba87bd5f9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/oomphinc/composer-installers-extender/zipball/cbf4b6f9a24153b785d09eee755b995ba87bd5f9", + "reference": "cbf4b6f9a24153b785d09eee755b995ba87bd5f9", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.1 || ^2.0", + "composer/installers": "^1.0 || ^2.0", + "php": ">=7.1" + }, + "require-dev": { + "composer/composer": "^2.0", + "phpunit/phpunit": "^7.2", + "squizlabs/php_codesniffer": "^3.3" + }, + "type": "composer-plugin", + "extra": { + "class": "OomphInc\\ComposerInstallersExtender\\Plugin" + }, + "autoload": { + "psr-4": { + "OomphInc\\ComposerInstallersExtender\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Stephen Beemsterboer", + "email": "stephen@oomphinc.com", + "homepage": "https://github.com/balbuf" + }, + { + "name": "Nathan Dentzau", + "email": "nate@oomphinc.com", + "homepage": "http://oomph.is/ndentzau" + } + ], + "description": "Extend the composer/installers plugin to accept any arbitrary package type.", + "homepage": "http://www.oomphinc.com/", + "support": { + "issues": "https://github.com/oomphinc/composer-installers-extender/issues", + "source": "https://github.com/oomphinc/composer-installers-extender/tree/2.0.1" + }, + "time": "2021-12-15T12:32:42+00:00" + }, { "name": "pear/archive_tar", "version": "1.4.14", @@ -11448,7 +11505,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=7.2" + "php": ">=7.4" }, "platform-dev": [], "plugin-api-version": "2.3.0" diff --git a/scripts/create-settings.sh b/scripts/create-settings.sh index 2b280d990..f15bb630c 100755 --- 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 " docroot/sites/default/settings/local.settings.php + echo " docroot/sites/default/settings/local.settings.php echo Settings file was created. else echo Settings file already exists. Skipping creation.