Merge branch '2.3' into 2.7

* 2.3:
  [PropertyAccess] Reorder elements array after PropertyPathBuilder::replace
  [Routing] Skip PhpGeneratorDumperTest::testDumpWithTooManyRoutes on HHVM
  [Process] More robustness and deterministic tests

Conflicts:
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Process/Tests/ProcessTest.php

Author: nicolas-grekas

src/Symfony/Component/Process/PhpProcess.php

@@ -46,6 +46,12 @@ public function __construct($script, $cwd = null, array $env = null, $timeout =
             $php .= ' '.ProcessUtils::escapeArgument($file);
             $script = null;
         }
+        if ('\\' !== DIRECTORY_SEPARATOR && null !== $php) {
+            // exec is mandatory to deal with sending a signal to the process
+            // see https://github.com/symfony/symfony/issues/5030 about prepending
+            // command with exec
+            $php = 'exec '.$php;
+        }
 
         parent::__construct($php, $cwd, $env, $script, $timeout, $options);
     }

src/Symfony/Component/Process/Process.php

@@ -76,12 +76,12 @@ class Process
 
     private static $sigchild;
     private static $posixSignals = array(
-        1 => 1,   // SIGHUP
-        2 => 2,   // SIGINT
-        3 => 3,   // SIGQUIT
-        6 => 6,   // SIGABRT
-        14 => 14, // SIGALRM
-        15 => 15, // SIGTERM
+         1, // SIGHUP
+         2, // SIGINT
+         3, // SIGQUIT
+         6, // SIGABRT
+        14, // SIGALRM
+        15, // SIGTERM
     );
 
     /**
@@ -285,27 +285,35 @@ public function start($callback = null)
             if (!isset($this->options['bypass_shell'])) {
                 $this->options['bypass_shell'] = true;
             }
-        }
+        } elseif (!$this->useFileHandles && $this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
+            // last exit code is output on the fourth pipe and caught to work around --enable-sigchild
+            $descriptors[3] = array('pipe', 'w');
+
+            $commandline = '';
+            foreach (self::$posixSignals as $s) {
+                $commandline .= "trap 'echo s$s >&3' $s;";
+            }
 
-        $ptsWorkaround = null;
+            // See https://unix.stackexchange.com/questions/71205/background-process-pipe-input
+            $commandline .= '{ ('.$this->commandline.') <&3 3<&- 3>/dev/null & } 3<&0;';
+            $commandline .= 'pid=$!; echo $pid >&3; wait $pid; code=$?; echo x$code >&3; exit $code';
 
-        if (!$this->useFileHandles && $this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
             // Workaround for the bug, when PTS functionality is enabled.
             // @see : https://bugs.php.net/69442
             $ptsWorkaround = fopen(__FILE__, 'r');
         }
 
         $this->process = proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $this->env, $this->options);
 
-        if ($ptsWorkaround) {
-            fclose($ptsWorkaround);
-        }
-
         if (!is_resource($this->process)) {
             throw new RuntimeException('Unable to launch a new process.');
         }
         $this->status = self::STATUS_STARTED;
 
+        if (isset($descriptors[3])) {
+            $this->fallbackStatus['pid'] = (int) fgets($this->processPipes->pipes[3]);
+        }
+
         if ($this->tty) {
             return;
         }
@@ -596,8 +604,6 @@ public function clearErrorOutput()
     public function getExitCode()
     {
         if (!$this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
-            $this->stop(0);
-
             throw new RuntimeException('This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.');
         }
 
@@ -651,8 +657,6 @@ public function hasBeenSignaled()
         $this->requireProcessIsTerminated(__FUNCTION__);
 
         if (!$this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
-            $this->stop(0);
-
             throw new RuntimeException('This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.');
         }
 
@@ -674,8 +678,6 @@ public function getTermSignal()
         $this->requireProcessIsTerminated(__FUNCTION__);
 
         if ($this->isSigchildEnabled() && (!$this->enhanceSigchildCompatibility || -1 === $this->processInformation['termsig'])) {
-            $this->stop(0);
-
             throw new RuntimeException('This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.');
         }
 
@@ -1245,22 +1247,8 @@ private function getDescriptors()
         } else {
             $this->processPipes = UnixPipes::create($this, $this->input);
         }
-        $descriptors = $this->processPipes->getDescriptors($this->outputDisabled);
 
-        if (!$this->useFileHandles && $this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
-            // last exit code is output on the fourth pipe and caught to work around --enable-sigchild
-            $descriptors[3] = array('pipe', 'w');
-
-            $trap = '';
-            foreach (self::$posixSignals as $s) {
-                $trap .= "trap 'echo s$s >&3' $s;";
-            }
-
-            $this->commandline = $trap.'{ ('.$this->commandline.') <&3 3<&- 3>/dev/null & } 3<&0;';
-            $this->commandline .= 'pid=$!; echo p$pid >&3; wait $pid; code=$?; echo x$code >&3; exit $code';
-        }
-
-        return $descriptors;
+        return $this->processPipes->getDescriptors($this->outputDisabled);
     }
 
     /**
@@ -1379,8 +1367,11 @@ private function readPipes($blocking, $close)
                         $this->fallbackStatus['signaled'] = true;
                         $this->fallbackStatus['exitcode'] = -1;
                         $this->fallbackStatus['termsig'] = (int) substr($data, 1);
-                    } elseif ('x' === $data[0] && !isset($this->fallbackStatus['signaled'])) {
-                        $this->fallbackStatus['exitcode'] = (int) substr($data, 1);
+                    } elseif ('x' === $data[0]) {
+                        $this->fallbackStatus['running'] = false;
+                        if (!isset($this->fallbackStatus['signaled'])) {
+                            $this->fallbackStatus['exitcode'] = (int) substr($data, 1);
+                        }
                     }
                 }
             } else {
@@ -1462,14 +1453,6 @@ private function doSignal($signal, $throwException)
             return false;
         }
 
-        if ($this->enhanceSigchildCompatibility && $this->isSigchildEnabled() && !isset(self::$posixSignals[$signal]) && !(function_exists('posix_kill') && @posix_kill($this->getPid(), $signal))) {
-            if ($throwException) {
-                throw new RuntimeException('This PHP has been compiled with --enable-sigchild and posix_kill() is not available.');
-            }
-
-            return false;
-        }
-
         if ('\\' === DIRECTORY_SEPARATOR) {
             exec(sprintf('taskkill /F /T /PID %d 2>&1', $this->getPid()), $output, $exitCode);
             if ($exitCode && $this->isRunning()) {
@@ -1479,14 +1462,21 @@ private function doSignal($signal, $throwException)
 
                 return false;
             }
-        }
-
-        if (true !== @proc_terminate($this->process, $signal) && '\\' !== DIRECTORY_SEPARATOR) {
-            if ($throwException) {
-                throw new RuntimeException(sprintf('Error while sending signal `%s`.', $signal));
+        } else {
+            if (!$this->enhanceSigchildCompatibility || !$this->isSigchildEnabled()) {
+                $ok = @proc_terminate($this->process, $signal);
+            } elseif (function_exists('posix_kill')) {
+                $ok = @posix_kill($this->getPid(), $signal);
+            } elseif ($ok = proc_open(sprintf('kill -%d %d', $signal, $this->getPid()), array(2 => array('pipe', 'w')), $pipes)) {
+                $ok = false === fgets($pipes[2]);
             }
+            if (!$ok) {
+                if ($throwException) {
+                    throw new RuntimeException(sprintf('Error while sending signal `%s`.', $signal));
+                }
 
-            return false;
+                return false;
+            }
         }
 
         $this->latestSignal = (int) $signal;

src/Symfony/Component/Process/Tests/NonStopableProcess.php

@@ -30,16 +30,18 @@ function handleSignal($signal)
             break;
     }
 
-    echo "received signal $name\n";
+    echo "signal $name\n";
 }
 
-declare (ticks = 1);
 pcntl_signal(SIGTERM, 'handleSignal');
 pcntl_signal(SIGINT, 'handleSignal');
 
+echo 'received ';
+
 $duration = isset($argv[1]) ? (int) $argv[1] : 3;
 $start = microtime(true);
 
 while ($duration > (microtime(true) - $start)) {
-    usleep(1000);
+    usleep(10000);
+    pcntl_signal_dispatch();
 }