Skip to content

Commit 0c64181

Browse files
committed
Fix after PHPStan update
1 parent dd4ef58 commit 0c64181

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

tests/Type/WebMozartAssert/data/bug-117.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function getData(int $accountId, array $requestData): array
4646

4747
$requestData['accountId'] = $accountId;
4848

49-
assertType("hasOffsetValue('accountId', int)&hasOffsetValue('errorColor', string|null)&hasOffsetValue('theme', array&hasOffsetValue('backgroundColor', string|null)&hasOffsetValue('headerImage', (array&hasOffsetValue('id', int))|null)&hasOffsetValue('textColor', string|null))&non-empty-array", $requestData);
49+
assertType("non-empty-array&hasOffsetValue('accountId', int)&hasOffsetValue('errorColor', string|null)&hasOffsetValue('theme', non-empty-array&hasOffsetValue('backgroundColor', string|null)&hasOffsetValue('headerImage', (non-empty-array&hasOffsetValue('id', int))|null)&hasOffsetValue('textColor', string|null))", $requestData);
5050

5151
return $requestData;
5252
}

tests/Type/WebMozartAssert/data/bug-150.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public function doFoo($data): void
1313
Assert::isArray($data);
1414
Assert::keyExists($data, 'sniffs');
1515
Assert::isArray($data['sniffs']);
16-
assertType("array&hasOffsetValue('sniffs', array)", $data);
16+
assertType("non-empty-array&hasOffsetValue('sniffs', array<mixed, mixed>)", $data);
1717

1818
foreach ($data['sniffs'] as $sniffName) {
1919
Assert::string($sniffName);

tests/Type/WebMozartAssert/data/collection.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,10 @@ public function allKeyExists(array $a, array $b, array $c, $d): void
155155
assertType('array<array{id: int}>', $a);
156156

157157
Assert::allKeyExists($b, 'id');
158-
assertType('array<int, array<string, mixed>&hasOffset(\'id\')>', $b);
158+
assertType('array<int, non-empty-array<string, mixed>&hasOffset(\'id\')>', $b);
159159

160160
Assert::allKeyExists($c, 'id');
161-
assertType('array<array&hasOffset(\'id\')>', $c);
161+
assertType('array<non-empty-array&hasOffset(\'id\')>', $c);
162162
}
163163

164164
/**

tests/Type/WebMozartAssert/data/type.php

+10-10
Original file line numberDiff line numberDiff line change
@@ -152,37 +152,37 @@ public function isCallable($a, $b): void
152152
public function isArray($a, $b): void
153153
{
154154
Assert::isArray($a);
155-
assertType('array', $a);
155+
assertType('array<mixed, mixed>', $a);
156156

157157
Assert::nullOrIsArray($b);
158-
assertType('array|null', $b);
158+
assertType('array<mixed, mixed>|null', $b);
159159
}
160160

161161
public function isTraversable($a, $b): void
162162
{
163163
Assert::isTraversable($a);
164-
assertType('array|Traversable', $a);
164+
assertType('array<mixed, mixed>|Traversable', $a);
165165

166166
Assert::nullOrIsTraversable($b);
167-
assertType('array|Traversable|null', $b);
167+
assertType('array<mixed, mixed>|Traversable|null', $b);
168168
}
169169

170170
public function isIterable($a, $b): void
171171
{
172172
Assert::isIterable($a);
173-
assertType('array|Traversable', $a);
173+
assertType('array<mixed, mixed>|Traversable', $a);
174174

175175
Assert::nullOrIsIterable($b);
176-
assertType('array|Traversable|null', $b);
176+
assertType('array<mixed, mixed>|Traversable|null', $b);
177177
}
178178

179179
public function isCountable($a, $b): void
180180
{
181181
Assert::isCountable($a);
182-
assertType('array|Countable', $a);
182+
assertType('array<mixed, mixed>|Countable', $a);
183183

184184
Assert::nullOrIsCountable($b);
185-
assertType('array|Countable|null', $b);
185+
assertType('array<mixed, mixed>|Countable|null', $b);
186186
}
187187

188188
public function isInstanceOf($a, $b, $c, $d): void
@@ -300,10 +300,10 @@ public function isNotA(object $a, string $b, ?object $c): void
300300
public function isArrayAccessible($a, $b): void
301301
{
302302
Assert::isArrayAccessible($a);
303-
assertType('array|ArrayAccess', $a);
303+
assertType('array<mixed, mixed>|ArrayAccess', $a);
304304

305305
Assert::nullOrIsArrayAccessible($b);
306-
assertType('array|ArrayAccess|null', $b);
306+
assertType('array<mixed, mixed>|ArrayAccess|null', $b);
307307
}
308308
}
309309

0 commit comments

Comments
 (0)