From ff884b7896f6f2a6800cc72906f6329f9b156a47 Mon Sep 17 00:00:00 2001 From: Fredrik Lassen Date: Tue, 3 Mar 2026 22:42:34 +0100 Subject: [PATCH] #35 - cleanup and update README --- README.md | 4 +- commands/host/1x-granite | 8 ---- commands/host/1x-theme-debug | 93 ------------------------------------ commands/host/1x-twig-debug | 62 ------------------------ 4 files changed, 1 insertion(+), 166 deletions(-) delete mode 100755 commands/host/1x-granite delete mode 100755 commands/host/1x-theme-debug delete mode 100755 commands/host/1x-twig-debug diff --git a/README.md b/README.md index 2c84576..af92c75 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,8 @@ or if you use a current `ddev`: Commands running on the host: - `ddev 1x-playwright` - provides a convenience wrapper open the UI/reports directly in the browser (determining the right hostnames and ports). - `ddev 1x-playwright-install` - installs `lullabot/ddev-playwright` and configures it minimally -- `ddev 1x-granite` - runs `build.sh` in the volcano theme (@todo: should probably be moved to web-container) - `ddev 1x-start` - test script wrapping `ddev start`, `ddev auth ssh` and symlinking `.gitconfig` to ensure git commit are nice. -- `ddev 1x-theme-debug`: wraps 1X's internal `theme-debug` helper -- `ddev 1x-twig-debug`: wraps 1X's internal `twig-debug` helper +- `ddev 1x-token-setup` - test script wrapping setting up tokens for 1X internal tools and services. Commands running in the web-container: - `ddev 1x-phpcs` - run phpcs *within* the webcontainer to ensure correct PHP version. diff --git a/commands/host/1x-granite b/commands/host/1x-granite deleted file mode 100755 index b7e101b..0000000 --- a/commands/host/1x-granite +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -## #ddev-generated -## Description: Build granite -## Usage: granite 1x-granite -## Example: "ddev 1x-granite [dev]" - -cd "${DDEV_APPROOT}/${DDEV_DOCROOT}/themes/custom/granite" -./build.sh "$@" diff --git a/commands/host/1x-theme-debug b/commands/host/1x-theme-debug deleted file mode 100755 index 38671e7..0000000 --- a/commands/host/1x-theme-debug +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/env bash -## #ddev-generated -## Description: manage php config options -## Usage: 1x-theme-debug -## Example: "ddev 1x-theme-debug (enable|disable)" - -source "${BASH_SOURCE%/*}/1x-lib.sh" - -settings_dir="${DDEV_APPROOT}/${DDEV_DOCROOT}/sites/default" -settings_local="settings.local.php" -debug_services="services.theme_debug.yml" -debug_settings="settings.theme-debug.php" - -read -r -d '' debug_services_yml << 'EOF_SERVICES' -parameters: - session.storage.options: - cookie_lifetime: 0 - http.response.debug_cacheability_headers: true - twig.config: - debug: true - auto_reload: true - cache: false -services: - cache.backend.null: - class: Drupal\Core\Cache\NullBackendFactory -EOF_SERVICES - -read -r -d '' debug_settings_php << 'EOF_SETTINGS' - "${settings_dir}/${debug_services}" - - echo "Creating ${debug_settings}" - echo "${debug_settings_php}" > "${settings_dir}/${debug_settings}" - - # Make sure the file ends with a new line - sed_compat -i '$a\' "${settings_dir}/${settings_local}" - echo -e "${debug_config_php}" >> "${settings_dir}/${settings_local}" -} - -disable_debug() { - echo "Deleting ${debug_services}" - rm -f "${settings_dir}/${debug_services}" || true - - echo "Deleting ${debug_settings}" - rm -f "${settings_dir}/${debug_settings}" || true -} - -preflight - -case "$1" in - "enable") - enable_debug - ;; - "disable") - disable_debug - ;; - *) - if [ -e "${settings_dir}/${debug_services}" ]; then - disable_debug - else - enable_debug - fi - ;; -esac diff --git a/commands/host/1x-twig-debug b/commands/host/1x-twig-debug deleted file mode 100755 index f4a2151..0000000 --- a/commands/host/1x-twig-debug +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env bash -## #ddev-generated -## Description: Enables or disables Twig debugging for Drupal 10 installations -## Usage: 1x-twig-debug -## Example: "ddev 1x-twig-debug (enable|disable) @self" - -# If no alias is provided it defaults to @self -drush_alias="${2:-@self}" - -# Get the drupal version -drupal_version=$(ddev drush $drush_alias status --field=drupal-version 2>/dev/null | tr -d '\r') -echo "Drupal version detected: $drupal_version" - -# Function to compare the drupal version -version_ge() { - printf '%s\n%s' "$1" "$2" | sort -C -V -} - -# Choose the appropriate commands to enable twig debug based on the drupal version -if version_ge "10.3.0" "$drupal_version"; then - # For Drupal 10.3.0+ - enable_cmd="ddev drush $drush_alias php:eval \"\\Drupal::keyValue('development_settings')->setMultiple(['disable_rendered_output_cache_bins' => TRUE, 'twig_debug' => TRUE, 'twig_cache_disable' => TRUE]);\" && ddev drush $drush_alias cache:rebuild" - disable_cmd="ddev drush $drush_alias php:eval \"\\Drupal::keyValue('development_settings')->setMultiple(['disable_rendered_output_cache_bins' => FALSE, 'twig_debug' => FALSE, 'twig_cache_disable' => FALSE]);\" && ddev drush $drush_alias cache:rebuild" - get_state_cmd="ddev drush $drush_alias php:eval \"echo (int) \\Drupal::keyValue('development_settings')->get('twig_debug', FALSE);\"" -else - # For Drupal versions before 10.3.0 - enable_cmd="ddev drush $drush_alias state:set twig_debug 1 --input-format=integer && ddev drush $drush_alias state:set twig_cache_disable 1 --input-format=integer && ddev drush $drush_alias state:set disable_rendered_output_cache_bins 1 --input-format=integer && ddev drush $drush_alias cache:rebuild" - disable_cmd="ddev drush $drush_alias state:set twig_debug 0 --input-format=integer && ddev drush $drush_alias state:set twig_cache_disable 0 --input-format=integer && ddev drush $drush_alias state:set disable_rendered_output_cache_bins 0 --input-format=integer && ddev drush $drush_alias cache:rebuild" - get_state_cmd="ddev drush $drush_alias state:get twig_debug" -fi - -case "$1" in - "enable") - echo "Enabling Twig debugging..." - eval "$enable_cmd" - ;; - "disable") - echo "Disabling Twig debugging..." - eval "$disable_cmd" - ;; - *) - # Check current state and toggle accordingly - twig_debug_state=$(eval "$get_state_cmd") - - # Debugging output to ensure the state is being captured correctly - echo "Current Twig debug state: $twig_debug_state" - - # Ensure that twig_debug_state is a valid number - if [[ "$twig_debug_state" =~ ^[0-9]+$ ]]; then - if [ "$twig_debug_state" -eq 0 ]; then - echo "Twig debugging is currently disabled. Enabling..." - eval "$enable_cmd" - else - echo "Twig debugging is currently enabled. Disabling..." - eval "$disable_cmd" - fi - else - echo "Error: Unable to retrieve valid twig_debug state. Output was: $twig_debug_state" - exit 1 - fi - ;; -esac \ No newline at end of file