Skip to content

Commit d0a55f3

Browse files
committed
Forget class-level templates in static memebers only in bleeding edge
1 parent 066a148 commit d0a55f3

3 files changed

Lines changed: 10 additions & 1 deletion

File tree

‎conf/bleedingEdge.neon‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@ parameters:
3131
closureDefaultParameterTypeRule: true
3232
newRuleLevelHelper: true
3333
instanceofType: true
34+
disallowClassLevelTemplatesInStatic: true

‎conf/config.neon‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ parameters:
6161
closureDefaultParameterTypeRule: false
6262
newRuleLevelHelper: false
6363
instanceofType: false
64+
disallowClassLevelTemplatesInStatic: false
6465
fileExtensions:
6566
- php
6667
checkAdvancedIsset: false
@@ -288,6 +289,7 @@ parametersSchema:
288289
closureDefaultParameterTypeRule: bool()
289290
newRuleLevelHelper: bool()
290291
instanceofType: bool()
292+
disallowClassLevelTemplatesInStatic: bool()
291293
])
292294
fileExtensions: listOf(string())
293295
checkAdvancedIsset: bool()
@@ -1125,6 +1127,7 @@ services:
11251127
class: PHPStan\Type\FileTypeMapper
11261128
arguments:
11271129
phpParser: @defaultAnalysisParser
1130+
disallowClassLevelTemplatesInStatic: %featureToggles.disallowClassLevelTemplatesInStatic%
11281131

11291132
-
11301133
class: PHPStan\Type\TypeAliasResolver

‎src/Type/FileTypeMapper.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public function __construct(
6363
private PhpDocNodeResolver $phpDocNodeResolver,
6464
private AnonymousClassNameHelper $anonymousClassNameHelper,
6565
private FileHelper $fileHelper,
66+
private bool $disallowClassLevelTemplatesInStatic,
6667
)
6768
{
6869
}
@@ -309,7 +310,11 @@ function (Node $node) use ($fileName, $lookForTrait, &$traitFound, $traitMethodA
309310
$typeMapCb = $typeMapStack[count($typeMapStack) - 1] ?? null;
310311

311312
// static methods exist in their own scope
312-
if ($node instanceof Node\Stmt\ClassMethod && $node->isStatic()) {
313+
if (
314+
$this->disallowClassLevelTemplatesInStatic
315+
&& $node instanceof Node\Stmt\ClassMethod
316+
&& $node->isStatic()
317+
) {
313318
$typeMapCb = null;
314319
}
315320

0 commit comments

Comments
 (0)