bug #25304 [Bridge/PhpUnit] Prefer $_SERVER['argv'] over $argv (ricknox)

fabpot · fabpot · commit 31e4533f1322 · 2017-12-04T12:15:54.000-08:00
This PR was submitted for the master branch but it was squashed and merged into the 3.3 branch instead (closes #25304). Discussion ---------- [Bridge/PhpUnit] Prefer $_SERVER['argv'] over $argv | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a This makes the script usable even if it is wrapped into another script, which is what some IDEs like PHPStorm do. Commits ------- 1ff22e6 [Bridge/PhpUnit] Prefer ['argv'] over
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -108,6 +108,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
`@@ -108,6 +108,9 @@ EOPHP`
`108`	`108`
`109`	`109`	`}`
`110`	`110`
	`111`	`+global $argv, $argc;`
	`112`	`+$argv = isset($_SERVER['argv']) ? $_SERVER['argv'] : array();`
	`113`	`+$argc = isset($_SERVER['argc']) ? $_SERVER['argc'] : 0;`
`111`	`114`	`$components = array();`
`112`	`115`	`$cmd = array_map('escapeshellarg', $argv);`
`113`	`116`	`$exit = 0;`