Skip to content

Commit 059cc60

Browse files
committed
cs
1 parent 87c3cb2 commit 059cc60

File tree

1 file changed

+37
-10
lines changed

1 file changed

+37
-10
lines changed

tests/PHPStan/Analyser/nsrt/array-merge-const-non-const.php

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,41 @@
55
use function PHPStan\Testing\assertType;
66

77
function doFoo(array $post): void {
8-
assertType("non-empty-array&hasOffset('a')&hasOffset('b')", array_merge(['a' => 1, 'b' => false, 10 => 99], $post));
8+
assertType(
9+
"non-empty-array&hasOffset('a')&hasOffset('b')",
10+
array_merge(['a' => 1, 'b' => false, 10 => 99], $post)
11+
);
912
}
1013

1114
function doBar(array $array): void {
12-
assertType("non-empty-array&hasOffsetValue('a', 1)&hasOffsetValue('b', false)", array_merge($array, ['a' => 1, 'b' => false, 10 => 99]));
15+
assertType(
16+
"non-empty-array&hasOffsetValue('a', 1)&hasOffsetValue('b', false)",
17+
array_merge($array, ['a' => 1, 'b' => false, 10 => 99])
18+
);
1319
}
1420

1521
function doFooBar(array $array): void {
16-
assertType("non-empty-array&hasOffset('x')&hasOffsetValue('a', 1)&hasOffsetValue('b', false)&hasOffsetValue('c', 'e')", array_merge(['c' => 'd', 'x' => 'y'], $array, ['a' => 1, 'b' => false, 'c' => 'e']));
22+
assertType(
23+
"non-empty-array&hasOffset('x')&hasOffsetValue('a', 1)&hasOffsetValue('b', false)&hasOffsetValue('c', 'e')",
24+
array_merge(['c' => 'd', 'x' => 'y'], $array, ['a' => 1, 'b' => false, 'c' => 'e'])
25+
);
1726
}
1827

1928
function doFooInts(array $array): void {
20-
assertType("non-empty-array&hasOffsetValue('a', 1)&hasOffsetValue('c', 'e')", array_merge([1 => 'd'], $array, ['a' => 1, 3 => false, 'c' => 'e']));
29+
assertType(
30+
"non-empty-array&hasOffsetValue('a', 1)&hasOffsetValue('c', 'e')",
31+
array_merge([1 => 'd'], $array, ['a' => 1, 3 => false, 'c' => 'e'])
32+
);
2133
}
2234

2335
/**
2436
* @param array<string> $array
2537
*/
2638
function floatKey(array $array): void {
27-
assertType("non-empty-array<string>&hasOffsetValue('a', '1')&hasOffsetValue('c', 'e')", array_merge([4.23 => 'd'], $array, ['a' => '1', 3 => 'false', 'c' => 'e']));
39+
assertType(
40+
"non-empty-array<string>&hasOffsetValue('a', '1')&hasOffsetValue('c', 'e')",
41+
array_merge([4.23 => 'd'], $array, ['a' => '1', 3 => 'false', 'c' => 'e'])
42+
);
2843
}
2944

3045
function doOptKeys(array $array, array $arr2): void {
@@ -57,11 +72,23 @@ function hasOffsetValueKeys(array $hasB, array $mixedArray, array $hasC): void {
5772
assertType("non-empty-array&hasOffsetValue('b', 123)", array_merge($mixedArray, $hasB));
5873
assertType("non-empty-array&hasOffset('b')", array_merge($hasB, $mixedArray));
5974

60-
assertType("non-empty-array&hasOffset('b')&hasOffsetValue('c', 'def')", array_merge($mixedArray, $hasB, $hasC));
61-
assertType("non-empty-array&hasOffset('b')&hasOffsetValue('c', 'def')", array_merge($hasB, $mixedArray, $hasC));
62-
63-
assertType("non-empty-array&hasOffset('c')&hasOffsetValue('b', 123)", array_merge($hasC, $mixedArray, $hasB));
64-
assertType("non-empty-array&hasOffset('b')&hasOffset('c')", array_merge($hasC, $hasB, $mixedArray));
75+
assertType(
76+
"non-empty-array&hasOffset('b')&hasOffsetValue('c', 'def')",
77+
array_merge($mixedArray, $hasB, $hasC)
78+
);
79+
assertType(
80+
"non-empty-array&hasOffset('b')&hasOffsetValue('c', 'def')",
81+
array_merge($hasB, $mixedArray, $hasC)
82+
);
83+
84+
assertType(
85+
"non-empty-array&hasOffset('c')&hasOffsetValue('b', 123)",
86+
array_merge($hasC, $mixedArray, $hasB)
87+
);
88+
assertType(
89+
"non-empty-array&hasOffset('b')&hasOffset('c')",
90+
array_merge($hasC, $hasB, $mixedArray)
91+
);
6592

6693
if (rand(0, 1)) {
6794
$hasBorC = ['b' => 1];

0 commit comments

Comments
 (0)