Skip to content

Commit 97e50b9

Browse files
herndlmherndlm
committed
Revert test changes
1 parent 1f9f463 commit 97e50b9

File tree

3 files changed

+38
-56
lines changed

3 files changed

+38
-56
lines changed

‎tests/PHPStan/Rules/Arrays/data/appended-array-item.php

+4-16
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,16 @@ class Foo
1111
/** @var callable[] */
1212
private $callables;
1313

14-
public function accepted()
14+
public function doFoo()
1515
{
1616
$this->integers[] = 4;
1717
$this->integers['foo'] = 5;
18-
$this->callables[] = ['Closure', 'bind'];
19-
$this->callables[] = 'strpos';
20-
$this->callables[] = [$this, 'accepted'];
21-
}
22-
23-
public function notAccepted1()
24-
{
2518
$this->integers[] = 'foo';
19+
$this->callables[] = [$this, 'doFoo'];
2620
$this->callables[] = [1, 2, 3];
27-
}
28-
29-
public function notAccepted2()
30-
{
21+
$this->callables[] = ['Closure', 'bind'];
22+
$this->callables[] = 'strpos';
3123
$this->callables[] = [__CLASS__, 'classMethod'];
32-
}
33-
34-
public function notAccepted3()
35-
{
3624
$world = 'world';
3725
$this->callables[] = ['Foo', "Hello $world"];
3826

‎tests/PHPStan/Rules/Arrays/data/appended-array-key.php

+13-19
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,28 @@ class Foo
1414
/** @var array<int|string, mixed> */
1515
private $bothArray;
1616

17-
public function invalid()
17+
/**
18+
* @param int|string $intOrString
19+
*/
20+
public function doFoo(
21+
int $int,
22+
string $string,
23+
$intOrString,
24+
?string $stringOrNull
25+
)
1826
{
1927
$this->intArray[new \DateTimeImmutable()] = 1;
20-
}
21-
22-
/** @param int|string $intOrString */
23-
public function notAccepted(int $int, string $string, $intOrString)
24-
{
25-
$this->intArray[$string] = 1;
2628
$this->intArray[$intOrString] = 1;
27-
$this->stringArray[$int] = 1;
28-
$this->stringArray[$intOrString] = 1;
29-
}
30-
31-
public function notAcceptedStringIntCase()
32-
{
33-
$this->stringArray['0'] = 1;
34-
}
35-
36-
/** @param int|string $intOrString */
37-
public function accepted(int $int, string $string, $intOrString, ?string $stringOrNull)
38-
{
3929
$this->intArray[$int] = 1;
30+
$this->intArray[$string] = 1;
31+
$this->stringArray[$int] = 1;
4032
$this->stringArray[$string] = 1;
33+
$this->stringArray[$intOrString] = 1;
4134
$this->bothArray[$int] = 1;
4235
$this->bothArray[$intOrString] = 1;
4336
$this->bothArray[$string] = 1;
4437
$this->stringArray[$stringOrNull] = 1; // will be cast to string
38+
$this->stringArray['0'] = 1;
4539
}
4640

4741
public function checkRewrittenArray()

‎tests/PHPStan/Rules/Properties/TypesAssignedToPropertiesRuleTest.php

+21-21
Original file line numberDiff line numberDiff line change
@@ -253,35 +253,35 @@ public function testAppendendArrayKey(): void
253253
$this->analyse([__DIR__ . '/../Arrays/data/appended-array-key.php'], [
254254
[
255255
'Property AppendedArrayKey\Foo::$intArray (array<int, mixed>) does not accept array<int|string, mixed>.',
256-
25,
256+
28,
257257
],
258258
[
259259
'Property AppendedArrayKey\Foo::$intArray (array<int, mixed>) does not accept array<int|string, mixed>.',
260-
26,
260+
30,
261261
],
262262
[
263263
'Property AppendedArrayKey\Foo::$stringArray (array<string, mixed>) does not accept array<int|string, mixed>.',
264-
27,
264+
31,
265265
],
266266
[
267267
'Property AppendedArrayKey\Foo::$stringArray (array<string, mixed>) does not accept array<int|string, mixed>.',
268-
28,
268+
33,
269269
],
270270
[
271271
'Property AppendedArrayKey\Foo::$stringArray (array<string, mixed>) does not accept array<int|string, mixed>.',
272-
33,
272+
38,
273273
],
274274
[
275-
'Property AppendedArrayKey\Foo::$stringArray (array<string, mixed>) does not accept array<int, false>.',
276-
52,
275+
'Property AppendedArrayKey\Foo::$stringArray (array<string, mixed>) does not accept array<int|string, mixed>.',
276+
46,
277277
],
278278
[
279279
'Property AppendedArrayKey\MorePreciseKey::$test (array<1|2|3, string>) does not accept non-empty-array<int, string>.',
280-
86,
280+
80,
281281
],
282282
[
283283
'Property AppendedArrayKey\MorePreciseKey::$test (array<1|2|3, string>) does not accept non-empty-array<1|2|3|4, string>.',
284-
91,
284+
85,
285285
],
286286
]);
287287
}
@@ -303,35 +303,35 @@ public function testAppendedArrayItemType(): void
303303
[
304304
[
305305
'Property AppendedArrayItem\Foo::$integers (array<int>) does not accept array<int|string>.',
306-
25,
306+
18,
307307
],
308308
[
309309
'Property AppendedArrayItem\Foo::$callables (array<callable(): mixed>) does not accept non-empty-array<array{1, 2, 3}|(callable(): mixed)>.',
310-
26,
310+
20,
311311
],
312312
[
313313
'Property AppendedArrayItem\Foo::$callables (array<callable(): mixed>) does not accept non-empty-array<array{\'AppendedArrayItem\\\\Foo\', \'classMethod\'}|(callable(): mixed)>.',
314-
31,
314+
23,
315315
],
316316
[
317317
'Property AppendedArrayItem\Foo::$callables (array<callable(): mixed>) does not accept non-empty-array<array{\'Foo\', \'Hello world\'}|(callable(): mixed)>.',
318-
37,
318+
25,
319319
],
320320
[
321321
'Property AppendedArrayItem\Foo::$integers (array<int>) does not accept array<int|string>.',
322-
39,
322+
27,
323323
],
324324
[
325325
'Property AppendedArrayItem\Foo::$integers (array<int>) does not accept array<int|string>.',
326-
44,
326+
32,
327327
],
328328
[
329329
'Property AppendedArrayItem\Bar::$stringCallables (array<callable(): string>) does not accept non-empty-array<(callable(): string)|(Closure(): 1)>.',
330-
57,
330+
45,
331331
],
332332
[
333333
'Property AppendedArrayItem\Baz::$staticProperty (array<AppendedArrayItem\Lorem>) does not accept array<AppendedArrayItem\Baz>.',
334-
91,
334+
79,
335335
],
336336
],
337337
);
@@ -355,7 +355,7 @@ public function testBug6286(): void
355355
{
356356
$this->analyse([__DIR__ . '/data/bug-6286.php'], [
357357
[
358-
'Property Bug6286\HelloWorld::$details (array{name: string, age: int}) does not accept array{name: \'Douglas Adams\', age: \'Forty-two\'}.',
358+
'Property Bug6286\HelloWorld::$details (array{name: string, age: int}) does not accept array{name: string, age: \'Forty-two\'}.',
359359
19,
360360
"Offset 'age' (int) does not accept type string.",
361361
],
@@ -389,7 +389,7 @@ public function testBug3703(): void
389389
18,
390390
],
391391
[
392-
'Property Bug3703\Foo::$bar (array<string, array<string, array<int>>>) does not accept array<string, array<string, array<int|string>|int>|string>.',
392+
'Property Bug3703\Foo::$bar (array<string, array<string, array<int>>>) does not accept array<string, array<string, array<int>>|string>.',
393393
21,
394394
],
395395
]);
@@ -488,7 +488,7 @@ public function testBug6356b(): void
488488
$this->checkExplicitMixed = true;
489489
$this->analyse([__DIR__ . '/data/bug-6356b.php'], [
490490
[
491-
'Property Bug6356b\HelloWorld2::$details (array{name: string, age: int}) does not accept array{name: \'Douglas Adams\', age: \'Forty-two\'}.',
491+
'Property Bug6356b\HelloWorld2::$details (array{name: string, age: int}) does not accept array{name: string, age: \'Forty-two\'}.',
492492
19,
493493
"Offset 'age' (int) does not accept type string.",
494494
],
@@ -498,7 +498,7 @@ public function testBug6356b(): void
498498
"Offset 'age' (int) does not accept type int|string.",
499499
],
500500
[
501-
'Property Bug6356b\HelloWorld2::$nestedDetails (array<array{name: string, age: int}>) does not accept non-empty-array<array{name: string, age: \'Eleventy-one\'|\'Twelve\'|int}>.',
501+
'Property Bug6356b\HelloWorld2::$nestedDetails (array<array{name: string, age: int}>) does not accept non-empty-array<array{name: string, age: \'Twelve\'|int}>.',
502502
26,
503503
"Offset 'age' (int) does not accept type int|string.",
504504
],

0 commit comments

Comments
 (0)