From 4bd1855b9185040b5389753f5d7556fbeb3e5e68 Mon Sep 17 00:00:00 2001 From: Michael Stenta Date: Thu, 18 Mar 2021 11:51:53 -0400 Subject: [PATCH] Rename farm_install_modules to farm. --- .github/workflows/run-tests.yml | 2 +- farm.install | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 03a869037..cc54cef3e 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -66,4 +66,4 @@ jobs: # https://github.com/drupal/drupal/blob/74fbb0aabdee3e1a5da7b8e489a725afdc5824fd/core/tests/Drupal/Tests/Listeners/HtmlOutputPrinter.php run: docker-compose exec -u www-data -T test-runner paratest --functional --passthru='--printer=PHPUnit\\TextUI\\DefaultResultPrinter' --verbose=1 /opt/drupal/web/profiles/farm - name: Test Drush site install with all modules - run: docker-compose exec -u www-data -T www drush site-install --db-url=${{ matrix.DB_URL }} farm farm_install_modules.modules='all' + run: docker-compose exec -u www-data -T www drush site-install --db-url=${{ matrix.DB_URL }} farm farm.modules='all' diff --git a/farm.install b/farm.install index afef09442..f5861b95d 100644 --- a/farm.install +++ b/farm.install @@ -58,8 +58,8 @@ function farm_install_modules(array &$install_state) { // profile arguments. We assume this is an array of module machine names, // unless it is simply the string "all", which is a shortcut for installing // all modules. - if (!empty($install_state['forms']['farm_install_modules']['modules'])) { - $modules_arg = $install_state['forms']['farm_install_modules']['modules']; + if (!empty($install_state['forms']['farm']['modules'])) { + $modules_arg = $install_state['forms']['farm']['modules']; if ($modules_arg === 'all') { $all = farm_modules(); $modules = array_merge(array_keys($all['default']), array_keys($all['optional']));