-
Notifications
You must be signed in to change notification settings - Fork 578
Track file dependencies for global constant fetches #6023
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
Open
SanderMuller
wants to merge
2
commits into
phpstan:2.2.x
Choose a base branch
from
SanderMuller:const-dependency-tracking
base: 2.2.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| parameters: | ||
| level: 8 | ||
| paths: | ||
| - src | ||
| tmpDir: tmp |
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,8 @@ | ||
| --- src/Constants.php | ||
| +++ src/Constants.php | ||
| @@ -2,4 +2,4 @@ | ||
|
|
||
| namespace ResultCacheE2EConstants; | ||
|
|
||
| -const SOME_MODE = 1; | ||
| +const RENAMED_MODE = 1; |
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,13 @@ | ||
| <?php | ||
|
|
||
| namespace ResultCacheE2EConstants; | ||
|
|
||
| class ClassUsingConstant | ||
| { | ||
|
|
||
| public function getMode(): int | ||
| { | ||
| return SOME_MODE; | ||
| } | ||
|
|
||
| } |
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,5 @@ | ||
| <?php | ||
|
|
||
| namespace ResultCacheE2EConstants; | ||
|
|
||
| const SOME_MODE = 1; |
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,2 @@ | ||
| * | ||
| !.* |
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,70 @@ | ||
| <?php declare(strict_types = 1); | ||
|
|
||
| namespace PHPStan\Dependency\ExportedNode; | ||
|
|
||
| use JsonSerializable; | ||
| use Override; | ||
| use PHPStan\Dependency\ExportedNode; | ||
| use ReturnTypeWillChange; | ||
|
|
||
| final class ExportedConstantNode implements ExportedNode, JsonSerializable | ||
| { | ||
|
|
||
| public function __construct(private string $name, private string $value) | ||
| { | ||
| } | ||
|
|
||
| public function getName(): string | ||
| { | ||
| return $this->name; | ||
| } | ||
|
|
||
| public function equals(ExportedNode $node): bool | ||
| { | ||
| if (!$node instanceof self) { | ||
| return false; | ||
| } | ||
|
|
||
| return $this->name === $node->name | ||
| && $this->value === $node->value; | ||
| } | ||
|
|
||
| /** | ||
| * @param mixed[] $properties | ||
| */ | ||
| public static function __set_state(array $properties): self | ||
| { | ||
| return new self( | ||
| $properties['name'], | ||
| $properties['value'], | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @param mixed[] $data | ||
| */ | ||
| public static function decode(array $data): self | ||
| { | ||
| return new self( | ||
| $data['name'], | ||
| $data['value'], | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @return mixed | ||
| */ | ||
| #[ReturnTypeWillChange] | ||
| #[Override] | ||
| public function jsonSerialize() | ||
| { | ||
| return [ | ||
| 'type' => self::class, | ||
| 'data' => [ | ||
| 'name' => $this->name, | ||
| 'value' => $this->value, | ||
| ], | ||
| ]; | ||
| } | ||
|
|
||
| } |
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,94 @@ | ||
| <?php declare(strict_types = 1); | ||
|
|
||
| namespace PHPStan\Dependency\ExportedNode; | ||
|
|
||
| use JsonSerializable; | ||
| use Override; | ||
| use PHPStan\Dependency\ExportedNode; | ||
| use PHPStan\Dependency\RootExportedNode; | ||
| use PHPStan\ShouldNotHappenException; | ||
| use ReturnTypeWillChange; | ||
| use function array_map; | ||
| use function count; | ||
|
|
||
| final class ExportedConstantsNode implements RootExportedNode, JsonSerializable | ||
| { | ||
|
|
||
| /** | ||
| * @param ExportedConstantNode[] $constants | ||
| */ | ||
| public function __construct(private array $constants) | ||
| { | ||
| } | ||
|
|
||
| public function getType(): string | ||
| { | ||
| return self::TYPE_CONSTANT; | ||
| } | ||
|
|
||
| public function getName(): string | ||
| { | ||
| return $this->constants[0]->getName(); | ||
| } | ||
|
|
||
| public function equals(ExportedNode $node): bool | ||
| { | ||
| if (!$node instanceof self) { | ||
| return false; | ||
| } | ||
|
|
||
| if (count($this->constants) !== count($node->constants)) { | ||
| return false; | ||
| } | ||
|
|
||
| foreach ($this->constants as $i => $constant) { | ||
| if (!$constant->equals($node->constants[$i])) { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| /** | ||
| * @param mixed[] $properties | ||
| */ | ||
| public static function __set_state(array $properties): self | ||
| { | ||
| return new self( | ||
| $properties['constants'], | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @param mixed[] $data | ||
| */ | ||
| public static function decode(array $data): self | ||
| { | ||
| return new self( | ||
| array_map(static function (array $constantData): ExportedConstantNode { | ||
| if ($constantData['type'] !== ExportedConstantNode::class) { | ||
| throw new ShouldNotHappenException(); | ||
| } | ||
|
|
||
| return ExportedConstantNode::decode($constantData['data']); | ||
| }, $data['constants']), | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @return mixed | ||
| */ | ||
| #[ReturnTypeWillChange] | ||
| #[Override] | ||
| public function jsonSerialize() | ||
| { | ||
| return [ | ||
| 'type' => self::class, | ||
| 'data' => [ | ||
| 'constants' => $this->constants, | ||
| ], | ||
| ]; | ||
| } | ||
|
|
||
| } |
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,5 @@ | ||
| <?php declare(strict_types = 1); | ||
|
|
||
| namespace ConstDependencyTest; | ||
|
|
||
| const SOME_MODE = 1; |
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,8 @@ | ||
| <?php declare(strict_types = 1); | ||
|
|
||
| namespace ConstDependencyTest; | ||
|
|
||
| function useMode(): int | ||
| { | ||
| return SOME_MODE; | ||
| } |
Oops, something went wrong.
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.
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.
changes in
DependencyResolverare usually covered with a e2e tests, see e.g. e5db864There 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.
Adding the e2e test actually surfaced a gap, working on it!
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.
Thanks, good catch. I added
e2e/result-cache-constantsmodelled onresult-cache-traits: it analyses, renames a global constant via a patch, and asserts the file reading it re-analyses and reports the constant as undefined.Writing the e2e surfaced that the dependency edge alone wasn't enough: global constant declarations weren't exported nodes either, so a constant change never invalidated the reading files (the result cache re-analyses a changed file's dependents only when its exported nodes change). I pushed a second commit exporting global constants (name + value), like class constants already are. With both, the e2e fails before the change and passes after.