[Process] fixed previous merge

symfony · Oct 3, 2012 · b2dd04d · b2dd04d
1 parent edf694b
commit b2dd04d
Showing 1 changed file with 25 additions and 5 deletions.
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -614,22 +614,21 @@ public function stop($timeout=10)
     public function addOutput($line)
     {
         $this->stdout .= $line;
-
-        return $this;
     }
 
     public function addErrorOutput($line)
     {
         $this->stderr .= $line;
-
-        return $this;
     }
 
     public function getCommandLine()
     {
         return $this->commandline;
     }
 
+    /**
+     * @return self The current Process instance
+     */
     public function setCommandLine($commandline)
     {
         $this->commandline = $commandline;
@@ -648,6 +647,8 @@ public function getTimeout()
      * To disable the timeout, set this value to null.
      *
      * @param integer|null
+     *
+     * @return self The current Process instance
      */
     public function setTimeout($timeout)
     {
@@ -673,6 +674,9 @@ public function getWorkingDirectory()
         return $this->cwd;
     }
 
+    /**
+     * @return self The current Process instance
+     */
     public function setWorkingDirectory($cwd)
     {
         $this->cwd = $cwd;
@@ -685,6 +689,9 @@ public function getEnv()
         return $this->env;
     }
 
+    /**
+     * @return self The current Process instance
+     */
     public function setEnv(array $env)
     {
         $this->env = $env;
@@ -697,6 +704,9 @@ public function getStdin()
         return $this->stdin;
     }
 
+    /**
+     * @return self The current Process instance
+     */
     public function setStdin($stdin)
     {
         $this->stdin = $stdin;
@@ -709,6 +719,9 @@ public function getOptions()
         return $this->options;
     }
 
+    /**
+     * @return self The current Process instance
+     */
     public function setOptions(array $options)
     {
         $this->options = $options;
@@ -721,11 +734,14 @@ public function getEnhanceWindowsCompatibility()
         return $this->enhanceWindowsCompatibility;
     }
 
+    /**
+     * @return self The current Process instance
+     */
     public function setEnhanceWindowsCompatibility($enhance)
     {
         $this->enhanceWindowsCompatibility = (Boolean) $enhance;
 
-        return $this;'
+        return $this;
     }
 
     /**
@@ -746,10 +762,14 @@ public function getEnhanceSigchildCompatibility()
      * the --enable-sigchild option
      *
      * @param Boolean $enhance
+     *
+     * @return self The current Process instance
      */
     public function setEnhanceSigchildCompatibility($enhance)
     {
         $this->enhanceSigchildCompatibility = (Boolean) $enhance;
+
+        return $this;
     }
 
     /**