class PhpProcess extends Process
{
/**
- * Constructor.
- *
* @param string $script The PHP script to run (as a string)
* @param string|null $cwd The working directory or null to use the working dir of the current PHP process
* @param array|null $env The environment variables or null to use the same environment as the current PHP process
* @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 = null, $timeout = 60, array $options = array())
+ public function __construct($script, $cwd = null, array $env = null, $timeout = 60, array $options = null)
{
$executableFinder = new PhpExecutableFinder();
- if (false === $php = $executableFinder->find()) {
+ if (false === $php = $executableFinder->find(false)) {
$php = null;
+ } else {
+ $php = array_merge(array($php), $executableFinder->findArguments());
}
if ('phpdbg' === PHP_SAPI) {
$file = tempnam(sys_get_temp_dir(), 'dbg');
file_put_contents($file, $script);
register_shutdown_function('unlink', $file);
- $php .= ' '.ProcessUtils::escapeArgument($file);
+ $php[] = $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;
+ if (null !== $options) {
+ @trigger_error(sprintf('The $options parameter of the %s constructor is deprecated since Symfony 3.3 and will be removed in 4.0.', __CLASS__), E_USER_DEPRECATED);
}
parent::__construct($php, $cwd, $env, $script, $timeout, $options);
/**
* {@inheritdoc}
*/
- public function start(callable $callback = null)
+ public function start(callable $callback = null/*, array $env = array()*/)
{
if (null === $this->getCommandLine()) {
throw new RuntimeException('Unable to find the PHP executable.');
}
+ $env = 1 < func_num_args() ? func_get_arg(1) : null;
- parent::start($callback);
+ parent::start($callback, $env);
}
}