Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork9.7k
[Bridge/PhpUnit] Prefer $_SERVER['argv'] over $argv#25304
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Conversation
| } | ||
| array_splice($argv,1,0,array('--colors=always')); | ||
| $_SERVER['argv'] =$argv; | ||
| $_SERVER['argc'] = ++$argc; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
this line should not be removed!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
I forgot to put them back while I was debugging. They are back in67cc253.
| array_splice($argv,1,0,array('--colors=always')); | ||
| $_SERVER['argv'] =$argv; | ||
| $_SERVER['argc'] = ++$argc; | ||
| array_splice($_SERVER['argv'],1,0,array('--colors=always')); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
ok, in fact, this change introduces a bug
both$_SERVER['argv'] and$argv must be updated
this breaks the second
| $cmd =array_map('escapeshellarg',$_SERVER['argv']); | ||
| $exit =0; | ||
| if (isset($argv[1]) &&'symfony' ===$argv[1] && !file_exists('symfony') &&file_exists('src/Symfony')) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
if you happen to be running this script in a context where $argv is not defined, then this line will always eval to false, which means it's useless
$argv is expected to be always defined in the current code. A better patch would be to always ensure the vars are defined
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
So the$cmd should be$argv to be sure it is always defined. That means that this is correct code but leaves$argv still used, not sure where to init the variable$_SERVER['argv'] so that$argv will be intact.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
just start the script with:
$argv = isset($_SERVER['argv']) ? $_SERVER['argv'] : array();$argc = isset($_SERVER['argc']) ? $_SERVER['argc'] : 0;There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Ah yea. I was thinking way too deep here. Thank you for your suggestion. I reverted everything in8fbf912 and added the lines at the beginning.
| } | ||
| $argv =isset($_SERVER['argv']) ?$_SERVER['argv'] :array(); |
nicolas-grekasDec 4, 2017 • edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
onle last thing: before this line, add:global $argv, $argc;
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Good catch. Fixed in6140de9.
nicolas-grekas left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
for 3.3
@ricknox as an exercise, you might want to rebase+squash+retarget on 3.3?
otherwise, we can do it while merging.
fabpot commentedDec 4, 2017
No worries @ricknox, I'm taking care of everything. |
fabpot commentedDec 4, 2017
Thank you @ricknox. |
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/aThis 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
Uh oh!
There was an error while loading.Please reload this page.
This makes the script usable even if it is wrapped into another script, which is what some IDEs like PHPStorm do.