From c363f8aa11adde8ea663376bb06974d1fe09dfc1 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 25 Mar 2020 12:02:48 +0100 Subject: [PATCH] Rollbacking composer.json --- conf/composer.json | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/conf/composer.json b/conf/composer.json index 014c3df..e78f2a7 100644 --- a/conf/composer.json +++ b/conf/composer.json @@ -16,19 +16,20 @@ } ], "require": { - "php": ">=7.0.8", + "php": ">=5.6", "composer/installers": "^1.2", "cweagans/composer-patches": "^1.6.5", + "drupal-composer/drupal-scaffold": "^2.5", "drupal/console": "^1.0.2", - "drupal/core": "^8.8.0", - "drupal/core-composer-scaffold": "^8.8.0", - "drush/drush": "^9.7.1 | ^10.0.0", - "vlucas/phpdotenv": "^4.0", + "drupal/core": "^8.7.0", + "drush/drush": "^9.0.0", + "vlucas/phpdotenv": "^2.4", "webflo/drupal-finder": "^1.0.0", + "webmozart/path-util": "^2.3", "zaporylie/composer-drupal-optimizations": "^1.0" }, "require-dev": { - "drupal/core-dev": "^8.8.0" + "webflo/drupal-core-require-dev": "^8.7.0" }, "conflict": { "drupal/drupal": "*" @@ -63,18 +64,19 @@ "patchLevel": { "drupal/core": "-p2" }, - "drupal-scaffold": { - "locations": { - "web-root": "__APP__/" - } - }, "installer-paths": { "__APP__/core": ["type:drupal-core"], "__APP__/libraries/{$name}": ["type:drupal-library"], "__APP__/modules/contrib/{$name}": ["type:drupal-module"], "__APP__/profiles/contrib/{$name}": ["type:drupal-profile"], "__APP__/themes/contrib/{$name}": ["type:drupal-theme"], - "drush/Commands/contrib/{$name}": ["type:drupal-drush"] + "drush/Commands/{$name}": ["type:drupal-drush"] + }, + "drupal-scaffold": { + "initial": { + ".editorconfig": "../.editorconfig", + ".gitattributes": "../.gitattributes" + } } } }