[Process] Code clean up

Seldaek · Seldaek · commit 4882777c4e29 · 2012-02-16T16:37:52.000+01:00
diff --git a/src/Symfony/Component/Process/ProcessBuilder.php b/src/Symfony/Component/Process/ProcessBuilder.php
@@ -20,7 +20,7 @@ class ProcessBuilder
 {
     private $arguments;
     private $cwd;
-    private $env;
+    private $env = array();
     private $stdin;
     private $timeout;
     private $options;
@@ -63,10 +63,6 @@ public function inheritEnvironmentVariables($inheritEnv = true)
 
     public function setEnv($name, $value)
     {
-        if (null === $this->env) {
-            $this->env = array();
-        }
-
         $this->env[$name] = $value;
 
         return $this;
@@ -117,7 +113,7 @@ public function getProcess()
             $script = implode(' ', array_map('escapeshellarg', $this->arguments));
         }
 
-        $env = $this->inheritEnv && $_ENV ? ($this->env ?: array()) + $_ENV : $this->env;
+        $env = $this->inheritEnv && $_ENV ? $this->env + $_ENV : $this->env;
 
         return new Process($script, $this->cwd, $env, $this->stdin, $this->timeout, $options);
     }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class ProcessBuilder`
`20`	`20`	`{`
`21`	`21`	`private $arguments;`
`22`	`22`	`private $cwd;`
`23`		`- private $env;`
	`23`	`+ private $env = array();`
`24`	`24`	`private $stdin;`
`25`	`25`	`private $timeout;`
`26`	`26`	`private $options;`
`@@ -63,10 +63,6 @@ public function inheritEnvironmentVariables($inheritEnv = true)`
`63`	`63`
`64`	`64`	`public function setEnv($name, $value)`
`65`	`65`	`{`
`66`		`- if (null === $this->env) {`
`67`		`- $this->env = array();`
`68`		`- }`
`69`		`-`
`70`	`66`	`$this->env[$name] = $value;`
`71`	`67`
`72`	`68`	`return $this;`
`@@ -117,7 +113,7 @@ public function getProcess()`
`117`	`113`	`$script = implode(' ', array_map('escapeshellarg', $this->arguments));`
`118`	`114`	`}`
`119`	`115`
`120`		`- $env = $this->inheritEnv && $_ENV ? ($this->env ?: array()) + $_ENV : $this->env;`
	`116`	`+ $env = $this->inheritEnv && $_ENV ? $this->env + $_ENV : $this->env;`
`121`	`117`
`122`	`118`	`return new Process($script, $this->cwd, $env, $this->stdin, $this->timeout, $options);`
`123`	`119`	`}`