From 4ecd3511e5b36e84ab935d936fc899f775317e50 Mon Sep 17 00:00:00 2001 From: Matthew Grasmick Date: Thu, 7 Sep 2017 10:56:38 -0400 Subject: [PATCH] Fixes #1915: Default site factory applications to PHP 5.6. (#1972) --- composer.required.json | 1 + src/Update/Updates.php | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/composer.required.json b/composer.required.json index ecccd1740..8e4dfc286 100644 --- a/composer.required.json +++ b/composer.required.json @@ -12,6 +12,7 @@ }, "require-dev": { "cweagans/composer-patches": "^1.6.0", + "oomphinc/composer-installers-extender": "^1.1", "behat/behat": "^3.0", "behat/mink": "~1.7", "behat/mink-selenium2-driver": "^1.3.1", diff --git a/src/Update/Updates.php b/src/Update/Updates.php index 22cf59b32..2ae196722 100644 --- a/src/Update/Updates.php +++ b/src/Update/Updates.php @@ -4,6 +4,7 @@ use Acquia\Blt\Annotations\Update; use Acquia\Blt\Robo\Common\ArrayManipulator; +use function file_exists; /** * Defines scripted updates for specific version deltas of BLT. @@ -378,14 +379,17 @@ public function update_8009003() { } } - unset($composer_json['require']['composer/installers']); - $composer_json['require']['oomphinc/composer-installers-extender'] = '^1.1'; - $composer_json['extra']['installer-types'][] = 'bower-asset'; $composer_json['extra']['installer-types'][] = 'npm-asset'; $composer_json['extra']['installer-paths']['docroot/libraries/{$name}'][] = 'type:bower-asset'; $composer_json['extra']['installer-paths']['docroot/libraries/{$name}'][] = 'type:npm-asset'; + $projectAcsfHooks = $this->updater->getRepoRoot() . '/factory-hooks'; + $acsf_inited = file_exists($projectAcsfHooks); + if ($acsf_inited) { + $composer_json['config']['platform']['php'] = '5.6'; + } + $this->updater->writeComposerJson($composer_json); } }