Skip to content

Update brianium/paratest to fix parallel tests build #4104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/PHPStan/Analyser/nsrt/array-combine-php7.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ function withBoolKey(): void
$c = [false, 'red', 'yellow'];
$d = ['avocado', 'apple', 'banana'];

assertType("array{: 'avocado', red: 'apple', yellow: 'banana'}", array_combine($c, $d));
assertType("array{'': 'avocado', red: 'apple', yellow: 'banana'}", array_combine($c, $d));
}

function withFloatKey(): void
{
$a = [1.5, 'red', 'yellow'];
$b = ['avocado', 'apple', 'banana'];

assertType("array{1.5: 'avocado', red: 'apple', yellow: 'banana'}", array_combine($a, $b));
assertType("array{'1.5': 'avocado', red: 'apple', yellow: 'banana'}", array_combine($a, $b));
}

function withIntegerKey(): void
Expand Down
7 changes: 6 additions & 1 deletion tests/PHPStan/Levels/data/constantAccesses83-2.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
[
{
"message": "Class constant name for Levels\\ConstantAccesses83\\Foo must be a string, but int was given.",
"line": 18,
"ignorable": true
},
{
"message": "Class constant name in dynamic fetch can only be a string, int given.",
"line": 18,
"ignorable": true
}
]
]
5 changes: 5 additions & 0 deletions tests/PHPStan/Levels/data/constantAccesses83-7.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
[
{
"message": "Class constant name for Levels\\ConstantAccesses83\\Foo must be a string, but int|string was given.",
"line": 19,
"ignorable": true
},
{
"message": "Class constant name in dynamic fetch can only be a string, int|string given.",
"line": 19,
Expand Down
5 changes: 5 additions & 0 deletions tests/PHPStan/Levels/data/constantAccesses83-8.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
[
{
"message": "Class constant name for Levels\\ConstantAccesses83\\Foo must be a string, but string|null was given.",
"line": 20,
"ignorable": true
},
{
"message": "Class constant name in dynamic fetch can only be a string, string|null given.",
"line": 20,
Expand Down
2 changes: 1 addition & 1 deletion tests/PHPStan/Rules/InternalTag/data/bug-13210.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php
<?php // lint >= 8.0

/**
* @internal
Expand Down
104 changes: 58 additions & 46 deletions tests/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading