fix: merge environment variables for #705 (#706)

* fix: Merge environment variables for #705
xdebug · Jan 22, 2022 · 30b3dc7 · 30b3dc7
1 parent 7c8529a
commit 30b3dc7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.23.0]
+
+- When `env` is specified in launch configuration it will be merged the process environment.
+
 ## [1.22.0]
 
 ### Added

diff --git a/src/phpDebug.ts b/src/phpDebug.ts
@@ -259,7 +259,10 @@ class PhpDebugSession extends vscode.DebugSession {
             const program = args.program ? [args.program] : []
             const cwd = args.cwd || process.cwd()
             const env = Object.fromEntries(
-                Object.entries(args.env || process.env).map(v => [v[0], v[1]?.replace('${port}', port.toString())])
+                Object.entries({ ...process.env, ...args.env }).map(v => [
+                    v[0],
+                    v[1]?.replace('${port}', port.toString()),
+                ])
             )
             // launch in CLI mode
             if (args.externalConsole) {