Merge branch '3.4' into 4.0

fabpot · fabpot · commit 4db9c89aeb07 · 2017-12-04T12:23:32.000-08:00
* 3.4:
  [Bridge/PhpUnit] Prefer ['argv'] over
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -124,6 +124,9 @@ EOPHP
 
 }
 
+global $argv, $argc;
+$argv = isset($_SERVER['argv']) ? $_SERVER['argv'] : array();
+$argc = isset($_SERVER['argc']) ? $_SERVER['argc'] : 0;
 $components = array();
 $cmd = array_map('escapeshellarg', $argv);
 $exit = 0;

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,9 @@ EOPHP`
`124`	`124`
`125`	`125`	`}`
`126`	`126`
	`127`	`+global $argv, $argc;`
	`128`	`+$argv = isset($_SERVER['argv']) ? $_SERVER['argv'] : array();`
	`129`	`+$argc = isset($_SERVER['argc']) ? $_SERVER['argc'] : 0;`
`127`	`130`	`$components = array();`
`128`	`131`	`$cmd = array_map('escapeshellarg', $argv);`
`129`	`132`	`$exit = 0;`