symfony
diff --git a/‎.travis.yml
Lines changed: 1 addition & 1 deletion b/‎.travis.yml
Lines changed: 1 addition & 1 deletion
diff --git a/‎UPGRADE-3.3.md
Lines changed: 5 additions & 0 deletions b/‎UPGRADE-3.3.md
Lines changed: 5 additions & 0 deletions
diff --git a/‎UPGRADE-4.0.md
Lines changed: 5 additions & 0 deletions b/‎UPGRADE-4.0.md
Lines changed: 5 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Process/CHANGELOG.md
Lines changed: 7 additions & 0 deletions b/‎src/Symfony/Component/Process/CHANGELOG.md
Lines changed: 7 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Process/PhpProcess.php
Lines changed: 6 additions & 9 deletions b/‎src/Symfony/Component/Process/PhpProcess.php
Lines changed: 6 additions & 9 deletions
@@ -96,7 +96,7 @@ script:
     - if [[ ! $deps && ! $PHP = hhvm* ]]; then echo "$COMPONENTS" | parallel --gnu '$PHPUNIT --exclude-group tty,benchmark,intl-data {}'"$REPORT"; fi
     - if [[ ! $deps && ! $PHP = hhvm* ]]; then echo -e "\\nRunning tests requiring tty"; $PHPUNIT --group tty; fi
     - if [[ ! $deps && $PHP = hhvm* ]]; then $PHPUNIT --exclude-group benchmark,intl-data; fi
-    - if [[ ! $deps && $PHP = ${MIN_PHP%.*} ]]; then echo -e "1\\n0" | xargs -I{} sh -c 'echo "\\nPHP --enable-sigchild enhanced={}" && ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/'; fi
+    - if [[ ! $deps && $PHP = ${MIN_PHP%.*} ]]; then echo -e "1\\n0" | xargs -I{} sh -c 'echo "\\nPHP --enable-sigchild enhanced={}" && SYMFONY_DEPRECATIONS_HELPER=weak ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/'; fi
     - if [[ $deps = high ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer update --no-progress --ansi; $PHPUNIT --exclude-group tty,benchmark,intl-data'$LEGACY"$REPORT"; fi
     - if [[ $deps = low ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer update --no-progress --ansi --prefer-lowest --prefer-stable; $PHPUNIT --exclude-group tty,benchmark,intl-data'"$REPORT"; fi
     # Test the PhpUnit bridge using the original phpunit script
 
@@ -46,6 +46,11 @@ HttpKernel
  * The `Psr6CacheClearer::addPool()` method has been deprecated. Pass an array of pools indexed
    by name to the constructor instead.
 
+Process
+-------
+
+ * The `ProcessUtils::escapeArgument()` method has been deprecated, use a command line array or give env vars to the `Process::start/run()` method instead.
+
 Security
 --------
 
 
@@ -208,6 +208,11 @@ HttpKernel
  * The `Psr6CacheClearer::addPool()` method has been removed. Pass an array of pools indexed
    by name to the constructor instead.
 
+Process
+-------
+
+ * The `ProcessUtils::escapeArgument()` method has been removed, use a command line array or give env vars to the `Process::start/run()` method instead.
+
 Security
 --------
 
 
@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+3.3.0
+-----
+
+ * added command line arrays in the `Process` class
+ * added `$env` argument to `Process::start()`, `run()`, `mustRun()` and `restart()` methods
+ * deprecated the `ProcessUtils::escapeArgument()` method
+
 2.5.0
 -----
 
 
@@ -38,20 +38,16 @@ public function __construct($script, $cwd = null, array $env = null, $timeout =
         $executableFinder = new PhpExecutableFinder();
         if (false === $php = $executableFinder->find()) {
             $php = null;
+        } else {
+            $php = explode(' ', $php);
         }
         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;
-        }
 
         parent::__construct($php, $cwd, $env, $script, $timeout, $options);
     }
@@ -67,12 +63,13 @@ public function setPhpBinary($php)
     /**
      * {@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);
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -38,20 +38,16 @@ public function __construct($script, $cwd = null, array $env = null, $timeout =`
`38`	`38`	`$executableFinder = new PhpExecutableFinder();`
`39`	`39`	`if (false === $php = $executableFinder->find()) {`
`40`	`40`	`$php = null;`
	`41`	`+ } else {`
	`42`	`+ $php = explode(' ', $php);`
`41`	`43`	`}`
`42`	`44`	`if ('phpdbg' === PHP_SAPI) {`
`43`	`45`	`$file = tempnam(sys_get_temp_dir(), 'dbg');`
`44`	`46`	`file_put_contents($file, $script);`
`45`	`47`	`register_shutdown_function('unlink', $file);`
`46`		`- $php .= ' '.ProcessUtils::escapeArgument($file);`
	`48`	`+ $php[] = $file;`
`47`	`49`	`$script = null;`
`48`	`50`	`}`
`49`		`- if ('\\' !== DIRECTORY_SEPARATOR && null !== $php) {`
`50`		`- // exec is mandatory to deal with sending a signal to the process`
`51`		`- // see https://github.com/symfony/symfony/issues/5030 about prepending`
`52`		`- // command with exec`
`53`		`- $php = 'exec '.$php;`
`54`		`- }`
`55`	`51`
`56`	`52`	`parent::__construct($php, $cwd, $env, $script, $timeout, $options);`
`57`	`53`	`}`
`@@ -67,12 +63,13 @@ public function setPhpBinary($php)`
`67`	`63`	`/**`
`68`	`64`	`* {@inheritdoc}`
`69`	`65`	`*/`
`70`		`- public function start(callable $callback = null)`
	`66`	`+ public function start(callable $callback = null/, array $env = array()/)`
`71`	`67`	`{`
`72`	`68`	`if (null === $this->getCommandLine()) {`
`73`	`69`	`throw new RuntimeException('Unable to find the PHP executable.');`
`74`	`70`	`}`
	`71`	`+ $env = 1 < func_num_args() ? func_get_arg(1) : null;`
`75`	`72`
`76`		`- parent::start($callback);`
	`73`	`+ parent::start($callback, $env);`
`77`	`74`	`}`
`78`	`75`	`}`