Skip to content

Add benchmarks and micro-optimise the injection hot path #41

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

Draft
TomA-R wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add benchmarks and micro-optimise the injection hot path #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 30 additions & 7 deletions src/Injector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,21 @@ class Injector implements InjectorInterface
*/
private array $autoCreateCache = [];

/**
* Cached results of container->has() calls per type.
*
* The container is typically sealed at bootstrap, so whether a given FQCN
* is registered doesn't change during a request. Caching the boolean here
* eliminates a PSR-11 has() call on every subsequent injection of the same
* typed dependency.
*
* Stored as true|false so that false (type absent) is distinguishable from
* null (not yet looked up) via the null-coalescing operator.
*
* @var array<string, bool>
*/
private array $containerHasCache = [];

public function __construct(private readonly ContainerInterface $container, private readonly ClassInspectorInterface $classInspector)
{
}
Expand Down Expand Up @@ -79,9 +94,12 @@ public function create($className, $parameters = [])
}

try {
$parameters = $this->buildParameterArray($signature, $parameters);
// Fast path: skip the extra method call for the common autowiring case
if (empty($parameters)) {
return new $className(...$this->buildParameterArrayFromContainer($signature));
}

return new $className(...$parameters);
return new $className(...$this->buildParameterArray($signature, $parameters));
} catch (MissingRequiredParameterException $e) {
throw new InjectorInvocationException(
"Can't create $className " .
Expand Down Expand Up @@ -238,24 +256,29 @@ private function buildParameterArray($methodSignature, $providedParameters)
private function buildParameterArrayFromContainer($methodSignature)
{
$parameters = [];
foreach ($methodSignature as $position => $parameterData) {
foreach ($methodSignature as $parameterData) {
if (isset($parameterData['variadic'])) {
// variadic with no provided params = nothing to pipe
break;
}
$type = $parameterData['type'] ?? false;
if ($type) {
if ($this->container->has($type)) {
$parameters[$position] = $this->container->get($type);
$inContainer = $this->containerHasCache[$type] ?? null;
if ($inContainer === null) {
$inContainer = $this->container->has($type);
$this->containerHasCache[$type] = $inContainer;
}
if ($inContainer) {
$parameters[] = $this->container->get($type);
continue;
}
if ($this->canAutoCreate($type)) {
$parameters[$position] = $this->create($type);
$parameters[] = $this->create($type);
continue;
}
}
if (array_key_exists('default', $parameterData)) {
$parameters[$position] = $parameterData['default'];
$parameters[] = $parameterData['default'];
continue;
}
$name = $parameterData['name'];
Expand Down