-
Notifications
You must be signed in to change notification settings - Fork 546
Made closure php-src cachable #4724
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
staabm
wants to merge
5
commits into
phpstan:2.1.x
Choose a base branch
from
staabm:cache.closure
base: 2.1.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.
+326
−103
Open
Changes from all commits
Commits
Show all changes
5 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
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,29 @@ | ||
| <?php declare(strict_types = 1); | ||
|
|
||
| namespace PHPStan\Analyser\Traverser; | ||
|
|
||
| use PHPStan\Type\IntersectionType; | ||
| use PHPStan\Type\StaticType; | ||
| use PHPStan\Type\ThisType; | ||
| use PHPStan\Type\Type; | ||
| use PHPStan\Type\UnionType; | ||
|
|
||
| final class CloneTypeTraverser | ||
| { | ||
|
|
||
| /** | ||
| * @param callable(Type): Type $traverse | ||
| */ | ||
| public function __invoke(Type $type, callable $traverse): Type | ||
| { | ||
| if ($type instanceof UnionType || $type instanceof IntersectionType) { | ||
| return $traverse($type); | ||
| } | ||
| if ($type instanceof ThisType) { | ||
| return new StaticType($type->getClassReflection(), $type->getSubtractedType()); | ||
| } | ||
|
|
||
| return $type; | ||
| } | ||
|
|
||
| } |
45 changes: 45 additions & 0 deletions
45
src/Analyser/Traverser/ConstructorClassTemplateTraverser.php
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,45 @@ | ||
| <?php declare(strict_types = 1); | ||
|
|
||
| namespace PHPStan\Analyser\Traverser; | ||
|
|
||
| use PHPStan\Type\Generic\TemplateType; | ||
| use PHPStan\Type\Type; | ||
| use function array_key_exists; | ||
|
|
||
| final class ConstructorClassTemplateTraverser | ||
| { | ||
|
|
||
| /** | ||
| * @param array<string, Type> $classTemplateTypes | ||
| */ | ||
| public function __construct( | ||
| private array $classTemplateTypes, | ||
| ) | ||
| { | ||
| } | ||
|
|
||
| /** | ||
| * @param callable(Type): Type $traverse | ||
| */ | ||
| public function __invoke(Type $type, callable $traverse): Type | ||
| { | ||
| if ($type instanceof TemplateType && array_key_exists($type->getName(), $this->classTemplateTypes)) { | ||
| $classTemplateType = $this->classTemplateTypes[$type->getName()]; | ||
| if ($classTemplateType instanceof TemplateType && $classTemplateType->getScope()->equals($type->getScope())) { | ||
| unset($this->classTemplateTypes[$type->getName()]); | ||
| } | ||
| return $type; | ||
| } | ||
|
|
||
| return $traverse($type); | ||
| } | ||
|
|
||
| /** | ||
| * @return array<string, Type> | ||
| */ | ||
| public function getClassTemplateTypes(): array | ||
| { | ||
| return $this->classTemplateTypes; | ||
| } | ||
|
|
||
| } |
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,37 @@ | ||
| <?php declare(strict_types = 1); | ||
|
|
||
| namespace PHPStan\Analyser\Traverser; | ||
|
|
||
| use PHPStan\Type\ErrorType; | ||
| use PHPStan\Type\Generic\TemplateType; | ||
| use PHPStan\Type\Generic\TemplateTypeHelper; | ||
| use PHPStan\Type\Generic\TemplateTypeMap; | ||
| use PHPStan\Type\Type; | ||
|
|
||
| final class GenericTypeTemplateTraverser | ||
| { | ||
|
|
||
| public function __construct( | ||
| private TemplateTypeMap $resolvedTemplateTypeMap, | ||
| ) | ||
| { | ||
| } | ||
|
|
||
| /** | ||
| * @param callable(Type): Type $traverse | ||
| */ | ||
| public function __invoke(Type $type, callable $traverse): Type | ||
| { | ||
| if ($type instanceof TemplateType && !$type->isArgument()) { | ||
| $newType = $this->resolvedTemplateTypeMap->getType($type->getName()); | ||
| if ($newType === null || $newType instanceof ErrorType) { | ||
| return $type->getDefault() ?? $type->getBound(); | ||
| } | ||
|
|
||
| return TemplateTypeHelper::generalizeInferredTemplateType($type, $newType); | ||
| } | ||
|
|
||
| return $traverse($type); | ||
| } | ||
|
|
||
| } |
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,46 @@ | ||
| <?php declare(strict_types = 1); | ||
|
|
||
| namespace PHPStan\Analyser\Traverser; | ||
|
|
||
| use PHPStan\Type\Constant\ConstantStringType; | ||
| use PHPStan\Type\Generic\GenericClassStringType; | ||
| use PHPStan\Type\IntersectionType; | ||
| use PHPStan\Type\MixedType; | ||
| use PHPStan\Type\ObjectType; | ||
| use PHPStan\Type\Type; | ||
| use PHPStan\Type\UnionType; | ||
|
|
||
| final class InstanceOfClassTypeTraverser | ||
| { | ||
|
|
||
| private bool $uncertainty = false; | ||
|
|
||
| /** | ||
| * @param callable(Type): Type $traverse | ||
| */ | ||
| public function __invoke(Type $type, callable $traverse): Type | ||
| { | ||
| if ($type instanceof UnionType || $type instanceof IntersectionType) { | ||
| return $traverse($type); | ||
| } | ||
|
|
||
| if ($type->getObjectClassNames() !== []) { | ||
| $this->uncertainty = true; | ||
| return $type; | ||
| } | ||
| if ($type instanceof GenericClassStringType) { | ||
| $this->uncertainty = true; | ||
| return $type->getGenericType(); | ||
| } | ||
| if ($type instanceof ConstantStringType) { | ||
| return new ObjectType($type->getValue()); | ||
| } | ||
| return new MixedType(); | ||
| } | ||
|
|
||
| public function getUncertainty(): bool | ||
| { | ||
| return $this->uncertainty; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.
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.
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.
@ondrejmirtes I wonder why this errors show up now, but it seems they were not reported when 1:1 the same code was part of MutatingScope class. I could not find ignore-error rules or something which would swallow them either.
besides that, I think this PR is ready to merge.
I would do more *Traverser-extractions in separate PRs, as we have too many of them.