Skip to content

Remember function return type extensions #4644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
staabm wants to merge 3 commits into
base: 2.1.x
Choose a base branch
from
+22 −7
Open

Remember function return type extensions #4644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2804327
Remember function return type extensions
staabm Dec 20, 2025
4d571d6
Update MutatingScope.php
staabm Dec 20, 2025
0694bf9
move cache into DynamicReturnTypeExtensionRegistry
staabm Dec 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/Analyser/MutatingScope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2500,16 +2500,13 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu

private function getDynamicFunctionReturnType(FuncCall $normalizedNode, FunctionReflection $functionReflection): ?Type
{
foreach ($this->dynamicReturnTypeExtensionRegistry->getDynamicFunctionReturnTypeExtensions() as $dynamicFunctionReturnTypeExtension) {
if (!$dynamicFunctionReturnTypeExtension->isFunctionSupported($functionReflection)) {
continue;
}

foreach ($this->dynamicReturnTypeExtensionRegistry->getDynamicFunctionReturnTypeExtensions($functionReflection) as $dynamicFunctionReturnTypeExtension) {
$resolvedType = $dynamicFunctionReturnTypeExtension->getTypeFromFunctionCall(
$functionReflection,
$normalizedNode,
$this,
);

if ($resolvedType !== null) {
return $resolvedType;
}
Expand Down
22 changes: 20 additions & 2 deletions src/Type/DynamicReturnTypeExtensionRegistry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace PHPStan\Type;

use PHPStan\Reflection\FunctionReflection;
use PHPStan\Reflection\ReflectionProvider;
use function array_merge;
use function strtolower;
Expand All @@ -15,6 +16,9 @@ final class DynamicReturnTypeExtensionRegistry
/** @var DynamicStaticMethodReturnTypeExtension[][]|null */
private ?array $dynamicStaticMethodReturnTypeExtensionsByClass = null;

/** @var array<string, list<DynamicFunctionReturnTypeExtension>> */
private array $dynamicReturnTypeExtensionsByFunction = [];

/**
* @param DynamicMethodReturnTypeExtension[] $dynamicMethodReturnTypeExtensions
* @param DynamicStaticMethodReturnTypeExtension[] $dynamicStaticMethodReturnTypeExtensions
Expand Down Expand Up @@ -88,9 +92,23 @@ private function getDynamicExtensionsForType(array $extensions, string $classNam
/**
* @return DynamicFunctionReturnTypeExtension[]
*/
public function getDynamicFunctionReturnTypeExtensions(): array
public function getDynamicFunctionReturnTypeExtensions(FunctionReflection $functionReflection): array
{
return $this->dynamicFunctionReturnTypeExtensions;
$functionName = $functionReflection->getName();
if (isset($this->dynamicReturnTypeExtensionsByFunction[$functionName])) {
return $this->dynamicReturnTypeExtensionsByFunction[$functionName];
}

$supportedFunctions = [];
foreach ($this->dynamicFunctionReturnTypeExtensions as $dynamicFunctionReturnTypeExtension) {
if (!$dynamicFunctionReturnTypeExtension->isFunctionSupported($functionReflection)) {
continue;
}

$supportedFunctions[] = $dynamicFunctionReturnTypeExtension;
}

return $this->dynamicReturnTypeExtensionsByFunction[$functionName] ??= $supportedFunctions;
}

}
Loading