[Process] Inherit env vars by default

nicolas-grekas · nicolas-grekas · commit 495f77a22268 · 2015-10-20T09:35:58.000+02:00
diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
@@ -334,8 +334,7 @@ public function request($method, $uri, array $parameters = array(), array $files
      */
     protected function doRequestInProcess($request)
     {
-        // We set the TMPDIR (for Macs) and TEMP (for Windows), because on these platforms the temp directory changes based on the user.
-        $process = new PhpProcess($this->getScript($request), null, array('TMPDIR' => sys_get_temp_dir(), 'TEMP' => sys_get_temp_dir()));
+        $process = new PhpProcess($this->getScript($request), null, null);
         $process->run();
 
         if (!$process->isSuccessful() || !preg_match('/^O\:\d+\:/', $process->getOutput())) {
diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json
@@ -20,7 +20,7 @@
         "symfony/dom-crawler": "~2.0,>=2.0.5"
     },
     "require-dev": {
-        "symfony/process": "~2.0,>=2.0.5",
+        "symfony/process": "~2.3,>=2.3.34|~2.7,>=2.7.6",
         "symfony/css-selector": "~2.0,>=2.0.5"
     },
     "suggest": {
diff --git a/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php b/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
@@ -283,7 +283,7 @@ private static function getClassHierarchy(\ReflectionClass $class)
 
         $traits = array();
 
-        if (function_exists('get_declared_traits')) {
+        if (method_exists('ReflectionClass', 'getTraits')) {
             foreach ($classes as $c) {
                 foreach (self::resolveDependencies(self::computeTraitDeps($c), $c) as $trait) {
                     if ($trait !== $c) {
diff --git a/src/Symfony/Component/Process/PhpProcess.php b/src/Symfony/Component/Process/PhpProcess.php
@@ -27,13 +27,13 @@ class PhpProcess extends Process
     /**
      * Constructor.
      *
-     * @param string $script  The PHP script to run (as a string)
-     * @param string $cwd     The working directory
-     * @param array  $env     The environment variables
-     * @param int    $timeout The timeout in seconds
-     * @param array  $options An array of options for proc_open
+     * @param string      $script  The PHP script to run (as a string)
+     * @param string|null $cwd     The working directory
+     * @param array|null  $env     The environment variables
+     * @param int         $timeout The timeout in seconds
+     * @param array       $options An array of options for proc_open
      */
-    public function __construct($script, $cwd = null, array $env = array(), $timeout = 60, array $options = array())
+    public function __construct($script, $cwd = null, array $env = null, $timeout = 60, array $options = array())
     {
         $executableFinder = new PhpExecutableFinder();
         if (false === $php = $executableFinder->find()) {
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -851,7 +851,7 @@ public function setEnv(array $env)
 
         $this->env = array();
         foreach ($env as $key => $value) {
-            $this->env[(binary) $key] = (binary) $value;
+            $this->env[$key] = (string) $value;
         }
 
         return $this;

Original file line number	Diff line number	Diff line change
`@@ -334,8 +334,7 @@ public function request($method, $uri, array $parameters = array(), array $files`
`334`	`334`	`*/`
`335`	`335`	`protected function doRequestInProcess($request)`
`336`	`336`	`{`
`337`		`- // We set the TMPDIR (for Macs) and TEMP (for Windows), because on these platforms the temp directory changes based on the user.`
`338`		`- $process = new PhpProcess($this->getScript($request), null, array('TMPDIR' => sys_get_temp_dir(), 'TEMP' => sys_get_temp_dir()));`
	`337`	`+ $process = new PhpProcess($this->getScript($request), null, null);`
`339`	`338`	`$process->run();`
`340`	`339`
`341`	`340`	`if (!$process->isSuccessful() \|\| !preg_match('/^O\:\d+\:/', $process->getOutput())) {`
Original file line number	Diff line number	Diff line change
`@@ -851,7 +851,7 @@ public function setEnv(array $env)`
`851`	`851`
`852`	`852`	`$this->env = array();`
`853`	`853`	`foreach ($env as $key => $value) {`
`854`		`- $this->env[(binary) $key] = (binary) $value;`
	`854`	`+ $this->env[$key] = (string) $value;`
`855`	`855`	`}`
`856`	`856`
`857`	`857`	`return $this;`