Fix env override regression, fixes #3820

Seldaek · Seldaek · commit b80038804ff7 · 2015-03-06T16:21:40.000Z
diff --git a/src/Composer/Command/CreateProjectCommand.php b/src/Composer/Command/CreateProjectCommand.php
@@ -316,7 +316,8 @@ protected function installRootPackage(IOInterface $io, Config $config, $packageN
         $io->writeError('<info>Created project in ' . $directory . '</info>');
         chdir($directory);
 
-        putenv('COMPOSER_ROOT_VERSION='.$package->getPrettyVersion());
+        $_SERVER['COMPOSER_ROOT_VERSION'] = $package->getPrettyVersion();
+        putenv('COMPOSER_ROOT_VERSION='.$_SERVER['COMPOSER_ROOT_VERSION']);
 
         return $installedFromVcs;
     }
diff --git a/src/Composer/Command/RunScriptCommand.php b/src/Composer/Command/RunScriptCommand.php
@@ -87,7 +87,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // add the bin dir to the PATH to make local binaries of deps usable in scripts
         $binDir = $composer->getConfig()->get('bin-dir');
         if (is_dir($binDir)) {
-            putenv('PATH='.realpath($binDir).PATH_SEPARATOR.getenv('PATH'));
+            $_SERVER['PATH'] = realpath($binDir).PATH_SEPARATOR.getenv('PATH');
+            putenv('PATH='.$_SERVER['PATH']);
         }
 
         $args = $input->getArgument('args');
diff --git a/src/Composer/Command/ScriptAliasCommand.php b/src/Composer/Command/ScriptAliasCommand.php
@@ -57,7 +57,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // add the bin dir to the PATH to make local binaries of deps usable in scripts
         $binDir = $composer->getConfig()->get('bin-dir');
         if (is_dir($binDir)) {
-            putenv('PATH='.realpath($binDir).PATH_SEPARATOR.getenv('PATH'));
+            $_SERVER['PATH'] = realpath($binDir).PATH_SEPARATOR.getenv('PATH');
+            putenv('PATH='.$_SERVER['PATH']);
         }
 
         $args = $input->getArguments();
diff --git a/src/Composer/Util/Git.php b/src/Composer/Util/Git.php
@@ -164,18 +164,22 @@ public static function cleanEnv()
         // added in git 1.7.1, prevents prompting the user for username/password
         if (getenv('GIT_ASKPASS') !== 'echo') {
             putenv('GIT_ASKPASS=echo');
+            unset($_SERVER['GIT_ASKPASS']);
         }
 
         // clean up rogue git env vars in case this is running in a git hook
         if (getenv('GIT_DIR')) {
             putenv('GIT_DIR');
+            unset($_SERVER['GIT_DIR']);
         }
         if (getenv('GIT_WORK_TREE')) {
             putenv('GIT_WORK_TREE');
+            unset($_SERVER['GIT_WORK_TREE']);
         }
 
         // clean up env for OSX, see https://github.com/composer/composer/issues/2146#issuecomment-35478940
         putenv("DYLD_LIBRARY_PATH");
+        unset($_SERVER['DYLD_LIBRARY_PATH']);
     }
 
     public static function getGitHubDomainsRegex(Config $config)
diff --git a/src/Composer/Util/ProcessExecutor.php b/src/Composer/Util/ProcessExecutor.php
@@ -56,7 +56,7 @@ public function execute($command, &$output = null, $cwd = null)
 
         $this->captureOutput = count(func_get_args()) > 1;
         $this->errorOutput = null;
-        $process = new Process($command, $cwd, array('LANGUAGE' => 'C') + $_ENV + $_SERVER, null, static::getTimeout());
+        $process = new Process($command, $cwd, array_replace($_ENV, $_SERVER, array('LANGUAGE' => 'C')), null, static::getTimeout());
 
         $callback = is_callable($output) ? $output : array($this, 'outputHandler');
         $process->run($callback);
diff --git a/src/Composer/Util/Svn.php b/src/Composer/Util/Svn.php
@@ -81,6 +81,7 @@ public static function cleanEnv()
     {
         // clean up env for OSX, see https://github.com/composer/composer/issues/2146#issuecomment-35478940
         putenv("DYLD_LIBRARY_PATH");
+        unset($_SERVER['DYLD_LIBRARY_PATH']);
     }
 
     /**
diff --git a/tests/Composer/Test/AllFunctionalTest.php b/tests/Composer/Test/AllFunctionalTest.php
@@ -42,7 +42,8 @@ public function tearDown()
         }
         if ($this->oldenv) {
             $fs->removeDirectory(getenv('COMPOSER_HOME'));
-            putenv('COMPOSER_HOME='.$this->oldenv);
+            $_SERVER['COMPOSER_HOME'] = $this->oldenv;
+            putenv('COMPOSER_HOME='.$_SERVER['COMPOSER_HOME']);
             $this->oldenv = null;
         }
     }
@@ -86,7 +87,8 @@ public function testIntegration(\SplFileInfo $testFile)
         $testData = $this->parseTestFile($testFile);
 
         $this->oldenv = getenv('COMPOSER_HOME');
-        putenv('COMPOSER_HOME='.$this->testDir.'home');
+        $_SERVER['COMPOSER_HOME'] = $this->testDir.'home';
+        putenv('COMPOSER_HOME='.$_SERVER['COMPOSER_HOME']);
 
         $cmd = 'php '.escapeshellarg(self::$pharPath).' --no-ansi '.$testData['RUN'];
         $proc = new Process($cmd, __DIR__.'/Fixtures/functional', null, null, 300);

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,8 @@ protected function installRootPackage(IOInterface $io, Config $config, $packageN`
`316`	`316`	`$io->writeError('<info>Created project in ' . $directory . '</info>');`
`317`	`317`	`chdir($directory);`
`318`	`318`
`319`		`- putenv('COMPOSER_ROOT_VERSION='.$package->getPrettyVersion());`
	`319`	`+ $_SERVER['COMPOSER_ROOT_VERSION'] = $package->getPrettyVersion();`
	`320`	`+ putenv('COMPOSER_ROOT_VERSION='.$_SERVER['COMPOSER_ROOT_VERSION']);`
`320`	`321`
`321`	`322`	`return $installedFromVcs;`
`322`	`323`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,8 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`87`	`87`	`// add the bin dir to the PATH to make local binaries of deps usable in scripts`
`88`	`88`	`$binDir = $composer->getConfig()->get('bin-dir');`
`89`	`89`	`if (is_dir($binDir)) {`
`90`		`- putenv('PATH='.realpath($binDir).PATH_SEPARATOR.getenv('PATH'));`
	`90`	`+ $_SERVER['PATH'] = realpath($binDir).PATH_SEPARATOR.getenv('PATH');`
	`91`	`+ putenv('PATH='.$_SERVER['PATH']);`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`$args = $input->getArgument('args');`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,8 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`57`	`57`	`// add the bin dir to the PATH to make local binaries of deps usable in scripts`
`58`	`58`	`$binDir = $composer->getConfig()->get('bin-dir');`
`59`	`59`	`if (is_dir($binDir)) {`
`60`		`- putenv('PATH='.realpath($binDir).PATH_SEPARATOR.getenv('PATH'));`
	`60`	`+ $_SERVER['PATH'] = realpath($binDir).PATH_SEPARATOR.getenv('PATH');`
	`61`	`+ putenv('PATH='.$_SERVER['PATH']);`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`$args = $input->getArguments();`
Original file line number	Diff line number	Diff line change
`@@ -164,18 +164,22 @@ public static function cleanEnv()`
`164`	`164`	`// added in git 1.7.1, prevents prompting the user for username/password`
`165`	`165`	`if (getenv('GIT_ASKPASS') !== 'echo') {`
`166`	`166`	`putenv('GIT_ASKPASS=echo');`
	`167`	`+ unset($_SERVER['GIT_ASKPASS']);`
`167`	`168`	`}`
`168`	`169`
`169`	`170`	`// clean up rogue git env vars in case this is running in a git hook`
`170`	`171`	`if (getenv('GIT_DIR')) {`
`171`	`172`	`putenv('GIT_DIR');`
	`173`	`+ unset($_SERVER['GIT_DIR']);`
`172`	`174`	`}`
`173`	`175`	`if (getenv('GIT_WORK_TREE')) {`
`174`	`176`	`putenv('GIT_WORK_TREE');`
	`177`	`+ unset($_SERVER['GIT_WORK_TREE']);`
`175`	`178`	`}`
`176`	`179`
`177`	`180`	`// clean up env for OSX, see https://github.com/composer/composer/issues/2146#issuecomment-35478940`
`178`	`181`	`putenv("DYLD_LIBRARY_PATH");`
	`182`	`+ unset($_SERVER['DYLD_LIBRARY_PATH']);`
`179`	`183`	`}`
`180`	`184`
`181`	`185`	`public static function getGitHubDomainsRegex(Config $config)`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ public static function cleanEnv()`
`81`	`81`	`{`
`82`	`82`	`// clean up env for OSX, see https://github.com/composer/composer/issues/2146#issuecomment-35478940`
`83`	`83`	`putenv("DYLD_LIBRARY_PATH");`
	`84`	`+ unset($_SERVER['DYLD_LIBRARY_PATH']);`
`84`	`85`	`}`
`85`	`86`
`86`	`87`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,8 @@ public function tearDown()`
`42`	`42`	`}`
`43`	`43`	`if ($this->oldenv) {`
`44`	`44`	`$fs->removeDirectory(getenv('COMPOSER_HOME'));`
`45`		`- putenv('COMPOSER_HOME='.$this->oldenv);`
	`45`	`+ $_SERVER['COMPOSER_HOME'] = $this->oldenv;`
	`46`	`+ putenv('COMPOSER_HOME='.$_SERVER['COMPOSER_HOME']);`
`46`	`47`	`$this->oldenv = null;`
`47`	`48`	`}`
`48`	`49`	`}`
`@@ -86,7 +87,8 @@ public function testIntegration(\SplFileInfo $testFile)`
`86`	`87`	`$testData = $this->parseTestFile($testFile);`
`87`	`88`
`88`	`89`	`$this->oldenv = getenv('COMPOSER_HOME');`
`89`		`- putenv('COMPOSER_HOME='.$this->testDir.'home');`
	`90`	`+ $_SERVER['COMPOSER_HOME'] = $this->testDir.'home';`
	`91`	`+ putenv('COMPOSER_HOME='.$_SERVER['COMPOSER_HOME']);`
`90`	`92`
`91`	`93`	`$cmd = 'php '.escapeshellarg(self::$pharPath).' --no-ansi '.$testData['RUN'];`
`92`	`94`	`$proc = new Process($cmd, __DIR__.'/Fixtures/functional', null, null, 300);`