Rename duplicate symbols

Author: ondrejmirtes

tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php

@@ -3865,11 +3865,11 @@ public function testTypeFromMethodPhpDocsInheritDocWithoutCurlyBraces(
 	): void
 	{
 		if ($replaceClass) {
-			$description = str_replace('$this(MethodPhpDocsNamespace\Foo)', '$this(MethodPhpDocsNamespace\FooInheritDocChild)', $description);
-			$description = str_replace('static(MethodPhpDocsNamespace\Foo)', 'static(MethodPhpDocsNamespace\FooInheritDocChild)', $description);
+			$description = str_replace('$this(MethodPhpDocsNamespace\Foo)', '$this(MethodPhpDocsNamespace\FooInheritDocChildWithoutCurly)', $description);
+			$description = str_replace('static(MethodPhpDocsNamespace\Foo)', 'static(MethodPhpDocsNamespace\FooInheritDocChildWithoutCurly)', $description);
 			$description = str_replace('MethodPhpDocsNamespace\FooParent', 'MethodPhpDocsNamespace\Foo', $description);
 			if ($expression === '$inlineSelf') {
-				$description = 'MethodPhpDocsNamespace\FooInheritDocChild';
+				$description = 'MethodPhpDocsNamespace\FooInheritDocChildWithoutCurly';
 			}
 		}
 		$this->assertTypes(
@@ -4359,7 +4359,7 @@ public function dataForeachArrayType(): array
 			],
 			[
 				__DIR__ . '/data/foreach/foreach-iterable-with-specified-key-type.php',
-				'ForeachWithGenericsPhpDoc\Bar|ForeachWithGenericsPhpDoc\Foo',
+				'ForeachWithGenericsPhpDocIterable\Bar|ForeachWithGenericsPhpDocIterable\Foo',
 				'$key',
 			],
 			[
@@ -4369,7 +4369,7 @@ public function dataForeachArrayType(): array
 			],
 			[
 				__DIR__ . '/data/foreach/foreach-iterable-with-complex-value-type.php',
-				'float|ForeachWithComplexValueType\Foo',
+				'float|ForeachIterableWithComplexValueType\Foo',
 				'$value',
 			],
 			[

tests/PHPStan/Analyser/data/array-filter-arrow-functions.php

@@ -1,6 +1,6 @@
 <?php // lint >= 7.4
 
-namespace ArrayFilter;
+namespace ArrayFilterArrowFunctions;
 
 use function PHPStan\Testing\assertType;
 

tests/PHPStan/Analyser/data/array-filter-callables.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ArrayFilter;
+namespace ArrayFilterCallables;
 
 use function PHPStan\Testing\assertType;
 

tests/PHPStan/Analyser/data/array-filter-string-callables.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ArrayFilter;
+namespace ArrayFilterStringCallables;
 
 use function PHPStan\Testing\assertType;
 

tests/PHPStan/Analyser/data/bug-2600-php8.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Bug2600;
+namespace Bug2600Php8;
 
 use function PHPStan\Testing\assertType;
 

tests/PHPStan/Analyser/data/bug-4188.php

@@ -1,6 +1,6 @@
 <?php // lint >= 7.4
 
-namespace Bug4188;
+namespace Bug4188Types;
 
 interface A {}
 interface B {}
@@ -18,7 +18,7 @@ function ($param): bool {
 				return $param instanceof B;
 			},
 		);
-		assertType('array<Bug4188\B>', $filtered);
+		assertType('array<Bug4188Types\B>', $filtered);
 
 		$this->onlyB($filtered);
 	}
@@ -30,7 +30,7 @@ public function setShort(array $data): void
 			$data,
 			fn($param): bool => $param instanceof B,
 		);
-		assertType('array<Bug4188\B>', $filtered);
+		assertType('array<Bug4188Types\B>', $filtered);
 
 		$this->onlyB($filtered);
 	}

tests/PHPStan/Analyser/data/bug-4885.php

@@ -1,6 +1,6 @@
 <?php // lint >= 8.0
 
-namespace Bug4885;
+namespace Bug4885Types;
 
 use function PHPStan\Testing\assertType;
 

tests/PHPStan/Analyser/data/bug-4902-php8.php

@@ -1,6 +1,6 @@
 <?php // lint >= 7.4
 
-namespace Bug4902;
+namespace Bug4902Php8;
 
 use function PHPStan\Testing\assertType;
 
@@ -44,10 +44,10 @@ function wrap($value): Wrapper
 	 * @param Wrapper<T-all> ...$wrappers
 	 */
 	function unwrapAllAndWrapAgain(Wrapper ...$wrappers): void {
-		assertType('array<int|string, T-all (method Bug4902\Wrapper::unwrapAllAndWrapAgain(), argument)>', array_map(function (Wrapper $item) {
+		assertType('array<int|string, T-all (method Bug4902Php8\Wrapper::unwrapAllAndWrapAgain(), argument)>', array_map(function (Wrapper $item) {
 			return $this->unwrap($item);
 		}, $wrappers));
-		assertType('array<int|string, T-all (method Bug4902\Wrapper::unwrapAllAndWrapAgain(), argument)>', array_map(fn (Wrapper $item) => $this->unwrap($item), $wrappers));
+		assertType('array<int|string, T-all (method Bug4902Php8\Wrapper::unwrapAllAndWrapAgain(), argument)>', array_map(fn (Wrapper $item) => $this->unwrap($item), $wrappers));
 	}
 
 }

tests/PHPStan/Analyser/data/bug-5287-php81.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Bug5287;
+namespace Bug5287Php81;
 
 use function PHPStan\Testing\assertType;
 
@@ -34,7 +34,7 @@ function foo3(array $arr): void
 /**
  * @param non-empty-array<string, int> $arr
  */
-function foo3(array $arr): void
+function foo4(array $arr): void
 {
 	$arrSpread = [...$arr];
 	assertType('non-empty-array<string, int>', $arrSpread);
@@ -43,7 +43,7 @@ function foo3(array $arr): void
 /**
  * @param non-empty-array<mixed, bool|int> $arr
  */
-function foo4(array $arr): void
+function foo5(array $arr): void
 {
 	$arrSpread = [...$arr];
 	assertType('non-empty-array<int|string, bool|int>', $arrSpread);

tests/PHPStan/Analyser/data/bug-5287.php

@@ -34,7 +34,7 @@ function foo3(array $arr): void
 /**
  * @param non-empty-array<string, int> $arr
  */
-function foo3(array $arr): void
+function foo4(array $arr): void
 {
 	$arrSpread = [...$arr];
 	assertType('non-empty-list<int>', $arrSpread);
@@ -43,7 +43,7 @@ function foo3(array $arr): void
 /**
  * @param non-empty-array<mixed, bool|int> $arr
  */
-function foo4(array $arr): void
+function foo5(array $arr): void
 {
 	$arrSpread = [...$arr];
 	assertType('non-empty-list<bool|int>', $arrSpread);