[Process] Fix latest merge from 2.2 in 2.3

romainneutron · romainneutron · commit b5e3576ea0f8 · 2013-10-09T23:17:57.000+02:00
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -298,21 +298,18 @@ public function wait($callback = null)
         if (null !== $callback) {
             $this->callback = $this->buildCallback($callback);
         }
-        
+
         do {
             $this->checkTimeout();
             $running = defined('PHP_WINDOWS_VERSION_BUILD') ? $this->isRunning() : $this->processPipes->hasOpenHandles();
             $close = !defined('PHP_WINDOWS_VERSION_BUILD') || !$running;;
             $this->readPipes(true, $close);
         } while ($running);
-        
+
         while ($this->isRunning()) {
             usleep(1000);
         }
 
-        $this->processPipes->close();
-        $exitcode = proc_close($this->process);
-
         if ($this->processInformation['signaled']) {
             if ($this->isSigchildEnabled()) {
                 throw new RuntimeException('The process has been signaled.');
@@ -1043,7 +1040,7 @@ private function readPipes($blocking, $close)
         } else {
             $result = $this->processPipes->read($blocking);
         }
-        
+
         foreach ($result as $type => $data) {
             if (3 == $type) {
                 $this->fallbackExitcode = (int) $data;
@@ -1073,27 +1070,11 @@ private function close()
     {
         $exitcode = -1;
 
+        $this->processPipes->close();
         if (is_resource($this->process)) {
-            // Unix pipes must be closed before calling proc_close to void deadlock
-            // see manual http://php.net/manual/en/function.proc-close.php
-            $this->processPipes->closeUnixPipes();
             $exitcode = proc_close($this->process);
         }
 
-        // Windows only : when using file handles, some activity may occur after
-        // calling proc_close
-        while ($this->processPipes->hasOpenHandles()) {
-            usleep(100);
-            foreach ($this->processPipes->readAndCloseHandles(true) as $type => $data) {
-                if (3 == $type) {
-                    $this->fallbackExitcode = (int) $data;
-                } else {
-                    call_user_func($this->callback, $type === self::STDOUT ? self::OUT : self::ERR, $data);
-                }
-            }
-        }
-        $this->processPipes->close();
-
         $this->exitcode = $this->exitcode !== null ? $this->exitcode : -1;
         $this->exitcode = -1 != $exitcode ? $exitcode : $this->exitcode;
 
