Implement GH-10024: support linting multiple files at once using php -l #10710
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| --TEST-- | ||
| multiple files syntax check | ||
| --SKIPIF-- | ||
| <?php include "skipif.inc"; ?> | ||
| --INI-- | ||
| display_errors=stdout | ||
| --FILE-- | ||
| <?php | ||
| include "include.inc"; | ||
|
|
||
| function run_and_output($cmd) { | ||
| if (!defined("PHP_WINDOWS_VERSION_MAJOR")) { | ||
| $cmd .= " 2>/dev/null"; | ||
| } | ||
| exec($cmd, $output, $exit_code); | ||
| print_r($output); | ||
| // Normalize Windows vs Linux exit codes. On Windows exit code -1 is actually -1 instead of 255. | ||
| if ($exit_code < 0) { | ||
| $exit_code += 256; | ||
| } | ||
| var_dump($exit_code); | ||
| } | ||
|
|
||
| $php = get_cgi_path(); | ||
| reset_env_vars(); | ||
|
|
||
| $filename_good = __DIR__."/012_good.test.php"; | ||
| $filename_good_escaped = escapeshellarg($filename_good); | ||
| $filename_bad = __DIR__."/012_bad.test.php"; | ||
| $filename_bad_escaped = escapeshellarg($filename_bad); | ||
|
|
||
| $code = ' | ||
| <?php | ||
|
|
||
| echo "hi"; | ||
| '; | ||
|
|
||
| file_put_contents($filename_good, $code); | ||
|
|
||
| $code = ' | ||
| <?php | ||
|
|
||
| class test | ||
| private $var; | ||
| } | ||
|
|
||
| ?> | ||
| '; | ||
|
|
||
| file_put_contents($filename_bad, $code); | ||
|
|
||
| run_and_output("$php -n -l $filename_good_escaped $filename_good_escaped"); | ||
| run_and_output("$php -n -l $filename_good_escaped some.unknown $filename_good_escaped"); | ||
| run_and_output("$php -n -l $filename_good_escaped $filename_bad_escaped $filename_good_escaped"); | ||
| run_and_output("$php -n -l $filename_bad_escaped $filename_bad_escaped"); | ||
| run_and_output("$php -n -l $filename_bad_escaped some.unknown $filename_bad_escaped"); | ||
| run_and_output("$php -n -l $filename_bad_escaped $filename_bad_escaped some.unknown"); | ||
|
|
||
| echo "Done\n"; | ||
| ?> | ||
| --CLEAN-- | ||
| <?php | ||
| @unlink($filename_good); | ||
| @unlink($filename_bad); | ||
| ?> | ||
| --EXPECTF-- | ||
| Array | ||
| ( | ||
| [0] => No syntax errors detected in %s012_good.test.php | ||
| [1] => No syntax errors detected in %s012_good.test.php | ||
| ) | ||
| int(0) | ||
| Array | ||
| ( | ||
| [0] => No syntax errors detected in %s012_good.test.php | ||
| [1] => No input file specified. | ||
|
There was a problem hiding this comment. This differs in behavior with CLI, in that it aborts when a file is not found. Is this a limitation? There was a problem hiding this comment. Yeah we'd need to change error handling in lines 2451-2488: if a file cannot be opened or accessed CGI aborts. But I'm not sure if we should special case it because it will make things more complicated and possibly slow down regular use of CGI. Let me know what you think. There was a problem hiding this comment. I doubt linting is often used with php-cgi, so this should be ok. |
||
| ) | ||
| int(255) | ||
| Array | ||
| ( | ||
| [0] => No syntax errors detected in %s012_good.test.php | ||
| [1] => <br /> | ||
| [2] => <b>Parse error</b>: syntax error, unexpected token "private", expecting "{" in <b>%s012_bad.test.php</b> on line <b>5</b><br /> | ||
| [3] => Errors parsing %s012_bad.test.php | ||
| [4] => No syntax errors detected in %s012_good.test.php | ||
| ) | ||
| int(255) | ||
| Array | ||
| ( | ||
| [0] => <br /> | ||
| [1] => <b>Parse error</b>: syntax error, unexpected token "private", expecting "{" in <b>%s012_bad.test.php</b> on line <b>5</b><br /> | ||
| [2] => Errors parsing %s012_bad.test.php | ||
| [3] => <br /> | ||
| [4] => <b>Parse error</b>: syntax error, unexpected token "private", expecting "{" in <b>%s012_bad.test.php</b> on line <b>5</b><br /> | ||
| [5] => Errors parsing %s012_bad.test.php | ||
| ) | ||
| int(255) | ||
| Array | ||
| ( | ||
| [0] => <br /> | ||
| [1] => <b>Parse error</b>: syntax error, unexpected token "private", expecting "{" in <b>%s012_bad.test.php</b> on line <b>5</b><br /> | ||
| [2] => Errors parsing %s012_bad.test.php | ||
| [3] => No input file specified. | ||
| ) | ||
| int(255) | ||
| Array | ||
| ( | ||
| [0] => <br /> | ||
| [1] => <b>Parse error</b>: syntax error, unexpected token "private", expecting "{" in <b>%s012_bad.test.php</b> on line <b>5</b><br /> | ||
| [2] => Errors parsing %s012_bad.test.php | ||
| [3] => <br /> | ||
| [4] => <b>Parse error</b>: syntax error, unexpected token "private", expecting "{" in <b>%s012_bad.test.php</b> on line <b>5</b><br /> | ||
| [5] => Errors parsing %s012_bad.test.php | ||
| [6] => No input file specified. | ||
| ) | ||
| int(255) | ||
| Done | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| --TEST-- | ||
| multiple files syntax check | ||
| --SKIPIF-- | ||
| <?php include "skipif.inc"; ?> | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| function run_and_output($cmd) { | ||
| exec($cmd, $output, $exit_code); | ||
| print_r($output); | ||
| var_dump($exit_code); | ||
| } | ||
|
|
||
| $php = getenv('TEST_PHP_EXECUTABLE_ESCAPED'); | ||
|
|
||
| $filename_good = __DIR__."/024_good.test.php"; | ||
| $filename_good_escaped = escapeshellarg($filename_good); | ||
| $filename_bad = __DIR__."/024_bad.test.php"; | ||
| $filename_bad_escaped = escapeshellarg($filename_bad); | ||
|
|
||
| $code = ' | ||
| <?php | ||
|
|
||
| echo "hi"; | ||
| '; | ||
|
|
||
| file_put_contents($filename_good, $code); | ||
|
|
||
| $code = ' | ||
| <?php | ||
|
|
||
| class test | ||
| private $var; | ||
| } | ||
|
|
||
| ?> | ||
| '; | ||
|
|
||
| file_put_contents($filename_bad, $code); | ||
|
|
||
| run_and_output("$php -n -l $filename_good_escaped $filename_good_escaped 2>&1"); | ||
| run_and_output("$php -n -l $filename_good_escaped some.unknown $filename_good_escaped 2>&1"); | ||
| run_and_output("$php -n -l $filename_good_escaped $filename_bad_escaped $filename_good_escaped 2>&1"); | ||
| run_and_output("$php -n -l $filename_bad_escaped $filename_bad_escaped 2>&1"); | ||
| run_and_output("$php -n -l $filename_bad_escaped some.unknown $filename_bad_escaped 2>&1"); | ||
| run_and_output("$php -n -l $filename_bad_escaped $filename_bad_escaped some.unknown 2>&1"); | ||
|
|
||
| echo "Done\n"; | ||
| ?> | ||
| --CLEAN-- | ||
| <?php | ||
| @unlink($filename_good); | ||
| @unlink($filename_bad); | ||
| ?> | ||
| --EXPECTF-- | ||
| Array | ||
| ( | ||
| [0] => No syntax errors detected in %s024_good.test.php | ||
| [1] => No syntax errors detected in %s024_good.test.php | ||
| ) | ||
| int(0) | ||
| Array | ||
| ( | ||
| [0] => No syntax errors detected in %s024_good.test.php | ||
| [1] => Could not open input file: some.unknown | ||
| [2] => No syntax errors detected in %s024_good.test.php | ||
| ) | ||
| int(1) | ||
| Array | ||
| ( | ||
| [0] => No syntax errors detected in %s024_good.test.php | ||
| [1] => | ||
| [2] => Parse error: syntax error, unexpected token "private", expecting "{" in %s on line %d | ||
| [3] => Errors parsing %s024_bad.test.php | ||
| [4] => No syntax errors detected in %s024_good.test.php | ||
| ) | ||
| int(255) | ||
| Array | ||
| ( | ||
| [0] => | ||
| [1] => Parse error: syntax error, unexpected token "private", expecting "{" in %s on line %d | ||
| [2] => Errors parsing %s024_bad.test.php | ||
| [3] => | ||
| [4] => Parse error: syntax error, unexpected token "private", expecting "{" in %s on line %d | ||
| [5] => Errors parsing %s024_bad.test.php | ||
| ) | ||
| int(255) | ||
| Array | ||
| ( | ||
| [0] => | ||
| [1] => Parse error: syntax error, unexpected token "private", expecting "{" in %s on line %d | ||
| [2] => Errors parsing %s024_bad.test.php | ||
| [3] => Could not open input file: some.unknown | ||
| [4] => | ||
| [5] => Parse error: syntax error, unexpected token "private", expecting "{" in %s on line %d | ||
| [6] => Errors parsing %s024_bad.test.php | ||
| ) | ||
| int(255) | ||
| Array | ||
| ( | ||
| [0] => | ||
| [1] => Parse error: syntax error, unexpected token "private", expecting "{" in %s on line %d | ||
| [2] => Errors parsing %s024_bad.test.php | ||
| [3] => | ||
| [4] => Parse error: syntax error, unexpected token "private", expecting "{" in %s on line %d | ||
| [5] => Errors parsing %s024_bad.test.php | ||
| [6] => Could not open input file: some.unknown | ||
| ) | ||
| int(1) | ||
| Done |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 error is a bit confusing.
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.
Yeah, this comes from lines 2457-2460. Either we can change the error message for CGI in general, or special case the linting case. I think changing the message in general might be dangerous for BC though.