Skip to content

Commit a3039ef

Browse files
ondrejmirtesondrejmirtes
committed
String value passed to Identifier cannot be empty
1 parent 02eb0a8 commit a3039ef

13 files changed

+69
-10
lines changed

Diff for: ‎build/phpstan.neon

+1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ parameters:
9797
- stubs/ReactStreams.stub
9898
- stubs/NetteDIContainer.stub
9999
- stubs/PhpParserName.stub
100+
- stubs/Identifier.stub
100101

101102
rules:
102103
- PHPStan\Build\FinalClassRule

Diff for: ‎build/stubs/Identifier.stub

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?php declare(strict_types=1);
2+
3+
namespace PhpParser\Node;
4+
5+
use PhpParser\NodeAbstract;
6+
7+
class Identifier extends NodeAbstract {
8+
9+
/**
10+
* @param non-empty-string $name
11+
* @param array<string, mixed> $attributes
12+
*/
13+
public function __construct(string $name, array $attributes = []) { }
14+
15+
}

Diff for: ‎src/Analyser/MutatingScope.php

+8-4
Original file line numberDiff line numberDiff line change
@@ -2075,7 +2075,7 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
20752075
$nameType = $this->getType($node->name);
20762076
if (count($nameType->getConstantStrings()) > 0) {
20772077
return TypeCombinator::union(
2078-
...array_map(fn ($constantString) => $this
2078+
...array_map(fn ($constantString) => $constantString->getValue() === '' ? new ErrorType() : $this
20792079
->filterByTruthyValue(new BinaryOp\Identical($node->name, new String_($constantString->getValue())))
20802080
->getType(new MethodCall($node->var, new Identifier($constantString->getValue()), $node->args)), $nameType->getConstantStrings()),
20812081
);
@@ -2155,7 +2155,7 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
21552155
$nameType = $this->getType($node->name);
21562156
if (count($nameType->getConstantStrings()) > 0) {
21572157
return TypeCombinator::union(
2158-
...array_map(fn ($constantString) => $this
2158+
...array_map(fn ($constantString) => $constantString->getValue() === '' ? new ErrorType() : $this
21592159
->filterByTruthyValue(new BinaryOp\Identical($node->name, new String_($constantString->getValue())))
21602160
->getType(new Expr\StaticCall($node->class, new Identifier($constantString->getValue()), $node->args)), $nameType->getConstantStrings()),
21612161
);
@@ -2197,7 +2197,7 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
21972197
$nameType = $this->getType($node->name);
21982198
if (count($nameType->getConstantStrings()) > 0) {
21992199
return TypeCombinator::union(
2200-
...array_map(fn ($constantString) => $this
2200+
...array_map(fn ($constantString) => $constantString->getValue() === '' ? new ErrorType() : $this
22012201
->filterByTruthyValue(new BinaryOp\Identical($node->name, new String_($constantString->getValue())))
22022202
->getType(
22032203
new PropertyFetch($node->var, new Identifier($constantString->getValue())),
@@ -2271,7 +2271,7 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
22712271
$nameType = $this->getType($node->name);
22722272
if (count($nameType->getConstantStrings()) > 0) {
22732273
return TypeCombinator::union(
2274-
...array_map(fn ($constantString) => $this
2274+
...array_map(fn ($constantString) => $constantString->getValue() === '' ? new ErrorType() : $this
22752275
->filterByTruthyValue(new BinaryOp\Identical($node->name, new String_($constantString->getValue())))
22762276
->getType(new Expr\StaticPropertyFetch($node->class, new Node\VarLikeIdentifier($constantString->getValue()))), $nameType->getConstantStrings()),
22772277
);
@@ -5695,6 +5695,10 @@ private function exactInstantiation(New_ $node, string $className): ?Type
56955695
$constructorMethod = new DummyConstructorReflection($classReflection);
56965696
}
56975697

5698+
if ($constructorMethod->getName() === '') {
5699+
throw new ShouldNotHappenException();
5700+
}
5701+
56985702
$resolvedTypes = [];
56995703
$methodCall = new Expr\StaticCall(
57005704
new Name($resolvedClassName),

Diff for: ‎src/Analyser/NodeScopeResolver.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ private function processStmtNode(
686686
continue;
687687
}
688688

689-
if (!$param->var instanceof Variable || !is_string($param->var->name)) {
689+
if (!$param->var instanceof Variable || !is_string($param->var->name) || $param->var->name === '') {
690690
throw new ShouldNotHappenException();
691691
}
692692
$phpDoc = null;

Diff for: ‎src/Broker/AnonymousClassNameHelper.php

+3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ public function __construct(
2020
{
2121
}
2222

23+
/**
24+
* @return non-empty-string
25+
*/
2326
public function getAnonymousClassName(
2427
Node\Stmt\Class_ $classNode,
2528
string $filename,

Diff for: ‎src/Node/ClassPropertyNode.php

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
final class ClassPropertyNode extends NodeAbstract implements VirtualNode
1616
{
1717

18+
/**
19+
* @param non-empty-string $name
20+
*/
1821
public function __construct(
1922
private string $name,
2023
private int $flags,
@@ -35,6 +38,7 @@ public function __construct(
3538
parent::__construct($originalNode->getAttributes());
3639
}
3740

41+
/** @return non-empty-string */
3842
public function getName(): string
3943
{
4044
return $this->name;

Diff for: ‎src/Node/ClassStatementsGatherer.php

+6
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,9 @@ private function tryToApplyPropertyReads(Expr\FuncCall $node, Scope $scope): voi
259259
if ($property->isStatic()) {
260260
continue;
261261
}
262+
if ($property->getName() === '') {
263+
throw new ShouldNotHappenException();
264+
}
262265
$this->propertyUsages[] = new PropertyRead(
263266
new PropertyFetch(new Expr\Variable('this'), new Identifier($property->getName())),
264267
$scope,
@@ -282,6 +285,9 @@ private function tryToApplyPropertyWritesFromAncestorConstructor(StaticCall $anc
282285
if (!$property->isPromoted() || $property->getDeclaringClass()->getName() !== $classReflection->getName()) {
283286
continue;
284287
}
288+
if ($property->getName() === '') {
289+
throw new ShouldNotHappenException();
290+
}
285291
$this->propertyUsages[] = new PropertyWrite(
286292
new PropertyFetch(new Expr\Variable('this'), new Identifier($property->getName()), $ancestorConstructorCall->getAttributes()),
287293
$scope,

Diff for: ‎src/Reflection/ClassReflection.php

+3
Original file line numberDiff line numberDiff line change
@@ -1332,6 +1332,9 @@ private function findAttributeFlags(): ?int
13321332
$attributeClass = $this->reflectionProvider->getClass(Attribute::class);
13331333
$arguments = [];
13341334
foreach ($nativeAttributes[0]->getArgumentsExpressions() as $i => $expression) {
1335+
if ($i === '') {
1336+
throw new ShouldNotHappenException();
1337+
}
13351338
$arguments[] = new Arg($expression, false, false, [], is_int($i) ? null : new Identifier($i));
13361339
}
13371340

Diff for: ‎src/Type/Php/ConstantHelper.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function createExprFromConstantName(string $constantName): ?Expr
2424
$classConstParts = explode('::', $constantName);
2525
if (count($classConstParts) >= 2) {
2626
$fqcn = ltrim($classConstParts[0], '\\');
27-
if ($fqcn === '') {
27+
if ($fqcn === '' || $classConstParts[1] === '') {
2828
return null;
2929
}
3030

Diff for: ‎src/Type/Php/PropertyExistsTypeSpecifyingExtension.php

+4
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ public function specifyTypes(
5656
return new SpecifiedTypes([], []);
5757
}
5858

59+
if ($propertyNameType->getValue() === '') {
60+
return new SpecifiedTypes([], []);
61+
}
62+
5963
$objectType = $scope->getType($node->getArgs()[0]->value);
6064
if ($objectType instanceof ConstantStringType) {
6165
return new SpecifiedTypes([], []);

Diff for: ‎tests/PHPStan/Analyser/AnalyserIntegrationTest.php

+6
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,12 @@ public function testBug6649(): void
600600
$this->assertNoErrors($errors);
601601
}
602602

603+
public function testBug12778(): void
604+
{
605+
$errors = $this->runAnalyse(__DIR__ . '/data/bug-12778.php');
606+
$this->assertNoErrors($errors);
607+
}
608+
603609
public function testBug6842(): void
604610
{
605611
$errors = $this->runAnalyse(__DIR__ . '/data/bug-6842.php');

Diff for: ‎tests/PHPStan/Analyser/ArgumentsNormalizerTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ public function dataReorderValid(): iterable
246246

247247
/**
248248
* @dataProvider dataReorderValid
249-
* @param array<int, array{string, bool, bool, ?Type}> $parameterSettings
250-
* @param array<int, array{Type, ?string}> $argumentSettings
249+
* @param array<int, array{non-empty-string, bool, bool, ?Type}> $parameterSettings
250+
* @param array<int, array{Type, ?non-empty-string}> $argumentSettings
251251
* @param array<int, Type> $expectedArgumentTypes
252252
*/
253253
public function testReorderValid(
@@ -326,8 +326,8 @@ public function dataReorderInvalid(): iterable
326326

327327
/**
328328
* @dataProvider dataReorderInvalid
329-
* @param array<int, array{string, bool, bool, ?Type}> $parameterSettings
330-
* @param array<int, array{Type, ?string}> $argumentSettings
329+
* @param array<int, array{non-empty-string, bool, bool, ?Type}> $parameterSettings
330+
* @param array<int, array{Type, ?non-empty-string}> $argumentSettings
331331
*/
332332
public function testReorderInvalid(
333333
array $parameterSettings,

Diff for: ‎tests/PHPStan/Analyser/data/bug-12778.php

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?php
2+
3+
namespace Bug12778;
4+
5+
use stdClass;
6+
7+
class Test
8+
{
9+
public function test(stdClass $category): void
10+
{
11+
echo $category->{''};
12+
}
13+
}

0 commit comments

Comments
 (0)