From 752c5ec59ae38700dced454cd5b045c09ffd8e12 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 11 Dec 2018 10:23:17 +0100
Subject: [PATCH] Set XDEBUG default to 1 in local dev mode Also use host
values for "sub"-containers in local dev mode
---
composer.json | 2 +-
src/Handler.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/composer.json b/composer.json
index 302a68f..18456a0 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
"ext-json": "*",
"php": ">=7.0",
"composer-plugin-api": "^1.0.0",
- "lakedrops/composer-json-utils": "^1.3.2",
+ "lakedrops/composer-json-utils": "^1.3.3",
"lakedrops/docker-traefik": "^1.1.3",
"lakedrops/dotenv": "^1.1.3",
"twig/twig": "^1.23.1"
diff --git a/src/Handler.php b/src/Handler.php
index 1b6b948..b586407 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -240,7 +240,7 @@ class Handler extends BaseHandler {
],
'php' => [
'version' => '7.0',
- 'xdebug' => $this->isCiContext() ? 0 : 1,
+ 'xdebug' => $this->isLocalDevMode() ? 1 : 0,
],
'webserver' => [
'type' => 'apache',
@@ -286,7 +286,7 @@ class Handler extends BaseHandler {
],
], $extra['docker4drupal']);
- if ($this->isCiContext()) {
+ if ($this->isCiContext() || $this->isLocalDevMode()) {
$projectRoot = $this->getDockerMountSource(getenv('CI_PROJECT_DIR'));
}
else {
--
GitLab