From 542d37e21740c5733f8f06806411123906f9b4e8 Mon Sep 17 00:00:00 2001 From: Gary PEGEOT Date: Fri, 18 Dec 2020 11:16:37 +0000 Subject: [PATCH 1/2] Update doc for Xdebug 3 --- docs/xdebug.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/xdebug.md b/docs/xdebug.md index f0e3b95..1022393 100644 --- a/docs/xdebug.md +++ b/docs/xdebug.md @@ -12,7 +12,7 @@ it's recommended to add a custom stage to the end of the `Dockerfile`. # Dockerfile FROM symfony_php as symfony_php_debug -ARG XDEBUG_VERSION=2.9.8 +ARG XDEBUG_VERSION=3.0.1 RUN set -eux; \ apk add --no-cache --virtual .build-deps $PHPIZE_DEPS; \ pecl install xdebug-$XDEBUG_VERSION; \ @@ -39,12 +39,12 @@ services: environment: # See https://docs.docker.com/docker-for-mac/networking/#i-want-to-connect-from-a-container-to-a-service-on-the-host # See https://github.com/docker/for-linux/issues/264 - # The `remote_host` below may optionally be replaced with `remote_connect_back` + # The `client_host` below may optionally be replaced with `discover_client_host=yes` + # Add `start_with_request=yes` to start debug seesion on each request XDEBUG_CONFIG: >- - remote_enable=1 - remote_host=host.docker.internal - remote_port=9001 - idekey=PHPSTORM + client_host=host.docker.internal + XDEBUG_MODE: debug + XDEBUG_SESSION: PHPSTORM # This should correspond to the server declared in PHPStorm `Preferences | Languages & Frameworks | PHP | Servers` # Then PHPStorm will use the corresponding path mappings PHP_IDE_CONFIG: serverName=symfony @@ -61,4 +61,4 @@ Inspect the installation with the following command. The requested Xdebug versio $ docker-compose exec php php --version PHP ... - with Xdebug v2.8.0 ... + with Xdebug v3.0.1 ... From 07c4602412c9b32e11605e1469532345ba0f8dea Mon Sep 17 00:00:00 2001 From: Gary PEGEOT Date: Mon, 21 Dec 2020 17:42:57 +0000 Subject: [PATCH 2/2] Typo fix --- docs/xdebug.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/xdebug.md b/docs/xdebug.md index 1022393..04d5d68 100644 --- a/docs/xdebug.md +++ b/docs/xdebug.md @@ -40,11 +40,10 @@ services: # See https://docs.docker.com/docker-for-mac/networking/#i-want-to-connect-from-a-container-to-a-service-on-the-host # See https://github.com/docker/for-linux/issues/264 # The `client_host` below may optionally be replaced with `discover_client_host=yes` - # Add `start_with_request=yes` to start debug seesion on each request + # Add `start_with_request=yes` to start debug session on each request XDEBUG_CONFIG: >- client_host=host.docker.internal XDEBUG_MODE: debug - XDEBUG_SESSION: PHPSTORM # This should correspond to the server declared in PHPStorm `Preferences | Languages & Frameworks | PHP | Servers` # Then PHPStorm will use the corresponding path mappings PHP_IDE_CONFIG: serverName=symfony