From a659aef8a0394b742fa545b5c6572428bf595021 Mon Sep 17 00:00:00 2001 From: Sergii Pavlenko Date: Thu, 22 Jul 2021 14:35:10 +0300 Subject: [PATCH 01/11] EWPP-1165: Add support of 'enable_update_status_module' and 'enable_update_status_emails' site-install arguments. --- config/commands/drupal.yml | 2 ++ config/runner.yml | 2 ++ src/Commands/AbstractDrupalCommands.php | 8 ++++++- src/Tasks/Drush/Drush.php | 31 ++++++++++++++++++++++++- 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/config/commands/drupal.yml b/config/commands/drupal.yml index b70aa52b..f769e997 100644 --- a/config/commands/drupal.yml +++ b/config/commands/drupal.yml @@ -27,6 +27,8 @@ command: # @deprecated # Should only be used with Drupal 8.5 and lower. Use "existing-config". config-dir: ${drupal.site.config_dir} + enable-update-status-module: ${drupal.site.update_status_module} + enable-update-status-emails: ${drupal.site.update_status_emails} drush-setup: options: config-dir: ${drupal.root}/drush diff --git a/config/runner.yml b/config/runner.yml index a272a691..e0facda4 100644 --- a/config/runner.yml +++ b/config/runner.yml @@ -40,6 +40,8 @@ drupal: # Setting this to "false" will run "site-install" without the "--db-url" parameter. # This is useful if the database settings are already set in your settings.php file. generate_db_url: true + update_status_module: "true" + update_status_emails: "true" # Administrator account information. account: diff --git a/src/Commands/AbstractDrupalCommands.php b/src/Commands/AbstractDrupalCommands.php index ce95af1b..5ef76fa5 100644 --- a/src/Commands/AbstractDrupalCommands.php +++ b/src/Commands/AbstractDrupalCommands.php @@ -133,6 +133,8 @@ public function validateSiteInstall(CommandData $commandData) * @option config-dir Deprecated, use "existing-config" for Drupal 8.6 and higher. * @option existing-config Whether existing config should be imported during installation. * @option skip-permissions-setup Whether to skip making the settings file and folder writable during installation. + * @option enable-update-status-module Check for updates automatically. + * @option enable-update-status-emails Receive email notifications regarding updates. * * @aliases drupal:si,dsi * @@ -162,6 +164,8 @@ public function siteInstall(array $options = [ 'config-dir' => InputOption::VALUE_REQUIRED, 'existing-config' => false, 'skip-permissions-setup' => false, + 'enable-update-status-module' => true, + 'enable-update-status-emails' => true, ]) { if ($options['database-type']) { @@ -190,7 +194,9 @@ public function siteInstall(array $options = [ ->databasePort($options['database-port']) ->databaseName($options['database-name']) ->sitesSubdir($options['sites-subdir']) - ->siteProfile($options['site-profile']); + ->siteProfile($options['site-profile']) + ->setUpdateStatusModule($options['enable-update-status-module']) + ->setUpdateStatusEmails($options['enable-update-status-emails']); $task->setGenerateDbUrl($this->getConfig()->get('drupal.site.generate_db_url')); diff --git a/src/Tasks/Drush/Drush.php b/src/Tasks/Drush/Drush.php index 46cbc71f..d42cb42f 100644 --- a/src/Tasks/Drush/Drush.php +++ b/src/Tasks/Drush/Drush.php @@ -31,6 +31,8 @@ class Drush extends Exec protected $sitesSubdir = ''; protected $existingConfig = false; protected $generateDbUrl = true; + protected $updateStatusModule = true; + protected $updateStatusEmails = true; /** * Build Drush site install command. @@ -69,7 +71,10 @@ public function siteInstall() $this->option('existing-config'); } - return $this->arg('site-install')->arg($this->siteProfile); + return $this->arg('site-install') + ->arg($this->siteProfile) + ->rawArg("install_configure_form.enable_update_status_module=" . $this->updateStatusModule) + ->rawArg("install_configure_form.enable_update_status_emails=" . $this->updateStatusEmails); } /** @@ -287,4 +292,28 @@ public function setGenerateDbUrl($generateDbUrl) return $this; } + + /** + * @param bool $updateStatusModule + * + * @return Drush + */ + public function setUpdateStatusModule($updateStatusModule) + { + $this->updateStatusModule = $updateStatusModule; + + return $this; + } + + /** + * @param bool $updateStatusEmails + * + * @return Drush + */ + public function setUpdateStatusEmails($updateStatusEmails) + { + $this->updateStatusEmails = $updateStatusEmails; + + return $this; + } } From a869eee75c321704e4e0f75bce3bb04a43b266bf Mon Sep 17 00:00:00 2001 From: Sergii Pavlenko Date: Thu, 22 Jul 2021 16:21:27 +0300 Subject: [PATCH 02/11] EWPP-1165: Add test coverage for new installation arguments. --- tests/fixtures/simulation.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/fixtures/simulation.yml b/tests/fixtures/simulation.yml index 376cd4a9..91b83cd7 100644 --- a/tests/fixtures/simulation.yml +++ b/tests/fixtures/simulation.yml @@ -8,6 +8,7 @@ composer: '' contains: - "[Simulator] Running ./vendor/bin/drush -y --root=$(pwd)/build --site-name='Site name' --site-mail=info@example.org --locale=en --account-mail=admin@example.org --account-name=admin --account-pass=admin --sites-subdir=default --db-url='mysql://root:root@127.0.0.1:3306/drupal' site-install standard" + - "site-install standard install_configure_form.enable_update_status_module=true install_configure_form.enable_update_status_emails=true" - command: 'drupal:site-install --site-name="Test site"' configuration: @@ -374,3 +375,19 @@ composer: '' contains: - "./vendor/bin/drush --root=foo" + +- command: 'drupal:site-install --enable-update-status-module=false --enable-update-status-emails=false' + configuration: {} + composer: '' + contains: + - "standard install_configure_form.enable_update_status_module=false install_configure_form.enable_update_status_emails=false" + +- command: 'drupal:site-install' + configuration: + drupal: + site: + update_status_module: 'false' + update_status_emails: 'false' + composer: '' + contains: + - "standard install_configure_form.enable_update_status_module=false install_configure_form.enable_update_status_emails=false" From 6394d34fc99879b1ddac00231b2b422bf28bb281 Mon Sep 17 00:00:00 2001 From: Sergii Pavlenko Date: Tue, 27 Jul 2021 17:09:08 +0300 Subject: [PATCH 03/11] EWPP-1165: Adjust indentation for option name description and improve code comments. --- config/runner.yml | 4 +++ src/Commands/AbstractDrupalCommands.php | 40 ++++++++++++------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/config/runner.yml b/config/runner.yml index e0facda4..06109878 100644 --- a/config/runner.yml +++ b/config/runner.yml @@ -40,7 +40,11 @@ drupal: # Setting this to "false" will run "site-install" without the "--db-url" parameter. # This is useful if the database settings are already set in your settings.php file. generate_db_url: true + # By setting this to NULL, will disable the update status module option + # (install_configure_form.enable_update_status_module) during "site-install" execution. By default is TRUE. update_status_module: "true" + # By setting this to NULL, will disable the update status emails option + # (install_configure_form.enable_update_status_emails) during "site-install" execution. By default is TRUE. update_status_emails: "true" # Administrator account information. diff --git a/src/Commands/AbstractDrupalCommands.php b/src/Commands/AbstractDrupalCommands.php index 5ef76fa5..83a82fe1 100644 --- a/src/Commands/AbstractDrupalCommands.php +++ b/src/Commands/AbstractDrupalCommands.php @@ -113,26 +113,26 @@ public function validateSiteInstall(CommandData $commandData) * * @command drupal:site-install * - * @option root Drupal root. - * @option site-name Site name. - * @option site-mail Site mail. - * @option site-profile Installation profile - * @option site-update Whereas to enable the update module or not. - * @option site-locale Default site locale. - * @option account-name Admin account name. - * @option account-password Admin account password. - * @option account-mail Admin email. - * @option database-type Deprecated, use "database-scheme" - * @option database-scheme Database scheme. - * @option database-host Database host. - * @option database-port Database port. - * @option database-name Database name. - * @option database-user Database username. - * @option database-password Database password. - * @option sites-subdir Sites sub-directory. - * @option config-dir Deprecated, use "existing-config" for Drupal 8.6 and higher. - * @option existing-config Whether existing config should be imported during installation. - * @option skip-permissions-setup Whether to skip making the settings file and folder writable during installation. + * @option root Drupal root. + * @option site-name Site name. + * @option site-mail Site mail. + * @option site-profile Installation profile + * @option site-update Whereas to enable the update module or not. + * @option site-locale Default site locale. + * @option account-name Admin account name. + * @option account-password Admin account password. + * @option account-mail Admin email. + * @option database-type Deprecated, use "database-scheme" + * @option database-scheme Database scheme. + * @option database-host Database host. + * @option database-port Database port. + * @option database-name Database name. + * @option database-user Database username. + * @option database-password Database password. + * @option sites-subdir Sites sub-directory. + * @option config-dir Deprecated, use "existing-config" for Drupal 8.6 and higher. + * @option existing-config Whether existing config should be imported during installation. + * @option skip-permissions-setup Whether to skip making the settings file and folder writable during installation. * @option enable-update-status-module Check for updates automatically. * @option enable-update-status-emails Receive email notifications regarding updates. * From e5eb1f16ecd5b801f46f5a58ed84e9c129457b71 Mon Sep 17 00:00:00 2001 From: Sergii Pavlenko Date: Mon, 2 Aug 2021 15:53:26 +0300 Subject: [PATCH 04/11] EWPP-1165: Simplify passing values for new parameter of site-install command. --- config/runner.yml | 8 +++--- src/Commands/AbstractDrupalCommands.php | 4 +++ tests/fixtures/simulation.yml | 38 +++++++++++++++++++++++-- 3 files changed, 43 insertions(+), 7 deletions(-) diff --git a/config/runner.yml b/config/runner.yml index 06109878..3f20da7d 100644 --- a/config/runner.yml +++ b/config/runner.yml @@ -40,11 +40,11 @@ drupal: # Setting this to "false" will run "site-install" without the "--db-url" parameter. # This is useful if the database settings are already set in your settings.php file. generate_db_url: true - # By setting this to NULL, will disable the update status module option - # (install_configure_form.enable_update_status_module) during "site-install" execution. By default is TRUE. + # By setting this to FALSE, will disable the update status module option + # (install_configure_form.enable_update_status_module) during "site-install" execution. By default, is TRUE. update_status_module: "true" - # By setting this to NULL, will disable the update status emails option - # (install_configure_form.enable_update_status_emails) during "site-install" execution. By default is TRUE. + # By setting this to FALSE, will disable the update status emails option + # (install_configure_form.enable_update_status_emails) during "site-install" execution. By default, is TRUE. update_status_emails: "true" # Administrator account information. diff --git a/src/Commands/AbstractDrupalCommands.php b/src/Commands/AbstractDrupalCommands.php index 83a82fe1..a4500254 100644 --- a/src/Commands/AbstractDrupalCommands.php +++ b/src/Commands/AbstractDrupalCommands.php @@ -178,6 +178,10 @@ public function siteInstall(array $options = [ $options['existing-config'] = true; } + // Adapt values for the installation configuration form parameters. + $options['enable-update-status-module'] = filter_var($options['enable-update-status-module'], FILTER_VALIDATE_BOOLEAN) === false ? 'NULL' : $options['enable-update-status-module']; + $options['enable-update-status-emails'] = filter_var($options['enable-update-status-emails'], FILTER_VALIDATE_BOOLEAN) === false ? 'NULL' : $options['enable-update-status-emails']; + $drush = $this->getConfig()->get('runner.bin_dir') . '/drush'; $task = $this->taskDrush($drush) ->root($options['root']) diff --git a/tests/fixtures/simulation.yml b/tests/fixtures/simulation.yml index 91b83cd7..00b2b0d5 100644 --- a/tests/fixtures/simulation.yml +++ b/tests/fixtures/simulation.yml @@ -380,14 +380,46 @@ configuration: {} composer: '' contains: - - "standard install_configure_form.enable_update_status_module=false install_configure_form.enable_update_status_emails=false" + - "standard install_configure_form.enable_update_status_module=NULL install_configure_form.enable_update_status_emails=NULL" + +- command: 'drupal:site-install --enable-update-status-module= --enable-update-status-emails=' + configuration: {} + composer: '' + contains: + - "standard install_configure_form.enable_update_status_module=NULL install_configure_form.enable_update_status_emails=NULL" + +- command: 'drupal:site-install --enable-update-status-module=true --enable-update-status-emails=true' + configuration: {} + composer: '' + contains: + - "standard install_configure_form.enable_update_status_module=true install_configure_form.enable_update_status_emails=true" + +- command: 'drupal:site-install' + configuration: + drupal: + site: + update_status_module: false + update_status_emails: ~ + composer: '' + contains: + - "standard install_configure_form.enable_update_status_module=NULL install_configure_form.enable_update_status_emails=NULL" - command: 'drupal:site-install' configuration: drupal: site: update_status_module: 'false' - update_status_emails: 'false' + update_status_emails: '' + composer: '' + contains: + - "standard install_configure_form.enable_update_status_module=NULL install_configure_form.enable_update_status_emails=NULL" + +- command: 'drupal:site-install' + configuration: + drupal: + site: + update_status_module: "false" + update_status_emails: "" composer: '' contains: - - "standard install_configure_form.enable_update_status_module=false install_configure_form.enable_update_status_emails=false" + - "standard install_configure_form.enable_update_status_module=NULL install_configure_form.enable_update_status_emails=NULL" From f8f2951393777fe51be92fee550c327496265968 Mon Sep 17 00:00:00 2001 From: Sergii Pavlenko Date: Tue, 26 Oct 2021 12:15:14 +0300 Subject: [PATCH 05/11] EWPP-1165: Reorganise code for adapting drush site-install arguments. --- config/commands/drupal.yml | 4 ++-- config/runner.yml | 11 +++++------ src/Commands/AbstractDrupalCommands.php | 10 +++++----- src/Tasks/Drush/Drush.php | 17 +++++++++-------- tests/fixtures/simulation.yml | 6 +++--- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/config/commands/drupal.yml b/config/commands/drupal.yml index f769e997..89ec8742 100644 --- a/config/commands/drupal.yml +++ b/config/commands/drupal.yml @@ -27,8 +27,8 @@ command: # @deprecated # Should only be used with Drupal 8.5 and lower. Use "existing-config". config-dir: ${drupal.site.config_dir} - enable-update-status-module: ${drupal.site.update_status_module} - enable-update-status-emails: ${drupal.site.update_status_emails} + enable-update-status-module: ${drupal.install.update_status_module} + enable-update-status-emails: ${drupal.install.update_status_emails} drush-setup: options: config-dir: ${drupal.root}/drush diff --git a/config/runner.yml b/config/runner.yml index 3f20da7d..0bc6073c 100644 --- a/config/runner.yml +++ b/config/runner.yml @@ -40,12 +40,11 @@ drupal: # Setting this to "false" will run "site-install" without the "--db-url" parameter. # This is useful if the database settings are already set in your settings.php file. generate_db_url: true - # By setting this to FALSE, will disable the update status module option - # (install_configure_form.enable_update_status_module) during "site-install" execution. By default, is TRUE. - update_status_module: "true" - # By setting this to FALSE, will disable the update status emails option - # (install_configure_form.enable_update_status_emails) during "site-install" execution. By default, is TRUE. - update_status_emails: "true" + install: + # Setting this to "false" will tell the "site-install" command to not enable the update status module. + update_status_module: true + # Setting this to "false" will tell the "site-install" command to disable email notifications about updates. + update_status_emails: true # Administrator account information. account: diff --git a/src/Commands/AbstractDrupalCommands.php b/src/Commands/AbstractDrupalCommands.php index a4500254..77982585 100644 --- a/src/Commands/AbstractDrupalCommands.php +++ b/src/Commands/AbstractDrupalCommands.php @@ -178,9 +178,9 @@ public function siteInstall(array $options = [ $options['existing-config'] = true; } - // Adapt values for the installation configuration form parameters. - $options['enable-update-status-module'] = filter_var($options['enable-update-status-module'], FILTER_VALIDATE_BOOLEAN) === false ? 'NULL' : $options['enable-update-status-module']; - $options['enable-update-status-emails'] = filter_var($options['enable-update-status-emails'], FILTER_VALIDATE_BOOLEAN) === false ? 'NULL' : $options['enable-update-status-emails']; + // Pass value as boolean type only. + $options['enable-update-status-module'] = filter_var($options['enable-update-status-module'], FILTER_VALIDATE_BOOLEAN); + $options['enable-update-status-emails'] = filter_var($options['enable-update-status-emails'], FILTER_VALIDATE_BOOLEAN); $drush = $this->getConfig()->get('runner.bin_dir') . '/drush'; $task = $this->taskDrush($drush) @@ -199,8 +199,8 @@ public function siteInstall(array $options = [ ->databaseName($options['database-name']) ->sitesSubdir($options['sites-subdir']) ->siteProfile($options['site-profile']) - ->setUpdateStatusModule($options['enable-update-status-module']) - ->setUpdateStatusEmails($options['enable-update-status-emails']); + ->enableUpdateStatusModuleOnInstall($options['enable-update-status-module']) + ->enableUpdateStatusEmailsOnInstall($options['enable-update-status-emails']); $task->setGenerateDbUrl($this->getConfig()->get('drupal.site.generate_db_url')); diff --git a/src/Tasks/Drush/Drush.php b/src/Tasks/Drush/Drush.php index d42cb42f..55cbe4e0 100644 --- a/src/Tasks/Drush/Drush.php +++ b/src/Tasks/Drush/Drush.php @@ -73,8 +73,9 @@ public function siteInstall() return $this->arg('site-install') ->arg($this->siteProfile) - ->rawArg("install_configure_form.enable_update_status_module=" . $this->updateStatusModule) - ->rawArg("install_configure_form.enable_update_status_emails=" . $this->updateStatusEmails); + // Adapt values for the installation configuration form parameters. + ->rawArg('install_configure_form.enable_update_status_module=' . ($this->updateStatusModule ? 'true' : 'NULL')) + ->rawArg('install_configure_form.enable_update_status_emails=' . ($this->updateStatusEmails ? 'true' : 'NULL')); } /** @@ -294,25 +295,25 @@ public function setGenerateDbUrl($generateDbUrl) } /** - * @param bool $updateStatusModule + * @param bool $enable * * @return Drush */ - public function setUpdateStatusModule($updateStatusModule) + public function enableUpdateStatusModuleOnInstall($enable) { - $this->updateStatusModule = $updateStatusModule; + $this->updateStatusModule = $enable; return $this; } /** - * @param bool $updateStatusEmails + * @param bool $enable * * @return Drush */ - public function setUpdateStatusEmails($updateStatusEmails) + public function enableUpdateStatusEmailsOnInstall($enable) { - $this->updateStatusEmails = $updateStatusEmails; + $this->updateStatusEmails = $enable; return $this; } diff --git a/tests/fixtures/simulation.yml b/tests/fixtures/simulation.yml index 00b2b0d5..1452129a 100644 --- a/tests/fixtures/simulation.yml +++ b/tests/fixtures/simulation.yml @@ -397,7 +397,7 @@ - command: 'drupal:site-install' configuration: drupal: - site: + install: update_status_module: false update_status_emails: ~ composer: '' @@ -407,7 +407,7 @@ - command: 'drupal:site-install' configuration: drupal: - site: + install: update_status_module: 'false' update_status_emails: '' composer: '' @@ -417,7 +417,7 @@ - command: 'drupal:site-install' configuration: drupal: - site: + install: update_status_module: "false" update_status_emails: "" composer: '' From c7722c73f670ef4eba449bc31d83ad61b19231cb Mon Sep 17 00:00:00 2001 From: Sergii Pavlenko Date: Thu, 2 Dec 2021 20:10:20 +0200 Subject: [PATCH 06/11] EWPP-1165: Add missed test case in fixture. --- tests/fixtures/simulation.yml | 60 +++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/tests/fixtures/simulation.yml b/tests/fixtures/simulation.yml index 1452129a..531b69fb 100644 --- a/tests/fixtures/simulation.yml +++ b/tests/fixtures/simulation.yml @@ -423,3 +423,63 @@ composer: '' contains: - "standard install_configure_form.enable_update_status_module=NULL install_configure_form.enable_update_status_emails=NULL" + +- command: 'drupal:site-install' + configuration: + drupal: + install: + update_status_module: true + update_status_emails: ~ + composer: '' + contains: + - "standard install_configure_form.enable_update_status_module=true install_configure_form.enable_update_status_emails=NULL" + +- command: 'drupal:site-install' + configuration: + drupal: + install: + update_status_module: 'true' + update_status_emails: '' + composer: '' + contains: + - "standard install_configure_form.enable_update_status_module=true install_configure_form.enable_update_status_emails=NULL" + +- command: 'drupal:site-install' + configuration: + drupal: + install: + update_status_module: "true" + update_status_emails: "" + composer: '' + contains: + - "standard install_configure_form.enable_update_status_module=true install_configure_form.enable_update_status_emails=NULL" + +- command: 'drupal:site-install' + configuration: + drupal: + install: + update_status_module: ~ + update_status_emails: true + composer: '' + contains: + - "standard install_configure_form.enable_update_status_module=NULL install_configure_form.enable_update_status_emails=true" + +- command: 'drupal:site-install' + configuration: + drupal: + install: + update_status_module: '' + update_status_emails: 'true' + composer: '' + contains: + - "standard install_configure_form.enable_update_status_module=NULL install_configure_form.enable_update_status_emails=true" + +- command: 'drupal:site-install' + configuration: + drupal: + install: + update_status_module: "" + update_status_emails: "true" + composer: '' + contains: + - "standard install_configure_form.enable_update_status_module=NULL install_configure_form.enable_update_status_emails=true" From 2fecfecc758ee9095d05d26091d589bc5801429f Mon Sep 17 00:00:00 2001 From: Imanol Eguskiza Date: Fri, 7 Oct 2022 16:24:02 +0200 Subject: [PATCH 07/11] EWPP-1165: Fix expander version to ensure backwards compatibility. --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c0f5e263..0f119032 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,8 @@ "consolidation/robo": "^3.0", "gitonomy/gitlib": "^1.0", "jakeasmith/http_build_url": "^1.0.1", - "nuvoleweb/robo-config": "^2.0" + "nuvoleweb/robo-config": "^2.0", + "grasmash/expander": "^1" }, "require-dev": { "openeuropa/code-review": "^2.0", @@ -34,6 +35,9 @@ "composer-exit-on-patch-failure": true }, "bin": ["bin/run"], + "_readme": [ + "We need to use the 1.x version of grasmash/expander so that null values are treated the same way they were treated until release 2.0.0-alpha2 ." + ], "config": { "sort-packages": true, "allow-plugins": { From f32d19545ed5bc49a68d8ee3c4dd58bcb8feb098 Mon Sep 17 00:00:00 2001 From: Antonio De Marco Date: Tue, 20 Jun 2023 16:32:07 +0200 Subject: [PATCH 08/11] EWPP-1165: Fix test by changing default values to true, when empty config parameter is passed. --- tests/fixtures/simulation.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/fixtures/simulation.yml b/tests/fixtures/simulation.yml index 531b69fb..ad612bd4 100644 --- a/tests/fixtures/simulation.yml +++ b/tests/fixtures/simulation.yml @@ -402,7 +402,7 @@ update_status_emails: ~ composer: '' contains: - - "standard install_configure_form.enable_update_status_module=NULL install_configure_form.enable_update_status_emails=NULL" + - "standard install_configure_form.enable_update_status_module=NULL install_configure_form.enable_update_status_emails=true" - command: 'drupal:site-install' configuration: @@ -432,7 +432,7 @@ update_status_emails: ~ composer: '' contains: - - "standard install_configure_form.enable_update_status_module=true install_configure_form.enable_update_status_emails=NULL" + - "standard install_configure_form.enable_update_status_module=true install_configure_form.enable_update_status_emails=true" - command: 'drupal:site-install' configuration: @@ -462,7 +462,7 @@ update_status_emails: true composer: '' contains: - - "standard install_configure_form.enable_update_status_module=NULL install_configure_form.enable_update_status_emails=true" + - "standard install_configure_form.enable_update_status_module=true install_configure_form.enable_update_status_emails=true" - command: 'drupal:site-install' configuration: From 1e99677ad454666076b89abcda71c6058f8ad3e0 Mon Sep 17 00:00:00 2001 From: Antonio De Marco Date: Tue, 20 Jun 2023 16:36:42 +0200 Subject: [PATCH 09/11] EWPP-1165: Let grasmash/expander free to float. --- composer.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 63ca42bf..e8bae9d5 100644 --- a/composer.json +++ b/composer.json @@ -11,8 +11,7 @@ "consolidation/robo": "^4.0", "gitonomy/gitlib": "^1.0", "jakeasmith/http_build_url": "^1.0.1", - "nuvoleweb/robo-config": "^3.0.0", - "grasmash/expander": "^1" + "nuvoleweb/robo-config": "^3.0.0" }, "require-dev": { "openeuropa/code-review": "2.x-dev", @@ -35,9 +34,6 @@ "composer-exit-on-patch-failure": true }, "bin": ["bin/run"], - "_readme": [ - "We need to use the 1.x version of grasmash/expander so that null values are treated the same way they were treated until release 2.0.0-alpha2 ." - ], "config": { "sort-packages": true, "allow-plugins": { From 123dbcf62422486200563c5f19127d78cd524bf5 Mon Sep 17 00:00:00 2001 From: Antonio De Marco Date: Tue, 20 Jun 2023 16:41:18 +0200 Subject: [PATCH 10/11] EWPP-1165: Make sure we use latest version of expander. --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e8bae9d5..3f190f61 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,8 @@ "consolidation/robo": "^4.0", "gitonomy/gitlib": "^1.0", "jakeasmith/http_build_url": "^1.0.1", - "nuvoleweb/robo-config": "^3.0.0" + "nuvoleweb/robo-config": "^3.0.0", + "grasmash/expander": ">=3" }, "require-dev": { "openeuropa/code-review": "2.x-dev", @@ -34,6 +35,9 @@ "composer-exit-on-patch-failure": true }, "bin": ["bin/run"], + "_readme": [ + "We need to use the 1.x version of grasmash/expander so that null values are treated the same way they were treated until release 2.0.0-alpha2 ." + ], "config": { "sort-packages": true, "allow-plugins": { From f03f341b87fe052bc89f39d584c396ad8b75b107 Mon Sep 17 00:00:00 2001 From: Antonio De Marco Date: Wed, 21 Jun 2023 13:38:30 +0200 Subject: [PATCH 11/11] EWPP-1165: Remove _readme section in composer.json. --- composer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/composer.json b/composer.json index 3f190f61..6a5ec702 100644 --- a/composer.json +++ b/composer.json @@ -35,9 +35,6 @@ "composer-exit-on-patch-failure": true }, "bin": ["bin/run"], - "_readme": [ - "We need to use the 1.x version of grasmash/expander so that null values are treated the same way they were treated until release 2.0.0-alpha2 ." - ], "config": { "sort-packages": true, "allow-plugins": {