-
Notifications
You must be signed in to change notification settings - Fork 547
Improve expression resolving of superglobals #2012
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
ondrejmirtes
merged 6 commits into
phpstan:1.9.x
from
herndlm:improve-superglobal-expression-resolving
Jan 8, 2023
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
b9066bd
Improve expression resolving of superglobals
herndlm 993581b
Add superglobal variable expressions into scope by default
herndlm 7636d84
Remove unused `$explicitMixedForGlobalVariables` arg from `MutatingSc…
herndlm f1817d1
Handle native superglobals separately
herndlm bb1958a
Remove empty phpdoc line
herndlm e541807
Remove unnecessary PHPDoc from internal scope factories
herndlm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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
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
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,59 @@ | ||
| <?php declare(strict_types=1); | ||
|
|
||
| namespace Superglobals; | ||
|
|
||
| use function PHPStan\Testing\assertNativeType; | ||
| use function PHPStan\Testing\assertType; | ||
|
|
||
| class Superglobals | ||
| { | ||
|
|
||
| public function originalTypes(): void | ||
| { | ||
| assertType('array<string, mixed>', $GLOBALS); | ||
| assertType('array<string, mixed>', $_SERVER); | ||
| assertType('array<string, mixed>', $_GET); | ||
| assertType('array<string, mixed>', $_POST); | ||
| assertType('array<string, mixed>', $_FILES); | ||
| assertType('array<string, mixed>', $_COOKIE); | ||
| assertType('array<string, mixed>', $_SESSION); | ||
| assertType('array<string, mixed>', $_REQUEST); | ||
| assertType('array<string, mixed>', $_ENV); | ||
| } | ||
|
|
||
| public function canBeOverwritten(): void | ||
| { | ||
| $GLOBALS = []; | ||
| assertType('array{}', $GLOBALS); | ||
| assertNativeType('array{}', $GLOBALS); | ||
| } | ||
|
|
||
| public function canBePartlyOverwritten(): void | ||
| { | ||
| $GLOBALS['foo'] = 'foo'; | ||
| assertType("non-empty-array<string, mixed>&hasOffsetValue('foo', 'foo')", $GLOBALS); | ||
| assertNativeType("non-empty-array<string, mixed>&hasOffsetValue('foo', 'foo')", $GLOBALS); | ||
| } | ||
|
|
||
| public function canBeNarrowed(): void | ||
| { | ||
| if (isset($GLOBALS['foo'])) { | ||
| assertType("array<string, mixed>&hasOffsetValue('foo', mixed~null)", $GLOBALS); | ||
| assertNativeType("array<string, mixed>&hasOffset('foo')", $GLOBALS); // https://github.com/phpstan/phpstan/issues/8395 | ||
| } else { | ||
| assertType('array<string, mixed>', $GLOBALS); | ||
| assertNativeType('array<string, mixed>', $GLOBALS); | ||
| } | ||
| assertType('array<string, mixed>', $GLOBALS); | ||
| assertNativeType('array<string, mixed>', $GLOBALS); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| function functionScope() { | ||
| assertType('array<string, mixed>', $GLOBALS); | ||
| assertNativeType('array<string, mixed>', $GLOBALS); | ||
| } | ||
|
|
||
| assertType('array<string, mixed>', $GLOBALS); | ||
| assertNativeType('array<string, mixed>', $GLOBALS); |
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.
Uh oh!
There was an error while loading. Please reload this page.