SERV-390: Added better xdebug mode handling

cableman · cableman · commit 993f1cb31a2e · 2021-01-22T14:04:31.000+01:00
diff --git a/php7.3-fpm/etc/confd/templates/20-xdebug.ini.tmpl b/php7.3-fpm/etc/confd/templates/20-xdebug.ini.tmpl
@@ -1,14 +1,12 @@
 {{$mode := getenv "XDEBUG_MODE" }}
-{{ if eq $mode "debug"}}
+{{ if ne $mode "off"}}
 zend_extension=xdebug.so
 xdebug.max_nesting_level = {{ getenv "XDEBUG_MAX_NESTING_LEVEL" "256" }}
-{{ end }}
-{{ if eq $mode "profile"}}
-zend_extension=xdebug.so
 
-xdebug.max_nesting_level = {{ getenv "XDEBUG_MAX_NESTING_LEVEL" "256" }}
+{{ if eq $mode "profile"}}
 xdebug.profiler_append = {{ getenv "XDEBUG_PROFILER_APPEND" "0" }}
 xdebug.output_dir = {{ getenv "XDEBUG_PROFILER_FILES_DIR" }}/xdebug/profiler
 xdebug.profiler_output_name = {{ getenv "XDEBUG_PROFILER_OUTPUT_NAME" "cachegrind.out.%p" }}
 xdebug.trigger_value= "{{ getenv "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" "" }}"
 {{ end }}
+{{ end }}
diff --git a/php7.4-fpm/etc/confd/templates/20-xdebug.ini.tmpl b/php7.4-fpm/etc/confd/templates/20-xdebug.ini.tmpl
@@ -1,14 +1,12 @@
 {{$mode := getenv "XDEBUG_MODE" }}
-{{ if eq $mode "debug"}}
+{{ if ne $mode "off"}}
 zend_extension=xdebug.so
 xdebug.max_nesting_level = {{ getenv "XDEBUG_MAX_NESTING_LEVEL" "256" }}
-{{ end }}
-{{ if eq $mode "profile"}}
-zend_extension=xdebug.so
 
-xdebug.max_nesting_level = {{ getenv "XDEBUG_MAX_NESTING_LEVEL" "256" }}
+{{ if eq $mode "profile"}}
 xdebug.profiler_append = {{ getenv "XDEBUG_PROFILER_APPEND" "0" }}
 xdebug.output_dir = {{ getenv "XDEBUG_PROFILER_FILES_DIR" }}/xdebug/profiler
 xdebug.profiler_output_name = {{ getenv "XDEBUG_PROFILER_OUTPUT_NAME" "cachegrind.out.%p" }}
 xdebug.trigger_value= "{{ getenv "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" "" }}"
 {{ end }}
+{{ end }}
diff --git a/php8.0-fpm/etc/confd/templates/20-xdebug.ini.tmpl b/php8.0-fpm/etc/confd/templates/20-xdebug.ini.tmpl
@@ -1,14 +1,12 @@
 {{$mode := getenv "XDEBUG_MODE" }}
-{{ if eq $mode "debug"}}
+{{ if ne $mode "off"}}
 zend_extension=xdebug.so
 xdebug.max_nesting_level = {{ getenv "XDEBUG_MAX_NESTING_LEVEL" "256" }}
-{{ end }}
-{{ if eq $mode "profile"}}
-zend_extension=xdebug.so
 
-xdebug.max_nesting_level = {{ getenv "XDEBUG_MAX_NESTING_LEVEL" "256" }}
+{{ if eq $mode "profile"}}
 xdebug.profiler_append = {{ getenv "XDEBUG_PROFILER_APPEND" "0" }}
 xdebug.output_dir = {{ getenv "XDEBUG_PROFILER_FILES_DIR" }}/xdebug/profiler
 xdebug.profiler_output_name = {{ getenv "XDEBUG_PROFILER_OUTPUT_NAME" "cachegrind.out.%p" }}
 xdebug.trigger_value= "{{ getenv "XDEBUG_PROFILER_ENABLE_TRIGGER_VALUE" "" }}"
 {{ end }}
+{{ end }}
diff --git a/templates/drupal-7/docker-compose.yml b/templates/drupal-7/docker-compose.yml
@@ -27,7 +27,7 @@ services:
     networks:
       - app
     environment:
-      - XDEBUG_MODE=${XDEBUG_MODE:-no}
+      - XDEBUG_MODE=${XDEBUG_MODE:-off}
       - XDEBUG_CONFIG=${XDEBUG_CONFIG}
       - XDEBUG_SESSION=${XDEBUG_SESSION:-0}
       - PHP_MAX_EXECUTION_TIME=30
diff --git a/templates/drupal-8/docker-compose.yml b/templates/drupal-8/docker-compose.yml
@@ -27,7 +27,7 @@ services:
     networks:
       - app
     environment:
-      - XDEBUG_MODE=${XDEBUG_MODE:-no}
+      - XDEBUG_MODE=${XDEBUG_MODE:-off}
       - XDEBUG_CONFIG=${XDEBUG_CONFIG}
       - XDEBUG_SESSION=${XDEBUG_SESSION:-0}
       - PHP_MAX_EXECUTION_TIME=30
diff --git a/templates/symfony-4/docker-compose.yml b/templates/symfony-4/docker-compose.yml
@@ -27,7 +27,7 @@ services:
     networks:
       - app
     environment:
-      - XDEBUG_MODE=${XDEBUG_MODE:-no}
+      - XDEBUG_MODE=${XDEBUG_MODE:-off}
       - XDEBUG_CONFIG=${XDEBUG_CONFIG}
       - XDEBUG_SESSION=${XDEBUG_SESSION:-0}
       - PHP_MAX_EXECUTION_TIME=30
