Switch to using .env.

Author: andrewbelcher

README.md

@@ -82,13 +82,10 @@ Use the `ddev core-version` command to set the core version environment variable
 ddev core-version ^11
 ```
 
-You can also do this manually:
+You can also do this manually by setting a version in `.ddev/.env`:
 
-In `.ddev/config.local.yaml` set the Drupal core version:
-
-```yaml
-web_environment:
-  - DRUPAL_CORE=^11
+```ini
+DRUPAL_CORE=^11
 ```
 
 Then run `ddev restart` and then `ddev poser` to update the Drupal core version.

commands/host/core-version

@@ -8,18 +8,15 @@
 
 set -eu -o pipefail
 
-# Handle when config.local.yaml doesn't exist, or has no web_environment key.
-if [[ ! -f .ddev/config.local.yaml || ! `grep '^web_environment:' .ddev/config.local.yaml` ]]; then
-  echo -e "web_environment:\n  - DRUPAL_CORE=$1" >> .ddev/config.local.yaml
-# Handle when we have a DRUPAL_CORE env var already.
-elif [[ `grep 'DRUPAL_CORE=' .ddev/config.local.yaml` ]]; then
-  sed -ri "s/^(\s+)- DRUPAL_CORE=.*/\1- DRUPAL_CORE=$1/" .ddev/config.local.yaml
-# Handle when we do not have a DRUPAL_CORE env var already.
-else
-  # Additionally handle if web_environment is set to an empty array.
-  sed -ri "s/web_environment:\s+\[\s*\]/web_environment:/" .ddev/config.local.yaml
-  sed -i "/web_environment:/a \ \ - DRUPAL_CORE=$1" .ddev/config.local.yaml
+# Handle default values.
+DRUPAL_CORE=${1:-default}
+if [ "$DRUPAL_CORE" == "default" ]; then
+  DRUPAL_CORE=""
 fi
 
+# Set/clear the env.
+ddev dotenv set .ddev/.env --drupal-core "${DRUPAL_CORE}"
+
+# Restart and rebuild.
 ddev restart
 ddev poser

commands/web/expand-composer-json

@@ -10,6 +10,9 @@
 
 set -eu -o pipefail
 
+# Set the default core version.
+export DRUPAL_CORE=${DRUPAL_CORE:-^11}
+
 export _WEB_ROOT=$DDEV_DOCROOT
 cd "$DDEV_COMPOSER_ROOT" || exit
 curl -OL https://git.drupalcode.org/project/gitlab_templates/-/raw/default-ref/scripts/expand_composer_json.php

config.contrib.yaml

@@ -5,8 +5,7 @@
 web_environment:
   # To change the Drupal core version, see the README:
   # https://github.com/ddev/ddev-drupal-contrib/blob/main/README.md#changing-the-drupal-core-version
-  - DRUPAL_CORE=^11
-  - # https://git.drupalcode.org/project/gitlab_templates/-/blob/1.9.6/scripts/expand_composer_json.php?ref_type=tags#L15
+  # https://git.drupalcode.org/project/gitlab_templates/-/blob/1.9.6/scripts/expand_composer_json.php?ref_type=tags#L15
   - IGNORE_PROJECT_DRUPAL_CORE_VERSION=1
   # To change the location of your project code, see the README:
   # https://github.com/ddev/ddev-drupal-contrib/blob/main/README.md#changing-the-symlink-location

tests/_common.bash

@@ -13,7 +13,7 @@ _common_setup() {
   cd ${TESTDIR}
   ddev config --project-name=${PROJNAME} --project-type=drupal --docroot=web --php-version=8.3 --corepack-enable
   if [ -n "$TEST_DRUPAL_CORE" ] && [ "$TEST_DRUPAL_CORE" != "default" ]; then
-    echo -e "web_environment:\n    - DRUPAL_CORE=^${TEST_DRUPAL_CORE}" > .ddev/config.~overrides.yaml
+    ddev dotenv set .ddev/.env --drupal-core "^${TEST_DRUPAL_CORE}"
   fi
   ddev add-on get ddev/ddev-selenium-standalone-chrome
   ddev add-on get ${DIR}

tests/core-version.bats

@@ -0,0 +1,41 @@
+load helpers/bats-support/load.bash
+load helpers/bats-assert/load.bash
+
+setup_file() {
+  if [ -n "$TEST_DRUPAL_CORE" ] && [ "$TEST_DRUPAL_CORE" != "default" ]; then
+    skip "TEST_DRUPAL_CORE=$TEST_DRUPAL_CORE not handled by this test suite" >&2
+  fi
+  load '_common.bash'
+  _common_setup
+  ddev start
+  _common_test_poser
+}
+
+teardown_file() {
+  load '_common.bash'
+  _common_teardown
+}
+
+@test "ddev core-version ^10" {
+  ddev core-version ^10
+  run -0 ddev exec 'drush st --fields=drupal-version --format=string | cut -d. -f1'
+  assert_output "10"
+}
+
+@test "ddev core-version ^11" {
+  ddev core-version ^11
+  run -0 ddev exec 'drush st --fields=drupal-version --format=string | cut -d. -f1'
+  assert_output "11"
+}
+
+@test "ddev core-version default" {
+  ddev core-version default
+  run -0 ddev exec 'drush st --fields=drupal-version --format=string | cut -d. -f1'
+  assert_output "11"
+}
+
+@test "ddev core-version <none>" {
+  ddev core-version
+  run -0 ddev exec 'drush st --fields=drupal-version --format=string | cut -d. -f1'
+  assert_output "11"
+}

tests/full.bats

@@ -38,12 +38,8 @@ teardown_file() {
 
 @test "drupal core version" {
   run -0 ddev exec 'drush st --fields=drupal-version --format=string | cut -d. -f1'
-  if [ -n "${TEST_DRUPAL_CORE}" ]; then
-    assert_output "${TEST_DRUPAL_CORE}"
-  else
-    DDEV_DRUPAL_CORE=$(ddev exec 'echo "${DRUPAL_CORE/^/}"')
-    assert_output "$DDEV_DRUPAL_CORE"
-  fi
+  # Default core version is ^11.
+  assert_output "${TEST_DRUPAL_CORE:-11}"
 }
 
 @test "node tools availability" {