Skip to content

Micro-optimisation in BindingClosureFactory: speed up injector invocation and proxy closures #37

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 2 commits into
base: master
Choose a base branch
from
Draft

Micro-optimisation in BindingClosureFactory: speed up injector invocation and proxy closures #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38ded0f
Micro-optimisation in BindingClosureFactory: speed up injector invoca…
TomA-R Oct 18, 2025
3e593fe
Remove ignored error from PHPStan baseline to fix build
TomA-R Oct 18, 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
6 changes: 0 additions & 6 deletions .phpstan/baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,6 @@ parameters:
count: 1
path: ../src/InjectorServiceProvider.php

-
message: '#^Method Bigcommerce\\Injector\\InjectorServiceProvider\:\:get\(\) has InvalidArgumentException in PHPDoc @throws tag but it''s not thrown\.$#'
identifier: throws.unusedType
count: 1
path: ../src/InjectorServiceProvider.php

-
message: '#^Call to an undefined method ReflectionType\:\:getName\(\)\.$#'
identifier: method.notFound
Expand Down
53 changes: 21 additions & 32 deletions src/ServiceProvider/BindingClosureFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ class BindingClosureFactory
/**
* @var LazyLoadingValueHolderFactory
*/
private $proxyFactory;
private LazyLoadingValueHolderFactory $proxyFactory;

/**
* @var InjectorInterface
*/
private $injector;
private InjectorInterface $injector;

/**
* BindingClosureFactory constructor.
Expand All @@ -43,9 +43,10 @@ public function __construct(LazyLoadingValueHolderFactory $proxyFactory, Injecto
*/
public function createAutoWireClosure($className, ?callable $parameterFactory = null)
{
return function (Container $app) use ($className, $parameterFactory) {
$injector = $this->injector;
return static function (Container $app) use ($className, $parameterFactory, $injector) {
$parameters = $parameterFactory ? $parameterFactory($app) : [];
return $this->injector->create($className, $parameters);
return $injector->create($className, $parameters);
};
}

Expand All @@ -64,9 +65,18 @@ public function createAutoWireClosure($className, ?callable $parameterFactory =
*/
public function createAutoWireProxyClosure($className, ?callable $parameterFactory = null)
{
return function (Container $app) use ($className, $parameterFactory) {
$serviceFactory = $this->createAutoWireClosure($className, $parameterFactory);
return $this->createProxy($className, $serviceFactory, $app);
$proxyFactory = $this->proxyFactory;
$createAutoWireClosure = [$this, 'createAutoWireClosure'];
return static function (Container $app) use ($className, $parameterFactory, $proxyFactory, $createAutoWireClosure) {
$serviceFactory = $createAutoWireClosure($className, $parameterFactory);
return $proxyFactory->createProxy(
$className,
static function (&$wrappedObject, $proxy, $method, $parameters, &$initializer) use ($serviceFactory, $app) {
$wrappedObject = $serviceFactory($app);
$initializer = null;
return true;
}
);
};
}

Expand All @@ -83,9 +93,10 @@ public function createAutoWireProxyClosure($className, ?callable $parameterFacto
*/
public function createServiceProxy(Container $app, string $serviceName, string $serviceClassName)
{
return $this->createProxy(
$proxyFactory = $this->proxyFactory;
return $proxyFactory->createProxy(
$serviceClassName,
function (Container $app) use ($serviceName, $serviceClassName) {
static function (&$wrappedObject, $proxy, $method, $parameters, &$initializer) use ($app, $serviceName, $serviceClassName) {
$service = $app->offsetGet($serviceName);
if (! ($service instanceof $serviceClassName)) {
$invalidClassName = get_class($service);
Expand All @@ -96,29 +107,7 @@ function (Container $app) use ($serviceName, $serviceClassName) {
"binding and make sure it specifies the actual class name that will be returned by that service."
);
}
return $service;
},
$app
);
}

/**
* Create a project object for the specified ClassName bound to the given ServiceFactory method.
* @param string $className
* @param callable $serviceFactory
* @param Container $app
* @return \ProxyManager\Proxy\VirtualProxyInterface
*/
private function createProxy($className, callable $serviceFactory, Container $app)
{
return $this->proxyFactory->createProxy(
$className,
function (&$wrappedObject, $proxy, $method, $parameters, &$initializer) use (
$className,
$serviceFactory,
$app
) {
$wrappedObject = $serviceFactory($app);
$wrappedObject = $service;
$initializer = null;
return true;
}
Expand Down