Fix "Differing behaviors when requiring or including relatively vs using __DIR__"#5862
Draft
staabm wants to merge 8 commits into
Draft
Fix "Differing behaviors when requiring or including relatively vs using __DIR__"#5862staabm wants to merge 8 commits into
staabm wants to merge 8 commits into
Conversation
staabm
commented
Jun 13, 2026
Comment on lines
+159
to
+161
| if ($expr->left instanceof Node\Scalar\MagicConst\Dir && $expr->right instanceof Node\Scalar\String_) { | ||
| return new Node\Scalar\String_(dirname($scope->getFile()) . $expr->right->value); | ||
| } |
Contributor
Author
There was a problem hiding this comment.
instead of relying on InitializerExprTypeResolver->getType() to resolve the path based on the global usePathConstantsAsConstantString config, we resolve the path here independently of usePathConstantsAsConstantString, which allows us to report an error for the case in question
staabm
commented
Jun 13, 2026
| ); | ||
| } | ||
|
|
||
| public function testBug12203NoConstantPath(): void |
Contributor
Author
There was a problem hiding this comment.
same test as in tests/PHPStan/Rules/Keywords/RequireFileExistsRuleTest.php but without usePathConstantsAsConstantString: true defined via neon-config
staabm
commented
Jun 13, 2026
Comment on lines
+3
to
+5
| if (file_exists(__DIR__ . '/../vendor/autoload.php')) { | ||
| require __DIR__ . '/../vendor/autoload.php'; | ||
| } |
Contributor
Author
There was a problem hiding this comment.
in addition to the initial issue, this PR also prevents a error when a given path was checked with file_exists/is_file before require/include
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
closes phpstan/phpstan#12203