Skip to content

Commit 6084711

Browse files
VincentLangletVincentLanglet
committed
Improve
1 parent bae1d01 commit 6084711

5 files changed

Lines changed: 118 additions & 4 deletions

File tree

‎src/Php/PhpVersion.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,4 +492,9 @@ public function deprecatesIncOnNonNumericString(): bool
492492
return $this->versionId >= 80500;
493493
}
494494

495+
public function supportsObjectsInArraySumProduct(): bool
496+
{
497+
return $this->versionId >= 80300;
498+
}
499+
495500
}

‎src/Rules/Functions/ParameterCastableToNumberRule.php‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
use PhpParser\Node;
66
use PhpParser\Node\Expr\FuncCall;
77
use PHPStan\Analyser\Scope;
8+
use PHPStan\Php\PhpVersion;
89
use PHPStan\Reflection\ParametersAcceptorSelector;
910
use PHPStan\Reflection\ReflectionProvider;
1011
use PHPStan\Rules\ParameterCastableToStringCheck;
1112
use PHPStan\Rules\Rule;
13+
use PHPStan\Type\ErrorType;
1214
use PHPStan\Type\Type;
1315
use function count;
1416
use function in_array;
@@ -22,6 +24,7 @@ final class ParameterCastableToNumberRule implements Rule
2224
public function __construct(
2325
private ReflectionProvider $reflectionProvider,
2426
private ParameterCastableToStringCheck $parameterCastableToStringCheck,
27+
private PhpVersion $phpVersion,
2528
)
2629
{
2730
}
@@ -63,11 +66,16 @@ public function processNode(Node $node, Scope $scope): array
6366

6467
$errorMessage = 'Parameter %s of function %s expects an array of values castable to number, %s given.';
6568
$functionParameters = $parametersAcceptor->getParameters();
69+
70+
$castFn = $this->phpVersion->supportsObjectsInArraySumProduct()
71+
? static fn (Type $t) => $t->toNumber()
72+
: static fn (Type $t) => !$t->isObject()->no() ? new ErrorType() : $t->toNumber();
73+
6674
$error = $this->parameterCastableToStringCheck->checkParameter(
6775
$origArgs[0],
6876
$scope,
6977
$errorMessage,
70-
static fn (Type $t) => $t->toNumber(),
78+
$castFn,
7179
$functionName,
7280
$this->parameterCastableToStringCheck->getParameterName(
7381
$origArgs[0],

‎tests/PHPStan/Rules/Functions/ParameterCastableToNumberRuleTest.php‎

Lines changed: 64 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace PHPStan\Rules\Functions;
44

5+
use PHPStan\Php\PhpVersion;
56
use PHPStan\Rules\ParameterCastableToStringCheck;
67
use PHPStan\Rules\Rule;
78
use PHPStan\Rules\RuleLevelHelper;
@@ -20,7 +21,11 @@ class ParameterCastableToNumberRuleTest extends RuleTestCase
2021
protected function getRule(): Rule
2122
{
2223
$broker = self::createReflectionProvider();
23-
return new ParameterCastableToNumberRule($broker, new ParameterCastableToStringCheck(new RuleLevelHelper($broker, true, false, true, true, true, false, true)));
24+
return new ParameterCastableToNumberRule(
25+
$broker,
26+
new ParameterCastableToStringCheck(new RuleLevelHelper($broker, true, false, true, true, true, false, true)),
27+
self::getContainer()->getByType(PhpVersion::class),
28+
);
2429
}
2530

2631
public function testRule(): void
@@ -124,7 +129,7 @@ public function testBug11883(): void
124129

125130
public function testBug13775(): void
126131
{
127-
$this->analyse([__DIR__ . '/data/bug-13775.php'], $this->hackPhp74ErrorMessages([
132+
$errors = [
128133
[
129134
'Parameter #1 $array of function array_product expects an array of values castable to number, array<int, string> given.',
130135
13,
@@ -149,7 +154,63 @@ public function testBug13775(): void
149154
'Parameter #1 $array of function array_product expects an array of values castable to number, array<int, stdClass> given.',
150155
31,
151156
],
152-
]));
157+
[
158+
'Parameter #1 $array of function array_product expects an array of values castable to number, array<int, GMP|stdClass> given.',
159+
34,
160+
],
161+
];
162+
163+
if (PHP_VERSION_ID < 80300) {
164+
$errors[] = [
165+
'Parameter #1 $array of function array_product expects an array of values castable to number, array<int, GMP> given.',
166+
37,
167+
];
168+
}
169+
170+
$this->analyse([__DIR__ . '/data/bug-13775.php'], $this->hackPhp74ErrorMessages($errors));
171+
}
172+
173+
public function testBug13775Bis(): void
174+
{
175+
$errors = [
176+
[
177+
'Parameter #1 $array of function array_sum expects an array of values castable to number, array<int, string> given.',
178+
13,
179+
],
180+
[
181+
'Parameter #1 $array of function array_sum expects an array of values castable to number, array<int, string> given.',
182+
19,
183+
],
184+
[
185+
'Parameter #1 $array of function array_sum expects an array of values castable to number, array<int, string> given.',
186+
22,
187+
],
188+
[
189+
'Parameter #1 $array of function array_sum expects an array of values castable to number, array<int, string> given.',
190+
25,
191+
],
192+
[
193+
'Parameter #1 $array of function array_sum expects an array of values castable to number, array<int, array> given.',
194+
28,
195+
],
196+
[
197+
'Parameter #1 $array of function array_sum expects an array of values castable to number, array<int, stdClass> given.',
198+
31,
199+
],
200+
[
201+
'Parameter #1 $array of function array_sum expects an array of values castable to number, array<int, GMP|stdClass> given.',
202+
34,
203+
],
204+
];
205+
206+
if (PHP_VERSION_ID < 80300) {
207+
$errors[] = [
208+
'Parameter #1 $array of function array_sum expects an array of values castable to number, array<int, GMP> given.',
209+
37,
210+
];
211+
}
212+
213+
$this->analyse([__DIR__ . '/data/bug-13775-bis.php'], $this->hackPhp74ErrorMessages($errors));
153214
}
154215

155216
public function testBug12146(): void

‎tests/PHPStan/Rules/Functions/data/bug-13775-bis.php‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?php declare(strict_types = 1);
2+
3+
$a = [null];
4+
echo 'null, valid cast: ' . array_sum($a) . "\n\n";
5+
6+
$a = [false];
7+
echo 'false, valid cast: ' . array_sum($a) . "\n\n";
8+
9+
$a = [true];
10+
echo 'true, valid cast: ' . array_sum($a) . "\n\n";
11+
12+
$a = [''];
13+
echo 'empty string, invalid cast: ' . array_sum($a) . "\n\n";
14+
15+
$a = ['42.5'];
16+
echo 'string of a float, valid cast: ' . array_sum($a) . "\n\n";
17+
18+
$a = ['42,5'];
19+
echo 'string of comma-separated float, valid cast but not desirable (discards trailing chars): ' . array_sum($a) . "\n\n";
20+
21+
$a = ['42a'];
22+
echo 'string of int with trailing alpha char, valid cast but not desirable (discards trailing chars): ' . array_sum($a) . "\n\n";
23+
24+
$a = ['a42'];
25+
echo 'string of int with leading alpha char, invalid cast: ' . array_sum($a) . "\n\n";
26+
27+
$a = [[]];
28+
echo 'array, invalid cast: ' . array_sum($a) . "\n\n";
29+
30+
$a = [new stdClass()];
31+
echo 'class that does not auto-cast, invalid cast: ' . array_sum($a) . "\n\n";
32+
33+
$a = [rand(0, 1) ? new stdClass() : gmp_init(42)];
34+
echo 'possibly invalid cast: ' . array_sum($a) . "\n\n";
35+
36+
$a = [gmp_init(42)];
37+
echo 'gmp, valid cast: ' . array_sum($a) . "\n\n";

‎tests/PHPStan/Rules/Functions/data/bug-13775.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,8 @@
3030
$a = [new stdClass()];
3131
echo 'class that does not auto-cast, invalid cast: ' . array_product($a) . "\n\n";
3232

33+
$a = [rand(0, 1) ? new stdClass() : gmp_init(42)];
34+
echo 'possibly invalid cast: ' . array_product($a) . "\n\n";
35+
3336
$a = [gmp_init(42)];
3437
echo 'gmp, valid cast: ' . array_product($a) . "\n\n";

0 commit comments

Comments
 (0)