Skip to content

Commit f10682b

Browse files
committed
[DI] Autodiscover PhpParserNodeMapper, match most specific over registration order
1 parent ba9c1c1 commit f10682b

3 files changed

Lines changed: 18 additions & 32 deletions

File tree

‎.github/workflows/code_analysis.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
-
5454
name: 'Active Classes'
5555
run: |
56-
vendor/bin/class-leak check bin config src rules utils --skip-suffix "Rector" --skip-type="Rector\\Utils\\Compiler\\Unprefixer" --skip-type="Rector\\NodeCollector\\BinaryOpConditionsCollector" --skip-type="Rector\\Set\\Contract\\SetListInterface" --skip-type="Rector\\DependencyInjection\\PHPStan\\RichParserFactory" --skip-type="Rector\\Utils\\PHPStan\\Tests\\Rule\\SingleServiceRegistrationRule\\Source\\DuplicateRegistrationFactory" --skip-type="Rector\\Utils\\PHPStan\\Tests\\Rule\\SingleServiceRegistrationRule\\Source\\SingleRegistrationFactory" --skip-type="Rector\\ChangesReporting\\Contract\\Output\\OutputFormatterInterface" --skip-type="Rector\\NodeTypeResolver\\Contract\\NodeTypeResolverInterface" --skip-type="Rector\\CodingStyle\\Contract\\ClassNameImport\\ClassNameImportSkipVoterInterface" --skip-type="Rector\\Php80\\Contract\\ConverterAttributeDecoratorInterface" --skip-type="Rector\\NodeNameResolver\\Contract\\NodeNameResolverInterface" --skip-type="Rector\\StaticTypeMapper\\Contract\\PhpDocParser\\PhpDocTypeMapperInterface" --skip-type="Rector\\PhpAttribute\\Contract\\AnnotationToAttributeMapperInterface" --skip-type="Rector\\PHPStanStaticTypeMapper\\Contract\\TypeMapperInterface"
56+
vendor/bin/class-leak check bin config src rules utils --skip-suffix "Rector" --skip-type="Rector\\Utils\\Compiler\\Unprefixer" --skip-type="Rector\\NodeCollector\\BinaryOpConditionsCollector" --skip-type="Rector\\Set\\Contract\\SetListInterface" --skip-type="Rector\\DependencyInjection\\PHPStan\\RichParserFactory" --skip-type="Rector\\Utils\\PHPStan\\Tests\\Rule\\SingleServiceRegistrationRule\\Source\\DuplicateRegistrationFactory" --skip-type="Rector\\Utils\\PHPStan\\Tests\\Rule\\SingleServiceRegistrationRule\\Source\\SingleRegistrationFactory" --skip-type="Rector\\ChangesReporting\\Contract\\Output\\OutputFormatterInterface" --skip-type="Rector\\NodeTypeResolver\\Contract\\NodeTypeResolverInterface" --skip-type="Rector\\CodingStyle\\Contract\\ClassNameImport\\ClassNameImportSkipVoterInterface" --skip-type="Rector\\Php80\\Contract\\ConverterAttributeDecoratorInterface" --skip-type="Rector\\NodeNameResolver\\Contract\\NodeNameResolverInterface" --skip-type="Rector\\StaticTypeMapper\\Contract\\PhpDocParser\\PhpDocTypeMapperInterface" --skip-type="Rector\\PhpAttribute\\Contract\\AnnotationToAttributeMapperInterface" --skip-type="Rector\\PHPStanStaticTypeMapper\\Contract\\TypeMapperInterface" --skip-type="Rector\\StaticTypeMapper\\Contract\\PhpParser\\PhpParserNodeMapperInterface"
5757
5858
-
5959
name: 'Compatible PHPStan versions'

‎src/DependencyInjection/LazyContainerFactory.php‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,6 @@
8282
use Rector\Rector\AbstractRector;
8383
use Rector\Skipper\Skipper\Skipper;
8484
use Rector\Skipper\Skipper\UsedSkipCollector;
85-
use Rector\StaticTypeMapper\Contract\PhpParser\PhpParserNodeMapperInterface;
86-
use Rector\StaticTypeMapper\PhpParser\ExprNodeMapper;
87-
use Rector\StaticTypeMapper\PhpParser\FullyQualifiedNodeMapper;
88-
use Rector\StaticTypeMapper\PhpParser\IdentifierNodeMapper;
89-
use Rector\StaticTypeMapper\PhpParser\IntersectionTypeNodeMapper;
90-
use Rector\StaticTypeMapper\PhpParser\NameNodeMapper;
91-
use Rector\StaticTypeMapper\PhpParser\NullableTypeNodeMapper;
92-
use Rector\StaticTypeMapper\PhpParser\StringNodeMapper;
93-
use Rector\StaticTypeMapper\PhpParser\UnionTypeNodeMapper;
9485
use Symfony\Component\Console\Application;
9586
use Symfony\Component\Console\Style\SymfonyStyle;
9687
use Webmozart\Assert\Assert;
@@ -149,20 +140,6 @@ final class LazyContainerFactory
149140
PhpVersionFactory::class,
150141
];
151142

152-
/**
153-
* @var array<class-string<PhpParserNodeMapperInterface>>
154-
*/
155-
private const array PHP_PARSER_NODE_MAPPER_CLASSES = [
156-
FullyQualifiedNodeMapper::class,
157-
IdentifierNodeMapper::class,
158-
IntersectionTypeNodeMapper::class,
159-
NameNodeMapper::class,
160-
NullableTypeNodeMapper::class,
161-
StringNodeMapper::class,
162-
UnionTypeNodeMapper::class,
163-
ExprNodeMapper::class,
164-
];
165-
166143
/**
167144
* @api used as next rectorConfig factory
168145
*/
@@ -309,11 +286,7 @@ static function (AbstractRector $rector) use ($rectorConfig): void {
309286
}
310287
);
311288

312-
$this->registerTagged(
313-
$rectorConfig,
314-
self::PHP_PARSER_NODE_MAPPER_CLASSES,
315-
PhpParserNodeMapperInterface::class
316-
);
289+
$rectorConfig->autodiscover(__DIR__ . '/../StaticTypeMapper/PhpParser');
317290

318291
$this->registerTagged(
319292
$rectorConfig,

‎src/StaticTypeMapper/Mapper/PhpParserNodeMapper.php‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,27 @@ public function __construct(
2121

2222
public function mapToPHPStanType(Node $node): Type
2323
{
24+
$matchedNodeMapper = null;
25+
$matchedNodeType = null;
26+
2427
foreach ($this->phpParserNodeMappers as $phpParserNodeMapper) {
25-
if (! is_a($node, $phpParserNodeMapper->getNodeType())) {
28+
$nodeType = $phpParserNodeMapper->getNodeType();
29+
if (! is_a($node, $nodeType)) {
2630
continue;
2731
}
2832

29-
return $phpParserNodeMapper->mapToPHPStan($node);
33+
// pick the most specific mapper: a mapper for a child node wins over one for its
34+
// parent node, regardless of registration order
35+
if ($matchedNodeType === null || is_a($nodeType, $matchedNodeType, true)) {
36+
$matchedNodeType = $nodeType;
37+
$matchedNodeMapper = $phpParserNodeMapper;
38+
}
39+
}
40+
41+
if (! $matchedNodeMapper instanceof PhpParserNodeMapperInterface) {
42+
throw new NotImplementedYetException($node::class);
3043
}
3144

32-
throw new NotImplementedYetException($node::class);
45+
return $matchedNodeMapper->mapToPHPStan($node);
3346
}
3447
}

0 commit comments

Comments
 (0)