Skip to content

Commit

Permalink
Performance: Improve node name resolver performance (#3506)
Browse files Browse the repository at this point in the history
* Performance: Improve node name resolver performance

* Fix phpstan

* Add regex example link

* Fix CR comments
  • Loading branch information
keulinho committed Mar 23, 2023
1 parent 8609d3b commit 697479f
Showing 1 changed file with 55 additions and 16 deletions.
71 changes: 55 additions & 16 deletions packages/NodeNameResolver/NodeNameResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,18 @@

final class NodeNameResolver
{
/**
* Used to check if a string might contain a regex or fnmatch pattern
*
* @var string
* @see https://regex101.com/r/ImTV1W/1
*/
private const CONTAINS_WILDCARD_CHARS_REGEX = '/[\*\#\~\/]/';
/**
* @var array<string, NodeNameResolverInterface|null>
*/
private array $nodeNameResolversByClass = [];

/**
* @param NodeNameResolverInterface[] $nodeNameResolvers
*/
Expand Down Expand Up @@ -117,12 +129,9 @@ public function getName(Node | string $node): ?string
$this->invalidNameNodeReporter->reportInvalidNodeForName($node);
}

foreach ($this->nodeNameResolvers as $nodeNameResolver) {
if (! is_a($node, $nodeNameResolver->getNode(), true)) {
continue;
}

return $nodeNameResolver->resolve($node);
$resolvedName = $this->resolveNodeName($node);
if ($resolvedName !== null) {
return $resolvedName;
}

// more complex
Expand Down Expand Up @@ -188,21 +197,23 @@ public function isStringName(string $resolvedName, string $desiredName): bool
return false;
}

// is probably regex pattern
if ($this->regexPatternDetector->isRegexPattern($desiredName)) {
return StringUtils::isMatch($resolvedName, $desiredName);
}

// is probably fnmatch
if (\str_contains($desiredName, '*')) {
return fnmatch($desiredName, $resolvedName, FNM_NOESCAPE);
}

// special case
if ($desiredName === 'Object') {
return $desiredName === $resolvedName;
}

if (StringUtils::isMatch($desiredName, self::CONTAINS_WILDCARD_CHARS_REGEX)) {
// is probably regex pattern
if ($this->regexPatternDetector->isRegexPattern($desiredName)) {
return StringUtils::isMatch($resolvedName, $desiredName);
}

// is probably fnmatch
if (\str_contains($desiredName, '*')) {
return fnmatch($desiredName, $resolvedName, FNM_NOESCAPE);
}
}

return strtolower($resolvedName) === strtolower($desiredName);
}

Expand All @@ -229,4 +240,32 @@ private function isSingleName(Node $node, string $desiredName): bool

return $this->isStringName($resolvedName, $desiredName);
}

private function resolveNodeName(Node $node): ?string
{
$nodeClass = $node::class;
if (array_key_exists($nodeClass, $this->nodeNameResolversByClass)) {
$resolver = $this->nodeNameResolversByClass[$nodeClass];

if ($resolver instanceof NodeNameResolverInterface) {
return $resolver->resolve($node);
}

return null;
}

foreach ($this->nodeNameResolvers as $nodeNameResolver) {
if (!\is_a($node, $nodeNameResolver->getNode(), \true)) {
continue;
}

$this->nodeNameResolversByClass[$nodeClass] = $nodeNameResolver;

return $nodeNameResolver->resolve($node);
}

$this->nodeNameResolversByClass[$nodeClass] = null;

return null;
}
}

0 comments on commit 697479f

Please sign in to comment.