Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make config sources (drupal.drush, drupal.settings) configurable #158

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make config sources (drupal.drush, drupal.settings) configurable #158

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4215ce
Make config sources (drupal.drush, drupal.settings) configurable
Nov 12, 2021
0bca6f4
Fix option default
Nov 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions src/Commands/AbstractDrupalCommands.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,11 @@ public function sitePreInstall(array $options = [
*
* @command drupal:drush-setup
*
* @option root Drupal root.
* @option config-dir Directory where to store Drush 9 configuration file.
* @option root Drupal root.
* @option config-dir Directory where to store Drush 9 configuration file.
* @option config-source Config path of drush settings to write.
* @default config-source drupal.drush
* @option fail-on-missing Fail on missing config-source.
*
* @param array $options
*
Expand All @@ -310,14 +313,21 @@ public function sitePreInstall(array $options = [
public function drushSetup(array $options = [
'root' => InputOption::VALUE_REQUIRED,
'config-dir' => InputOption::VALUE_REQUIRED,
'config-source' => InputOption::VALUE_REQUIRED,
'fail-on-missing' => true,
])
{
$config = $this->getConfig();
$yaml = Yaml::dump($config->get('drupal.drush'));
$config_source = $options['config-source'];
if (!$config->has($config_source) && !$options['fail-on-missing']) {
// Add missing config so taskWriteConfiguration won't throw.
$config->set($config_source, []);
}
$yaml = Yaml::dump($config->get($config_source));

return $this->collectionBuilder()->addTaskList([
$this->taskWriteConfiguration($options['root'] . '/sites/default/drushrc.php', $config)
->setConfigKey('drupal.drush'),
->setConfigKey($config_source),
$this->taskWriteToFile($options['config-dir'] . '/drush.yml')->text($yaml),
]);
}
Expand Down Expand Up @@ -348,6 +358,9 @@ public function drushSetup(array $options = [
* @option root Drupal root.
* @option sites-subdir Drupal site subdirectory.
* @option settings-override-file Drupal site settings override filename.
* @option config-source Config path of contents to write.
* @default config-source drupal.settings
* @option fail-on-missing Fail on missing config-source.
* @option force Drupal force generation of a new settings.php.
* @option skip-permissions-setup Drupal skip permissions setup.
*
Expand All @@ -359,6 +372,8 @@ public function settingsSetup(array $options = [
'root' => InputOption::VALUE_REQUIRED,
'sites-subdir' => InputOption::VALUE_REQUIRED,
'settings-override-file' => InputOption::VALUE_REQUIRED,
'config-source' => InputOption::VALUE_REQUIRED,
'fail-on-missing' => true,
'force' => false,
'skip-permissions-setup' => false,
])
Expand All @@ -381,10 +396,16 @@ public function settingsSetup(array $options = [
$collection[] = $this->taskFilesystemStack()->copy($settings_default_path, $settings_path, true);
}

$config = $this->getConfig();
$config_source = $options['config-source'];
if (!$config->has($config_source) && !$options['fail-on-missing']) {
// Add missing config so taskWriteConfiguration won't throw.
$config->set($config_source, []);
}
$collection[] = $this->taskWriteConfiguration(
$settings_override_path,
$this->getConfig()
)->setConfigKey('drupal.settings');
)->setConfigKey($config_source);

if (!$options['skip-permissions-setup']) {
$collection[] = $this->permissionsSetup($options);
Expand Down