From 02df6b3b1e679b53dfc695676098559eef7ea1b5 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Thu, 17 Jul 2025 14:42:06 +0200 Subject: [PATCH 1/2] Fix name collisions --- tests/PHPStan/Testing/data/assert-type-case-insensitive.php | 2 +- tests/PHPStan/Testing/data/assert-type-missing-namespace.php | 2 +- tests/PHPStan/Testing/data/assert-type-wrong-namespace.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/PHPStan/Testing/data/assert-type-case-insensitive.php b/tests/PHPStan/Testing/data/assert-type-case-insensitive.php index 7738ae6f38..6ab46b7eec 100644 --- a/tests/PHPStan/Testing/data/assert-type-case-insensitive.php +++ b/tests/PHPStan/Testing/data/assert-type-case-insensitive.php @@ -2,7 +2,7 @@ namespace MissingTypeCaseSensitive; -function doFoo(string $s) { +function doFoo1(string $s) { assertTYPe('string', $s); } diff --git a/tests/PHPStan/Testing/data/assert-type-missing-namespace.php b/tests/PHPStan/Testing/data/assert-type-missing-namespace.php index d0f9018efa..849d0843b6 100644 --- a/tests/PHPStan/Testing/data/assert-type-missing-namespace.php +++ b/tests/PHPStan/Testing/data/assert-type-missing-namespace.php @@ -2,7 +2,7 @@ namespace MissingAssertTypeNamespace; -function doFoo(string $s) { +function doFoo1(string $s) { assertType('string', $s); } diff --git a/tests/PHPStan/Testing/data/assert-type-wrong-namespace.php b/tests/PHPStan/Testing/data/assert-type-wrong-namespace.php index 67715fd548..4f452560a2 100644 --- a/tests/PHPStan/Testing/data/assert-type-wrong-namespace.php +++ b/tests/PHPStan/Testing/data/assert-type-wrong-namespace.php @@ -4,7 +4,7 @@ use function SomeWrong\Namespace\assertType; -function doFoo(string $s) { +function doFoo1(string $s) { assertType('string', $s); } From e6c95454ab53f65f97a7a17b98748603528256a3 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Thu, 17 Jul 2025 14:47:18 +0200 Subject: [PATCH 2/2] Update MixedTypeTest.php --- tests/PHPStan/Type/MixedTypeTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/PHPStan/Type/MixedTypeTest.php b/tests/PHPStan/Type/MixedTypeTest.php index 797bb05fb5..20baf951f9 100644 --- a/tests/PHPStan/Type/MixedTypeTest.php +++ b/tests/PHPStan/Type/MixedTypeTest.php @@ -1139,7 +1139,7 @@ public function testEquals(MixedType $mixedType, Type $typeToCompare, bool $expe ); } - public function dataEquals(): array + public static function dataEquals(): array { return [ [