use getIterableValueType

Author: canvural

src/Type/Php/ArrayFirstDynamicReturnTypeExtension.php renamed to src/Type/Php/ArrayFirstLastDynamicReturnTypeExtension.php

@@ -11,14 +11,15 @@
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use function count;
+use function in_array;
 
 #[AutowiredService]
-final class ArrayFirstDynamicReturnTypeExtension implements DynamicFunctionReturnTypeExtension
+final class ArrayFirstLastDynamicReturnTypeExtension implements DynamicFunctionReturnTypeExtension
 {
 
 	public function isFunctionSupported(FunctionReflection $functionReflection): bool
 	{
-		return $functionReflection->getName() === 'array_first' && $functionReflection->isBuiltin();
+		return in_array($functionReflection->getName(), ['array_first', 'array_last'], true);
 	}
 
 	public function getTypeFromFunctionCall(FunctionReflection $functionReflection, FuncCall $functionCall, Scope $scope): ?Type
@@ -36,7 +37,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			return new NullType();
 		}
 
-		$valueType = $argType->getFirstIterableValueType();
+		$valueType = $argType->getIterableValueType();
 
 		if ($iterableAtLeastOnce->yes()) {
 			return $valueType;

src/Type/Php/ArrayLastDynamicReturnTypeExtension.php

@@ -7,15 +7,18 @@
 /**
  * @param string[] $stringArray
  * @param non-empty-array<int, string> $nonEmptyArray
+ * @param array{1: 'bar', baz: 'foo'} $arrayShape
  */
-function doFoo(array $stringArray, array $nonEmptyArray, $mixed): void
+function doFoo(array $stringArray, array $nonEmptyArray, $mixed, $arrayShape): void
 {
-	assertType("'a'", array_first([1 => 'a', 0 => 'b', 2 => 'c']));
+	assertType("'a'|'b'|'c'", array_first([1 => 'a', 0 => 'b', 2 => 'c']));
+	assertType("'bar'|'foo'", array_first($arrayShape));
 	assertType('string|null', array_first($stringArray));
 	assertType('string', array_first($nonEmptyArray));
 	assertType('mixed', array_first($mixed));
 
-	assertType("'c'", array_last([1 => 'a', 0 => 'b', 2 => 'c']));
+	assertType("'a'|'b'|'c'", array_last([1 => 'a', 0 => 'b', 2 => 'c']));
+	assertType("'bar'|'foo'", array_last($arrayShape));
 	assertType('string|null', array_last($stringArray));
 	assertType('string', array_last($nonEmptyArray));
 	assertType('mixed', array_last($mixed));