Skip to content

Commit 6cf2238

Browse files
ondrejmirtesondrejmirtes
committed
ArrayType::describe - explicit mixed should be stated explicitly
1 parent a934639 commit 6cf2238

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+151
-154
lines changed

‎phpstan-baseline.neon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ parameters:
1313
path: src/Analyser/AnalyserResultFinalizer.php
1414

1515
-
16-
message: '#^Cannot assign offset ''realCount'' to array\|string\.$#'
16+
message: '#^Cannot assign offset ''realCount'' to array\<mixed\>\|string\.$#'
1717
identifier: offsetAssign.dimType
1818
count: 1
1919
path: src/Analyser/Ignore/IgnoredErrorHelperResult.php

‎src/Type/ArrayType.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ public function equals(Type $type): bool
128128

129129
public function describe(VerbosityLevel $level): string
130130
{
131-
$isMixedKeyType = $this->keyType instanceof MixedType && $this->keyType->describe(VerbosityLevel::precise()) === 'mixed';
132-
$isMixedItemType = $this->itemType instanceof MixedType && $this->itemType->describe(VerbosityLevel::precise()) === 'mixed';
131+
$isMixedKeyType = $this->keyType instanceof MixedType && $this->keyType->describe(VerbosityLevel::precise()) === 'mixed' && !$this->keyType->isExplicitMixed();
132+
$isMixedItemType = $this->itemType instanceof MixedType && $this->itemType->describe(VerbosityLevel::precise()) === 'mixed' && !$this->itemType->isExplicitMixed();
133133

134134
$valueHandler = function () use ($level, $isMixedKeyType, $isMixedItemType): string {
135135
if ($isMixedKeyType || $this->keyType instanceof NeverType) {
@@ -500,8 +500,8 @@ public function traverse(callable $cb): Type
500500

501501
public function toPhpDocNode(): TypeNode
502502
{
503-
$isMixedKeyType = $this->keyType instanceof MixedType && $this->keyType->describe(VerbosityLevel::precise()) === 'mixed';
504-
$isMixedItemType = $this->itemType instanceof MixedType && $this->itemType->describe(VerbosityLevel::precise()) === 'mixed';
503+
$isMixedKeyType = $this->keyType instanceof MixedType && $this->keyType->describe(VerbosityLevel::precise()) === 'mixed' && !$this->keyType->isExplicitMixed();
504+
$isMixedItemType = $this->itemType instanceof MixedType && $this->itemType->describe(VerbosityLevel::precise()) === 'mixed' && !$this->itemType->isExplicitMixed();
505505

506506
if ($isMixedKeyType) {
507507
if ($isMixedItemType) {

‎src/Type/Php/ArraySearchFunctionTypeSpecifyingExtension.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
use PHPStan\Analyser\TypeSpecifierContext;
1111
use PHPStan\Reflection\FunctionReflection;
1212
use PHPStan\Type\Accessory\NonEmptyArrayType;
13-
use PHPStan\Type\ArrayType;
1413
use PHPStan\Type\FunctionTypeSpecifyingExtension;
15-
use PHPStan\Type\MixedType;
16-
use PHPStan\Type\TypeCombinator;
1714
use function strtolower;
1815

1916
final class ArraySearchFunctionTypeSpecifyingExtension implements FunctionTypeSpecifyingExtension, TypeSpecifierAwareExtension
@@ -45,7 +42,7 @@ public function specifyTypes(
4542

4643
return $this->typeSpecifier->create(
4744
$arrayArg,
48-
TypeCombinator::intersect(new ArrayType(new MixedType(), new MixedType()), new NonEmptyArrayType()),
45+
new NonEmptyArrayType(),
4946
$context,
5047
$scope,
5148
);

‎tests/PHPStan/Analyser/AnalyserIntegrationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1198,7 +1198,7 @@ public function testBug9459(): void
11981198
{
11991199
$errors = $this->runAnalyse(__DIR__ . '/data/bug-9459.php');
12001200
$this->assertCount(1, $errors);
1201-
$this->assertSame('PHPDoc tag @var with type callable(): array is not subtype of native type Closure(): array{}.', $errors[0]->getMessage());
1201+
$this->assertSame('PHPDoc tag @var with type callable(): array<mixed> is not subtype of native type Closure(): array{}.', $errors[0]->getMessage());
12021202
$this->assertSame(10, $errors[0]->getLine());
12031203
}
12041204

‎tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1763,7 +1763,7 @@ public function dataProperties(): array
17631763
'$this->arrayPropertyOne',
17641764
],
17651765
[
1766-
'array',
1766+
'array<mixed>',
17671767
'$this->arrayPropertyOther',
17681768
],
17691769
[
@@ -3423,7 +3423,7 @@ public function dataTypeFromFunctionPhpDocs(): array
34233423
'$arrayParameterOne',
34243424
],
34253425
[
3426-
'array',
3426+
'array<mixed>',
34273427
'$arrayParameterOther',
34283428
],
34293429
[
@@ -5779,7 +5779,7 @@ public function dataSpecifiedTypesUsingIsFunctions(): array
57795779
'$null',
57805780
],
57815781
[
5782-
'array',
5782+
'array<mixed, mixed>',
57835783
'$array',
57845784
],
57855785
[
@@ -9252,7 +9252,7 @@ public function dataInferPrivatePropertyTypeFromConstructor(): array
92529252
'$this->bool',
92539253
],
92549254
[
9255-
'array',
9255+
'array<mixed, mixed>',
92569256
'$this->array',
92579257
],
92589258
];

‎tests/PHPStan/Analyser/TypeSpecifierTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,8 +1218,8 @@ public function dataCondition(): iterable
12181218
),
12191219
new Identical(new Expr\ConstFetch(new Name('null')), new Variable('a')),
12201220
),
1221-
['$a' => 'non-empty-array|null'],
1222-
['$a' => 'mixed~non-empty-array & ~null'],
1221+
['$a' => 'non-empty-array<mixed, mixed>|null'],
1222+
['$a' => 'mixed~non-empty-array<mixed, mixed> & ~null'],
12231223
],
12241224
[
12251225
new Expr\BinaryOp\BooleanAnd(
@@ -1234,7 +1234,7 @@ public function dataCondition(): iterable
12341234
),
12351235
[
12361236
'$foo' => 'array<string, mixed>',
1237-
'array_filter($foo, \'is_string\', ARRAY_FILTER_USE_KEY)' => 'array', // could be 'array<string, mixed>'
1237+
'array_filter($foo, \'is_string\', ARRAY_FILTER_USE_KEY)' => 'array<mixed, mixed>', // could be 'array<string, mixed>'
12381238
],
12391239
[],
12401240
],
@@ -1250,7 +1250,7 @@ public function dataCondition(): iterable
12501250
),
12511251
),
12521252
[
1253-
'$foo' => 'non-empty-array',
1253+
'$foo' => 'non-empty-array<mixed, mixed>',
12541254
'count($foo)' => 'mixed~(0.0|int<min, 1>|false|null)',
12551255
],
12561256
[],
@@ -1267,7 +1267,7 @@ public function dataCondition(): iterable
12671267
),
12681268
),
12691269
[
1270-
'$foo' => 'non-empty-array',
1270+
'$foo' => 'non-empty-array<mixed, mixed>',
12711271
'count($foo)' => '2',
12721272
],
12731273
[],

‎tests/PHPStan/Analyser/data/param-out.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ function testParseStr() {
315315
echo $output['arr'][1];//baz
316316
*/
317317

318-
\PHPStan\Testing\assertType('array<int|string, array|lowercase-string>', $output);
318+
\PHPStan\Testing\assertType('array<int|string, array<mixed>|lowercase-string>', $output);
319319
}
320320

321321
function fooSimilar() {
@@ -392,10 +392,10 @@ function fooHeadersSent() {
392392

393393
function fooMbParseStr() {
394394
mb_parse_str("foo=bar", $output);
395-
assertType('array<string, array|string>', $output);
395+
assertType('array<string, array<mixed>|string>', $output);
396396

397397
mb_parse_str('[email protected]&city=town&x=1&y[g]=3&f=1.23', $output);
398-
assertType('array<string, array|string>', $output);
398+
assertType('array<string, array<mixed>|string>', $output);
399399
}
400400

401401
function fooPreg()

‎tests/PHPStan/Analyser/nsrt/array-chunk.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public function generalArrays(array $arr): void
1111
{
1212
/** @var mixed[] $arr */
1313
assertType('list<non-empty-list<mixed>>', array_chunk($arr, 2));
14-
assertType('list<non-empty-array>', array_chunk($arr, 2, true));
14+
assertType('list<non-empty-array<mixed>>', array_chunk($arr, 2, true));
1515

1616
/** @var array<string, int> $arr */
1717
assertType('list<non-empty-list<int>>', array_chunk($arr, 2));

‎tests/PHPStan/Analyser/nsrt/array-fill-keys-php8.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
function mixedAndSubtractedArray($mixed): void
88
{
99
if (is_array($mixed)) {
10-
assertType("array<'b'>", array_fill_keys($mixed, 'b'));
10+
assertType("array<mixed, 'b'>", array_fill_keys($mixed, 'b'));
1111
} else {
1212
assertType("*NEVER*", array_fill_keys($mixed, 'b'));
1313
}

‎tests/PHPStan/Analyser/nsrt/array-flip-php8.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function mixedAndSubtractedArray($mixed)
99
if (is_array($mixed)) {
1010
assertType('array<int|string, (int|string)>', array_flip($mixed));
1111
} else {
12-
assertType('mixed~array', $mixed);
12+
assertType('mixed~array<mixed, mixed>', $mixed);
1313
assertType('*NEVER*', array_flip($mixed));
1414
}
1515
}

0 commit comments

Comments
 (0)