next() dynamic return type extension also valid for prev()

phpstan · Jul 12, 2021 · 2fd7bfe · 2fd7bfe
1 parent a056d34
commit 2fd7bfe
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/Type/Php/ArrayNextDynamicReturnTypeExtension.php b/src/Type/Php/ArrayNextDynamicReturnTypeExtension.php
@@ -15,7 +15,7 @@ class ArrayNextDynamicReturnTypeExtension implements \PHPStan\Type\DynamicFuncti
 
 	public function isFunctionSupported(FunctionReflection $functionReflection): bool
 	{
-		return $functionReflection->getName() === 'next';
+		return in_array($functionReflection->getName(), ['next', 'prev'], true);
 	}
 
 	public function getTypeFromFunctionCall(FunctionReflection $functionReflection, FuncCall $functionCall, Scope $scope): Type

diff --git a/tests/PHPStan/Analyser/data/array-next.php b/tests/PHPStan/Analyser/data/array-next.php
@@ -31,6 +31,33 @@ public function doBaz(array $a)
 
 }
 
+class Foo2
+{
+
+	public function doFoo()
+	{
+		$array = [];
+		assertType('false', prev($array));
+	}
+
+	/**
+	 * @param int[] $a
+	 */
+	public function doBar(array $a)
+	{
+		assertType('int|false', prev($a));
+	}
+
+	/**
+	 * @param non-empty-array<int, string> $a
+	 */
+	public function doBaz(array $a)
+	{
+		assertType('string|false', prev($a));
+	}
+
+}
+
 interface HttpClientPoolItem
 {
 	public function isDisabled(): bool;