Skip to content

Commit b0d5930

Browse files
herndlmondrejmirtes
herndlm
authored and
ondrejmirtes
committed
Import assertType function in tests
1 parent 45ee104 commit b0d5930

File tree

6 files changed

+185
-179
lines changed

6 files changed

+185
-179
lines changed

‎tests/Type/WebMozartAssert/data/array.php

+24-23
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace PHPStan\Type\WebMozartAssert;
44

55
use Webmozart\Assert\Assert;
6+
use function PHPStan\Testing\assertType;
67

78
class ArrayTest
89
{
@@ -13,7 +14,7 @@ class ArrayTest
1314
public function keyNotExists(array $a): void
1415
{
1516
Assert::keyNotExists($a, 'bar');
16-
\PHPStan\Testing\assertType('array{foo?: string}', $a);
17+
assertType('array{foo?: string}', $a);
1718
}
1819

1920
/**
@@ -22,19 +23,19 @@ public function keyNotExists(array $a): void
2223
public function keyExists(array $a): void
2324
{
2425
Assert::keyExists($a, 'foo');
25-
\PHPStan\Testing\assertType('array{foo: string, bar?: string}', $a);
26+
assertType('array{foo: string, bar?: string}', $a);
2627
}
2728

2829
public function validArrayKey($a, bool $b, $c): void
2930
{
3031
Assert::validArrayKey($a);
31-
\PHPStan\Testing\assertType('int|string', $a);
32+
assertType('int|string', $a);
3233

3334
Assert::validArrayKey($b);
34-
\PHPStan\Testing\assertType('*NEVER*', $b);
35+
assertType('*NEVER*', $b);
3536

3637
Assert::nullOrValidArrayKey($c);
37-
\PHPStan\Testing\assertType('int|string|null', $c);
38+
assertType('int|string|null', $c);
3839
}
3940

4041
/**
@@ -44,10 +45,10 @@ public function validArrayKey($a, bool $b, $c): void
4445
public function count(array $a, array $b): void
4546
{
4647
Assert::count($a, 1);
47-
\PHPStan\Testing\assertType('non-empty-array<int>', $a);
48+
assertType('non-empty-array<int>', $a);
4849

4950
Assert::count($b, 0);
50-
\PHPStan\Testing\assertType('array{}', $b);
51+
assertType('array{}', $b);
5152
}
5253

5354
/**
@@ -57,10 +58,10 @@ public function count(array $a, array $b): void
5758
public function minCount(array $a, array $b): void
5859
{
5960
Assert::minCount($a, 1);
60-
\PHPStan\Testing\assertType('non-empty-array<int>', $a);
61+
assertType('non-empty-array<int>', $a);
6162

6263
Assert::minCount($b, 0);
63-
\PHPStan\Testing\assertType('array<int>', $b);
64+
assertType('array<int>', $b);
6465
}
6566

6667
/**
@@ -70,10 +71,10 @@ public function minCount(array $a, array $b): void
7071
public function maxCount(array $a, array $b): void
7172
{
7273
Assert::maxCount($a, 1);
73-
\PHPStan\Testing\assertType('array<int>', $a);
74+
assertType('array<int>', $a);
7475

7576
Assert::maxCount($b, 0);
76-
\PHPStan\Testing\assertType('array{}', $b);
77+
assertType('array{}', $b);
7778
}
7879

7980
/**
@@ -85,52 +86,52 @@ public function maxCount(array $a, array $b): void
8586
public function countBetween(array $a, array $b, array $c, array $d): void
8687
{
8788
Assert::countBetween($a, 1, 2);
88-
\PHPStan\Testing\assertType('non-empty-array<int>', $a);
89+
assertType('non-empty-array<int>', $a);
8990

9091
Assert::countBetween($b, 0, 2);
91-
\PHPStan\Testing\assertType('array<int>', $b);
92+
assertType('array<int>', $b);
9293

9394
Assert::countBetween($c, 0, 0);
94-
\PHPStan\Testing\assertType('array{}', $c);
95+
assertType('array{}', $c);
9596

9697
Assert::countBetween($d, 2, 0);
97-
\PHPStan\Testing\assertType('*NEVER*', $d);
98+
assertType('*NEVER*', $d);
9899
}
99100

100101
public function isList($a, $b): void
101102
{
102103
Assert::isList($a);
103-
\PHPStan\Testing\assertType('array<int, mixed>', $a);
104+
assertType('array<int, mixed>', $a);
104105

105106
Assert::nullOrIsList($b);
106-
\PHPStan\Testing\assertType('array<int, mixed>|null', $b);
107+
assertType('array<int, mixed>|null', $b);
107108
}
108109

109110
public function isNonEmptyList($a, $b): void
110111
{
111112
Assert::isNonEmptyList($a);
112-
\PHPStan\Testing\assertType('non-empty-array<int, mixed>', $a);
113+
assertType('non-empty-array<int, mixed>', $a);
113114

114115
Assert::nullOrIsNonEmptyList($b);
115-
\PHPStan\Testing\assertType('non-empty-array<int, mixed>|null', $b);
116+
assertType('non-empty-array<int, mixed>|null', $b);
116117
}
117118

118119
public function isMap($a, $b): void
119120
{
120121
Assert::isMap($a);
121-
\PHPStan\Testing\assertType('array<string, mixed>', $a);
122+
assertType('array<string, mixed>', $a);
122123

123124
Assert::nullOrIsMap($b);
124-
\PHPStan\Testing\assertType('array<string, mixed>|null', $b);
125+
assertType('array<string, mixed>|null', $b);
125126
}
126127

127128
public function isNonEmptyMap($a, $b): void
128129
{
129130
Assert::isNonEmptyMap($a);
130-
\PHPStan\Testing\assertType('non-empty-array<string, mixed>', $a);
131+
assertType('non-empty-array<string, mixed>', $a);
131132

132133
Assert::nullOrIsNonEmptyMap($b);
133-
\PHPStan\Testing\assertType('non-empty-array<string, mixed>|null', $b);
134+
assertType('non-empty-array<string, mixed>|null', $b);
134135
}
135136

136137
}

‎tests/Type/WebMozartAssert/data/collection.php

+25-24
Original file line numberDiff line numberDiff line change
@@ -4,56 +4,57 @@
44

55
use stdClass;
66
use Webmozart\Assert\Assert;
7+
use function PHPStan\Testing\assertType;
78

89
class CollectionTest
910
{
1011

1112
public function allString(array $a, $b): void
1213
{
1314
Assert::allString($a);
14-
\PHPStan\Testing\assertType('array<string>', $a);
15+
assertType('array<string>', $a);
1516

1617
Assert::allString($b);
17-
\PHPStan\Testing\assertType('iterable<string>', $b);
18+
assertType('iterable<string>', $b);
1819
}
1920

2021
public function allStringNotEmpty(array $a, iterable $b, $c): void
2122
{
2223
Assert::allStringNotEmpty($a);
23-
\PHPStan\Testing\assertType('array<non-empty-string>', $a);
24+
assertType('array<non-empty-string>', $a);
2425

2526
Assert::allStringNotEmpty($b);
26-
\PHPStan\Testing\assertType('iterable<non-empty-string>', $b);
27+
assertType('iterable<non-empty-string>', $b);
2728

2829
Assert::allStringNotEmpty($c);
29-
\PHPStan\Testing\assertType('iterable<non-empty-string>', $c);
30+
assertType('iterable<non-empty-string>', $c);
3031
}
3132

3233
public function allInteger(array $a, iterable $b, $c): void
3334
{
3435
Assert::allInteger($a);
35-
\PHPStan\Testing\assertType('array<int>', $a);
36+
assertType('array<int>', $a);
3637

3738
Assert::allInteger($b);
38-
\PHPStan\Testing\assertType('iterable<int>', $b);
39+
assertType('iterable<int>', $b);
3940

4041
Assert::allInteger($c);
41-
\PHPStan\Testing\assertType('iterable<int>', $c);
42+
assertType('iterable<int>', $c);
4243
}
4344

4445
public function allInstanceOf(array $a, array $b, array $c, $d): void
4546
{
4647
Assert::allIsInstanceOf($a, stdClass::class);
47-
\PHPStan\Testing\assertType('array<stdClass>', $a);
48+
assertType('array<stdClass>', $a);
4849

4950
Assert::allIsInstanceOf($b, new stdClass());
50-
\PHPStan\Testing\assertType('array<stdClass>', $b);
51+
assertType('array<stdClass>', $b);
5152

5253
Assert::allIsInstanceOf($c, 17);
53-
\PHPStan\Testing\assertType('array', $c);
54+
assertType('array', $c);
5455

5556
Assert::allIsInstanceOf($d, new stdClass());
56-
\PHPStan\Testing\assertType('iterable<stdClass>', $d);
57+
assertType('iterable<stdClass>', $d);
5758
}
5859

5960
/**
@@ -64,13 +65,13 @@ public function allInstanceOf(array $a, array $b, array $c, $d): void
6465
public function allNotInstanceOf(array $a, array $b, array $c): void
6566
{
6667
Assert::allNotInstanceOf($a, CollectionBar::class);
67-
\PHPStan\Testing\assertType('array<PHPStan\Type\WebMozartAssert\CollectionFoo>', $a);
68+
assertType('array<PHPStan\Type\WebMozartAssert\CollectionFoo>', $a);
6869

6970
Assert::allNotInstanceOf($b, new stdClass());
70-
\PHPStan\Testing\assertType('array<PHPStan\Type\WebMozartAssert\CollectionFoo>', $b);
71+
assertType('array<PHPStan\Type\WebMozartAssert\CollectionFoo>', $b);
7172

7273
Assert::allNotInstanceOf($c, 17);
73-
\PHPStan\Testing\assertType('array<PHPStan\Type\WebMozartAssert\CollectionFoo>', $c);
74+
assertType('array<PHPStan\Type\WebMozartAssert\CollectionFoo>', $c);
7475
}
7576

7677
/**
@@ -79,7 +80,7 @@ public function allNotInstanceOf(array $a, array $b, array $c): void
7980
public function allNotNull(array $a): void
8081
{
8182
Assert::allNotNull($a);
82-
\PHPStan\Testing\assertType('array<int>', $a);
83+
assertType('array<int>', $a);
8384
}
8485

8586
/**
@@ -88,19 +89,19 @@ public function allNotNull(array $a): void
8889
public function allNotSame(array $a): void
8990
{
9091
Assert::allNotSame($a, -1);
91-
\PHPStan\Testing\assertType('array{1, -2|2, -3|3}', $a);
92+
assertType('array{1, -2|2, -3|3}', $a);
9293
}
9394

9495
public function allSubclassOf(array $a, iterable $b, $c): void
9596
{
9697
Assert::allSubclassOf($a, self::class);
97-
\PHPStan\Testing\assertType('array<class-string<PHPStan\Type\WebMozartAssert\CollectionTest>|PHPStan\Type\WebMozartAssert\CollectionTest>', $a);
98+
assertType('array<class-string<PHPStan\Type\WebMozartAssert\CollectionTest>|PHPStan\Type\WebMozartAssert\CollectionTest>', $a);
9899

99100
Assert::allSubclassOf($b, self::class);
100-
\PHPStan\Testing\assertType('iterable<class-string<PHPStan\Type\WebMozartAssert\CollectionTest>|PHPStan\Type\WebMozartAssert\CollectionTest>', $b);
101+
assertType('iterable<class-string<PHPStan\Type\WebMozartAssert\CollectionTest>|PHPStan\Type\WebMozartAssert\CollectionTest>', $b);
101102

102103
Assert::allSubclassOf($c, self::class);
103-
\PHPStan\Testing\assertType('iterable<class-string<PHPStan\Type\WebMozartAssert\CollectionTest>|PHPStan\Type\WebMozartAssert\CollectionTest>', $c);
104+
assertType('iterable<class-string<PHPStan\Type\WebMozartAssert\CollectionTest>|PHPStan\Type\WebMozartAssert\CollectionTest>', $c);
104105
}
105106

106107
/**
@@ -111,13 +112,13 @@ public function allSubclassOf(array $a, iterable $b, $c): void
111112
public function allKeyExists(array $a, array $b, array $c, $d): void
112113
{
113114
Assert::allKeyExists($a, 'id');
114-
\PHPStan\Testing\assertType('array<array{id: int}>', $a);
115+
assertType('array<array{id: int}>', $a);
115116

116117
Assert::allKeyExists($b, 'id');
117-
\PHPStan\Testing\assertType('array<int, array<string, mixed>&hasOffset(\'id\')>', $b);
118+
assertType('array<int, array<string, mixed>&hasOffset(\'id\')>', $b);
118119

119120
Assert::allKeyExists($c, 'id');
120-
\PHPStan\Testing\assertType('array<array&hasOffset(\'id\')>', $c);
121+
assertType('array<array&hasOffset(\'id\')>', $c);
121122
}
122123

123124
/**
@@ -126,7 +127,7 @@ public function allKeyExists(array $a, array $b, array $c, $d): void
126127
public function allCount(array $a): void
127128
{
128129
Assert::allCount($a, 2);
129-
\PHPStan\Testing\assertType('array<non-empty-array>', $a);
130+
assertType('array<non-empty-array>', $a);
130131
}
131132

132133
}

0 commit comments

Comments
 (0)