Configurable inheritance of environment variables (#173)

Author: GrahamCampbell

src/Gitonomy/Git/Repository.php

@@ -86,6 +86,11 @@ class Repository
      */
     protected $environmentVariables;
 
+    /**
+     * @var bool
+     */
+    protected $inheritEnvironmentVariables;
+
     /**
      * Timeout that should be set for every running process.
      *
@@ -113,14 +118,14 @@ class Repository
      */
     public function __construct($dir, $options = [])
     {
-        $is_windows = defined('PHP_WINDOWS_VERSION_BUILD');
         $options = array_merge([
-            'working_dir'           => null,
-            'debug'                 => true,
-            'logger'                => null,
-            'environment_variables' => $is_windows ? ['PATH' => getenv('path')] : [],
-            'command'               => 'git',
-            'process_timeout'       => 3600,
+            'working_dir'                   => null,
+            'debug'                         => true,
+            'logger'                        => null,
+            'command'                       => 'git',
+            'environment_variables'         => [],
+            'inherit_environment_variables' => false,
+            'process_timeout'               => 3600,
         ], $options);
 
         if (null !== $options['logger'] && !$options['logger'] instanceof LoggerInterface) {
@@ -131,10 +136,16 @@ public function __construct($dir, $options = [])
         $this->initDir($dir, $options['working_dir']);
 
         $this->objects = [];
+        $this->command = $options['command'];
         $this->debug = (bool) $options['debug'];
-        $this->environmentVariables = $options['environment_variables'];
         $this->processTimeout = $options['process_timeout'];
-        $this->command = $options['command'];
+
+        if (defined('PHP_WINDOWS_VERSION_BUILD') && isset($_SERVER['PATH']) && !isset($options['environment_variables']['PATH'])) {
+            $options['environment_variables']['PATH'] = $_SERVER['PATH'];
+        }
+
+        $this->environmentVariables = $options['environment_variables'];
+        $this->inheritEnvironmentVariables = $options['inherit_environment_variables'];
 
         if (true === $this->debug && null !== $this->logger) {
             $this->logger->debug(sprintf('Repository created (git dir: "%s", working dir: "%s")', $this->gitDir, $this->workingDir ?: 'none'));
@@ -620,7 +631,13 @@ private function getProcess($command, $args = [])
         $base[] = $command;
 
         $process = new Process(array_merge($base, $args));
-        $process->setEnv($this->environmentVariables);
+
+        if ($this->inheritEnvironmentVariables) {
+            $process->setEnv(array_replace($_SERVER, $this->environmentVariables));
+        } else {
+            $process->setEnv($this->environmentVariables);
+        }
+
         $process->setTimeout($this->processTimeout);
         $process->setIdleTimeout($this->processTimeout);