Merge branch 'release/6.0.2'

Author: pingers

scaffold/optional/docker-compose.linux.yml

@@ -44,7 +44,8 @@ services:
       - ${XDG_RUNTIME_DIR}/keyring:/ssh
     networks:
       - default
-
+    extra_hosts:
+        - host.docker.internal:host-gateway
   db:
     image: mariadb
     environment:

scaffold/optional/docker/xdebug.ini

@@ -1,8 +1,6 @@
 zend_extension=xdebug.so
 xdebug.max_nesting_level=500
-xdebug.remote_enable=1
-xdebug.remote_handler=dbgp
-xdebug.remote_mode=req
-xdebug.remote_port=9000
-xdebug.remote_connect_back=1
-xdebug.idekey=PHPSTORM
+xdebug.mode=debug,develop
+xdebug.start_with_request=yes
+xdebug.client_host=host.docker.internal
+xdebug.client_discovery_header=HTTP_X_FORWARDED_FOR,REMOTE_ADDR