Skip to content

Speed improvements 2 #88

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.

Sign up for GitHub

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
merged 2 commits into from
Jan 5, 2020
Merged

Speed improvements 2 #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de805d6
Cache pretty printed expression
lookyman Jan 5, 2020
da87354
Cache reflection filename
lookyman Jan 5, 2020
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
8 changes: 7 additions & 1 deletion src/Analyser/MutatingScope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,13 @@ public function getAnonymousFunctionReturnType(): ?\PHPStan\Type\Type

public function getType(Expr $node): Type
{
$key = $this->printer->prettyPrintExpr($node);
/** @var string|null $key */
$key = $node->getAttribute('phpstan_cache_printer');
if ($key === null) {
$key = $this->printer->prettyPrintExpr($node);
$node->setAttribute('phpstan_cache_printer', $key);
}

if (!array_key_exists($key, $this->resolvedTypes)) {
$this->resolvedTypes[$key] = $this->resolveType($node);
}
Expand Down
15 changes: 11 additions & 4 deletions src/Reflection/ClassReflection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ class ClassReflection implements ReflectionWithFilename
/** @var array<string, bool> */
private $subclasses = [];

/** @var string|false|null */
private $filename;

/**
* @param \PHPStan\Reflection\ReflectionProvider $reflectionProvider
* @param \PHPStan\Type\FileTypeMapper $fileTypeMapper
Expand Down Expand Up @@ -127,19 +130,23 @@ public function getNativeReflection(): \ReflectionClass
*/
public function getFileName()
{
if (isset($this->filename)) {
return $this->filename;
}

if ($this->anonymousFilename !== null) {
return $this->anonymousFilename;
return $this->filename = $this->anonymousFilename;
}
$fileName = $this->reflection->getFileName();
if ($fileName === false) {
return false;
return $this->filename = false;
}

if (!file_exists($fileName)) {
return false;
return $this->filename = false;
}

return $fileName;
return $this->filename = $fileName;
}

public function getFileNameWithPhpDocs(): ?string
Expand Down