Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
],
"files": [
"vendor/symfony/dependency-injection/Loader/Configurator/ContainerConfigurator.php",
"tests/Rules/Rector/PhpUpgradeImplementsMinPhpVersionInterfaceRule/Fixture/SomePhpFeatureRector.php"
"tests/Rules/Rector/PhpUpgradeImplementsMinPhpVersionInterfaceRule/Fixture/SomePhpFeatureRector.php",
"tests/Reflection/Fixture/TwoClassLikes.php"
]
},
"config": {
Expand Down
12 changes: 12 additions & 0 deletions src/NodeFinder/TypeAwareNodeFinder.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,16 @@ public function findFirstInstanceOf(array|Node $nodes, string $type): ?Node
{
return $this->nodeFinder->findFirstInstanceOf($nodes, $type);
}

/**
* @template TNode as Node
*
* @param Node[]|Node $nodes
* @param class-string<TNode> $type
* @return TNode[]
*/
public function findInstanceOf(array|Node $nodes, string $type): array
{
return $this->nodeFinder->findInstanceOf($nodes, $type);
}
}
27 changes: 15 additions & 12 deletions src/Reflection/ReflectionParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ final class ReflectionParser
/**
* @var array<string, ClassLike>
*/
private array $classesByFilename = [];
private array $classLikesByName = [];

private readonly Parser $parser;

Expand Down Expand Up @@ -54,7 +54,7 @@ public function parseClassReflection(ClassReflection $classReflection): ?ClassLi
return null;
}

return $this->parseFilenameToClass($fileName);
return $this->parseFilenameToClass($fileName, $classReflection->getName());
}

private function parseNativeClassReflection(ReflectionClass|ClassReflection $reflectionClass): ?ClassLike
Expand All @@ -68,13 +68,13 @@ private function parseNativeClassReflection(ReflectionClass|ClassReflection $ref
return null;
}

return $this->parseFilenameToClass($fileName);
return $this->parseFilenameToClass($fileName, $reflectionClass->getName());
}

private function parseFilenameToClass(string $fileName): ClassLike|null
private function parseFilenameToClass(string $fileName, string $className): ClassLike|null
{
if (isset($this->classesByFilename[$fileName])) {
return $this->classesByFilename[$fileName];
if (isset($this->classLikesByName[$className])) {
return $this->classLikesByName[$className];
}

try {
Expand All @@ -92,13 +92,16 @@ private function parseFilenameToClass(string $fileName): ClassLike|null
return null;
}

$classLike = $this->typeAwareNodeFinder->findFirstInstanceOf($stmts, ClassLike::class);
if (! $classLike instanceof ClassLike) {
return null;
}
foreach ($this->typeAwareNodeFinder->findInstanceOf($stmts, ClassLike::class) as $classLike) {
if ($classLike->namespacedName?->toString() !== $className) {
continue;
}

$this->classLikesByName[$className] = $classLike;

$this->classesByFilename[$fileName] = $classLike;
return $classLike;
}

return $classLike;
return null;
}
}
19 changes: 19 additions & 0 deletions tests/Reflection/Fixture/TwoClassLikes.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php

declare(strict_types=1);

namespace Symplify\PHPStanRules\Tests\Reflection\Fixture;

final class FirstClassLike
{
public function firstMethod(): void
{
}
}

final class SecondClassLike
{
public function secondMethod(): void
{
}
}
32 changes: 32 additions & 0 deletions tests/Reflection/ReflectionParserTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php

declare(strict_types=1);

namespace Symplify\PHPStanRules\Tests\Reflection;

use PhpParser\Node\Stmt\ClassMethod;
use PHPUnit\Framework\TestCase;
use ReflectionMethod;
use Symplify\PHPStanRules\NodeFinder\TypeAwareNodeFinder;
use Symplify\PHPStanRules\Reflection\ReflectionParser;
use Symplify\PHPStanRules\Tests\Reflection\Fixture\SecondClassLike;

final class ReflectionParserTest extends TestCase
{
private ReflectionParser $reflectionParser;

protected function setUp(): void
{
$this->reflectionParser = new ReflectionParser(new TypeAwareNodeFinder());
}

public function testParseMethodOfSecondClassLikeInFile(): void
{
$reflectionMethod = new ReflectionMethod(SecondClassLike::class, 'secondMethod');

$classMethod = $this->reflectionParser->parseMethodReflection($reflectionMethod);

$this->assertInstanceOf(ClassMethod::class, $classMethod);
$this->assertSame('secondMethod', $classMethod->name->toString());
}
}
Loading