Skip to content

Fix name collisions #4102

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.

Sign up for GitHub

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 2 commits into from
Jul 17, 2025
Merged

Fix name collisions #4102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02df6b3
Fix name collisions
staabm Jul 17, 2025
e6c9545
Update MixedTypeTest.php
staabm Jul 17, 2025
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
2 changes: 1 addition & 1 deletion tests/PHPStan/Testing/data/assert-type-case-insensitive.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace MissingTypeCaseSensitive;

function doFoo(string $s) {
function doFoo1(string $s) {
assertTYPe('string', $s);
}

2 changes: 1 addition & 1 deletion tests/PHPStan/Testing/data/assert-type-missing-namespace.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace MissingAssertTypeNamespace;

function doFoo(string $s) {
function doFoo1(string $s) {
assertType('string', $s);
}

2 changes: 1 addition & 1 deletion tests/PHPStan/Testing/data/assert-type-wrong-namespace.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use function SomeWrong\Namespace\assertType;

function doFoo(string $s) {
function doFoo1(string $s) {
assertType('string', $s);
}

2 changes: 1 addition & 1 deletion tests/PHPStan/Type/MixedTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1139,7 +1139,7 @@ public function testEquals(MixedType $mixedType, Type $typeToCompare, bool $expe
);
}

public function dataEquals(): array
public static function dataEquals(): array
{
return [
[
Expand Down
Loading