Skip to content

Commit 0234950

Browse files
VincentLangletVincentLanglet
committed
Update tests
1 parent 6153259 commit 0234950

File tree

11 files changed

+33
-33
lines changed

11 files changed

+33
-33
lines changed

‎tests/PHPStan/Analyser/nsrt/array-key-exists.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ public function doBar(array $a, array $b, array $c, int $key1, string $key2, int
5050
assertType('int', $key1);
5151
}
5252
if (array_key_exists($key2, $a)) {
53-
assertType('lowercase-string&numeric-string&uppercase-string', $key2);
53+
assertType('decimal-int-string&lowercase-string&uppercase-string', $key2);
5454
}
5555
if (array_key_exists($key3, $a)) {
56-
assertType('int|(lowercase-string&numeric-string&uppercase-string)', $key3);
56+
assertType('int|(decimal-int-string&lowercase-string&uppercase-string)', $key3);
5757
}
5858
if (array_key_exists($key4, $a)) {
59-
assertType('(int|(lowercase-string&numeric-string&uppercase-string))', $key4);
59+
assertType('(int|(decimal-int-string&lowercase-string&uppercase-string))', $key4);
6060
}
6161
if (array_key_exists($key5, $a)) {
62-
assertType('int|(lowercase-string&numeric-string&uppercase-string)', $key5);
62+
assertType('int|(decimal-int-string&lowercase-string&uppercase-string)', $key5);
6363
}
6464

6565
if (array_key_exists($key1, $b)) {

‎tests/PHPStan/Analyser/nsrt/bug-11716.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ function narrowKey($mixed, string $s, int $i, array $generalArr, array $intKeyed
7575
assertType('int', $i);
7676

7777
if (isset($intKeyedArr[$s])) {
78-
assertType("lowercase-string&numeric-string&uppercase-string", $s);
78+
assertType("decimal-int-string&lowercase-string&uppercase-string", $s);
7979
} else {
8080
assertType('string', $s);
8181
}

‎tests/PHPStan/Analyser/nsrt/bug-12393b.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ class FooIntString
343343
public function doFoo(int $b): void
344344
{
345345
$this->foo = $b;
346-
assertType('lowercase-string&numeric-string&uppercase-string', $this->foo);
346+
assertType('decimal-int-string&lowercase-string&uppercase-string', $this->foo);
347347
}
348348

349349
public function doBar(): void
@@ -418,7 +418,7 @@ class FooNullableIntString
418418
public function doFoo(?int $b): void
419419
{
420420
$this->foo = $b;
421-
assertType('lowercase-string&numeric-string&uppercase-string', $this->foo);
421+
assertType('decimal-int-string&lowercase-string&uppercase-string', $this->foo);
422422
}
423423

424424
public function doBar(): void

‎tests/PHPStan/Analyser/nsrt/bug-4587.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ public function b(): void
2727
$type = array_map(static function (array $result): array {
2828
assertType('array{a: int}', $result);
2929
$result['a'] = (string) $result['a'];
30-
assertType('array{a: lowercase-string&numeric-string&uppercase-string}', $result);
30+
assertType('array{a: decimal-int-string&lowercase-string&uppercase-string}', $result);
3131

3232
return $result;
3333
}, $results);
3434

35-
assertType('list<array{a: lowercase-string&numeric-string&uppercase-string}>', $type);
35+
assertType('list<array{a: decimal-int-string&lowercase-string&uppercase-string}>', $type);
3636
}
3737
}

‎tests/PHPStan/Analyser/nsrt/bug-7387.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function inputTypes(int $i, float $f, string $s, int $intRange) {
2929

3030
public function specifiers(int $i) {
3131
// https://3v4l.org/fmVIg
32-
assertType('lowercase-string&numeric-string&uppercase-string', sprintf('%14s', $i));
32+
assertType('decimal-int-string&lowercase-string&uppercase-string', sprintf('%14s', $i));
3333

3434
assertType('lowercase-string&numeric-string', sprintf('%d', $i));
3535

@@ -59,9 +59,9 @@ public function specifiers(int $i) {
5959
*/
6060
public function positionalArgs($mixed, int $i, float $f, string $s, int $posInt, int $negInt, int $nonZeroIntRange, int $intRange) {
6161
// https://3v4l.org/vVL0c
62-
assertType('lowercase-string&numeric-string&uppercase-string', sprintf('%2$6s', $mixed, $i));
63-
assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', sprintf('%2$6s', $mixed, $posInt));
64-
assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', sprintf('%2$6s', $mixed, $negInt));
62+
assertType('decimal-int-string&lowercase-string&uppercase-string', sprintf('%2$6s', $mixed, $i));
63+
assertType('decimal-int-string&lowercase-string&non-falsy-string&uppercase-string', sprintf('%2$6s', $mixed, $posInt));
64+
assertType('decimal-int-string&lowercase-string&non-falsy-string&uppercase-string', sprintf('%2$6s', $mixed, $negInt));
6565
assertType("' 1'|' 2'|' 3'|' 4'|' 5'", sprintf('%2$6s', $mixed, $nonZeroIntRange));
6666

6767
// https://3v4l.org/1ECIq

‎tests/PHPStan/Analyser/nsrt/bug-8635.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ class HelloWorld
88
{
99
public function EchoInt(int $value): void
1010
{
11-
assertType('lowercase-string&numeric-string&uppercase-string', "$value");
11+
assertType('decimal-int-string&lowercase-string&uppercase-string', "$value");
1212
}
1313
}

‎tests/PHPStan/Analyser/nsrt/cast-to-numeric-string.php‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
* @param 1 $constantInt
1414
*/
1515
function foo(int $a, float $b, $numeric, $numeric2, $number, $positive, $negative, $constantInt): void {
16-
assertType('lowercase-string&numeric-string&uppercase-string', (string)$a);
16+
assertType('decimal-int-string&lowercase-string&uppercase-string', (string)$a);
1717
assertType('numeric-string&uppercase-string', (string)$b);
1818
assertType('numeric-string', (string)$numeric);
1919
assertType('numeric-string', (string)$numeric2);
2020
assertType('numeric-string&uppercase-string', (string)$number);
21-
assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', (string)$positive);
22-
assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', (string)$negative);
21+
assertType('decimal-int-string&lowercase-string&non-falsy-string&uppercase-string', (string)$positive);
22+
assertType('decimal-int-string&lowercase-string&non-falsy-string&uppercase-string', (string)$negative);
2323
assertType("'1'", (string)$constantInt);
2424
}
2525

@@ -32,28 +32,28 @@ function foo(int $a, float $b, $numeric, $numeric2, $number, $positive, $negativ
3232
* @param 1 $constantInt
3333
*/
3434
function concatEmptyString(int $a, float $b, $numeric, $numeric2, $number, $positive, $negative, $constantInt): void {
35-
assertType('lowercase-string&numeric-string&uppercase-string', '' . $a);
35+
assertType('decimal-int-string&lowercase-string&uppercase-string', '' . $a);
3636
assertType('numeric-string&uppercase-string', '' . $b);
3737
assertType('numeric-string', '' . $numeric);
3838
assertType('numeric-string', '' . $numeric2);
3939
assertType('numeric-string&uppercase-string', '' . $number);
40-
assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', '' . $positive);
41-
assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', '' . $negative);
40+
assertType('decimal-int-string&lowercase-string&non-falsy-string&uppercase-string', '' . $positive);
41+
assertType('decimal-int-string&lowercase-string&non-falsy-string&uppercase-string', '' . $negative);
4242
assertType("'1'", '' . $constantInt);
4343

44-
assertType('lowercase-string&numeric-string&uppercase-string', $a . '');
44+
assertType('decimal-int-string&lowercase-string&uppercase-string', $a . '');
4545
assertType('numeric-string&uppercase-string', $b . '');
4646
assertType('numeric-string', $numeric . '');
4747
assertType('numeric-string', $numeric2 . '');
4848
assertType('numeric-string&uppercase-string', $number . '');
49-
assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', $positive . '');
50-
assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', $negative . '');
49+
assertType('decimal-int-string&lowercase-string&non-falsy-string&uppercase-string', $positive . '');
50+
assertType('decimal-int-string&lowercase-string&non-falsy-string&uppercase-string', $negative . '');
5151
assertType("'1'", $constantInt . '');
5252
}
5353

5454
function concatAssignEmptyString(int $i, float $f) {
5555
$i .= '';
56-
assertType('lowercase-string&numeric-string&uppercase-string', $i);
56+
assertType('decimal-int-string&lowercase-string&uppercase-string', $i);
5757

5858
$s = '';
5959
$s .= $f;
@@ -66,13 +66,13 @@ function concatAssignEmptyString(int $i, float $f) {
6666
*/
6767
function integerRangeToString($positive, $negative)
6868
{
69-
assertType('lowercase-string&numeric-string&uppercase-string', (string) $positive);
70-
assertType('lowercase-string&numeric-string&uppercase-string', (string) $negative);
69+
assertType('decimal-int-string&lowercase-string&uppercase-string', (string) $positive);
70+
assertType('decimal-int-string&lowercase-string&uppercase-string', (string) $negative);
7171

7272
if ($positive !== 0) {
73-
assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', (string) $positive);
73+
assertType('decimal-int-string&lowercase-string&non-falsy-string&uppercase-string', (string) $positive);
7474
}
7575
if ($negative !== 0) {
76-
assertType('lowercase-string&non-falsy-string&numeric-string&uppercase-string', (string) $negative);
76+
assertType('decimal-int-string&lowercase-string&non-falsy-string&uppercase-string', (string) $negative);
7777
}
7878
}

‎tests/PHPStan/Analyser/nsrt/filter-var.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public function scalars(bool $bool, float $float, int $int, string $string, int
158158
assertType("'17'", filter_var(17.0));
159159
assertType("'17.1'", filter_var(17.1));
160160
assertType("'1.0E-50'", filter_var(1e-50));
161-
assertType('lowercase-string&numeric-string&uppercase-string', filter_var($int));
161+
assertType('decimal-int-string&lowercase-string&uppercase-string', filter_var($int));
162162
assertType("'0'|'1'|'2'|'3'|'4'|'5'|'6'|'7'|'8'|'9'", filter_var($intRange));
163163
assertType("'17'", filter_var(17));
164164
assertType('string', filter_var($string));

‎tests/PHPStan/Analyser/nsrt/set-type-type-specifying.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function doString(string $s, int $i, float $f, array $a, object $o)
1111
assertType('string', $s);
1212

1313
settype($i, 'string');
14-
assertType('lowercase-string&numeric-string&uppercase-string', $i);
14+
assertType('decimal-int-string&lowercase-string&uppercase-string', $i);
1515

1616
settype($f, 'string');
1717
assertType('numeric-string&uppercase-string', $f);

‎tests/PHPStan/Analyser/nsrt/strval.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ function strvalTest(string $string, string $class): void
1717
assertType('\'1\'', strval(true));
1818
assertType('\'\'|\'1\'', strval(rand(0, 1) === 0));
1919
assertType('\'42\'', strval(42));
20-
assertType('lowercase-string&numeric-string&uppercase-string', strval(rand()));
20+
assertType('decimal-int-string&lowercase-string&uppercase-string', strval(rand()));
2121
assertType('numeric-string&uppercase-string', strval(rand() * 0.1));
22-
assertType('lowercase-string&numeric-string&uppercase-string', strval(strval(rand())));
22+
assertType('decimal-int-string&lowercase-string&uppercase-string', strval(strval(rand())));
2323
assertType('class-string<stdClass>', strval($class));
2424
assertType('string', strval(new \Exception()));
2525
assertType('*ERROR*', strval(new \stdClass()));

0 commit comments

Comments
 (0)