Revert Add DynamicFunctionReturnTypeExtension for array_replace

This reverts commit 7114465.
phpstan · Aug 30, 2021 · d28f785 · d28f785
1 parent 9660b8d
commit d28f785
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 173 deletions.
diff --git a/conf/config.neon b/conf/config.neon
@@ -973,11 +973,6 @@ services:
 		tags:
 			- phpstan.broker.dynamicFunctionReturnTypeExtension
 
-	-
-		class: PHPStan\Type\Php\ArrayReplaceFunctionDynamicReturnTypeExtension
-		tags:
-			- phpstan.broker.dynamicFunctionReturnTypeExtension
-
 	-
 		class: PHPStan\Type\Php\ArrayKeysFunctionDynamicReturnTypeExtension
 		tags:

diff --git a/src/Type/Php/ArrayReplaceFunctionDynamicReturnTypeExtension.php b/src/Type/Php/ArrayReplaceFunctionDynamicReturnTypeExtension.php
diff --git a/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php b/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
@@ -5152,10 +5152,6 @@ public function dataArrayFunctions(): array
 				'array<int, int>',
 				'array_values($generalStringKeys)',
 			],
-			[
-				"array('foo' => 'foo', 1 => stdClass, 'bar' => stdClass)",
-				'array_replace($stringOrIntegerKeys, $stringKeys)',
-			],
 			[
 				"array('foo' => stdClass, 0 => stdClass)",
 				'array_merge($stringOrIntegerKeys)',

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -136,8 +136,6 @@ public function dataFileAsserts(): iterable
 
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-merge.php');
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-replace.php');
-
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/non-empty-array.php');
 
 		if (PHP_VERSION_ID >= 80000 || self::$useStaticReflectionProvider) {

diff --git a/tests/PHPStan/Analyser/data/array-replace.php b/tests/PHPStan/Analyser/data/array-replace.php
diff --git a/tests/PHPStan/Analyser/data/non-empty-array.php b/tests/PHPStan/Analyser/data/non-empty-array.php
@@ -49,11 +49,6 @@ public function arrayFunctions($array, $list, $stringArray): void
 		assertType('array&nonEmpty', array_merge($array, []));
 		assertType('array&nonEmpty', array_merge($array, $array));
 
-		assertType('array&nonEmpty', array_replace($array));
-		assertType('array&nonEmpty', array_replace([], $array));
-		assertType('array&nonEmpty', array_replace($array, []));
-		assertType('array&nonEmpty', array_replace($array, $array));
-
 		assertType('array<int|string, (int|string)>&nonEmpty', array_flip($array));
 		assertType('array<string, (int|string)>&nonEmpty', array_flip($stringArray));
 	}