Skip to content

[DI] fix dumping non-shared lazy services #38357

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

Merged
merged 1 commit into from
Oct 1, 2020
Merged

[DI] fix dumping non-shared lazy services #38357

Show file tree
Hide file tree
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
39 changes: 33 additions & 6 deletions src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,18 +863,45 @@ protected function {$methodName}($lazyInitialization)
}
}

if ($this->getProxyDumper()->isProxyCandidate($definition)) {
$factoryCode = $definition->isShared() ? ($asFile ? "\$this->load('%s', false)" : '$this->%s(false)') : '$this->factories[%2$s](false)';
$factoryCode = $this->getProxyDumper()->getProxyFactoryCode($definition, $id, sprintf($factoryCode, $methodName, $this->doExport($id)));
if (!$definition->isShared()) {
$factory = sprintf('$this->factories%s[%s]', $definition->isPublic() ? '' : "['service_container']", $this->doExport($id));
}

if ($isProxyCandidate = $this->getProxyDumper()->isProxyCandidate($definition)) {
if (!$definition->isShared()) {
$code .= sprintf(' %s = %1$s ?? ', $factory);

if ($asFile) {
$code .= "function () {\n";
$code .= " return self::do(\$container);\n";
$code .= " };\n\n";
} else {
$code .= sprintf("\\Closure::fromCallable([\$this, '%s']);\n\n", $methodName);
}
}

$factoryCode = $asFile ? 'self::do($container, false)' : sprintf('$this->%s(false)', $methodName);
$factoryCode = $this->getProxyDumper()->getProxyFactoryCode($definition, $id, $factoryCode);
$code .= $asFile ? preg_replace('/function \(([^)]*+)\) {/', 'function (\1) use ($container) {', $factoryCode) : $factoryCode;
}

$code .= $this->addServiceInclude($id, $definition);
$c = $this->addServiceInclude($id, $definition);

if ('' !== $c && $isProxyCandidate && !$definition->isShared()) {
$c = implode("\n", array_map(function ($line) { return $line ? ' '.$line : $line; }, explode("\n", $c)));
$code .= " static \$include = true;\n\n";
$code .= " if (\$include) {\n";
$code .= $c;
$code .= " \$include = false;\n";
$code .= " }\n\n";
} else {
$code .= $c;
}

$c = $this->addInlineService($id, $definition);

if (!$definition->isShared()) {
if (!$isProxyCandidate && !$definition->isShared()) {
$c = implode("\n", array_map(function ($line) { return $line ? ' '.$line : $line; }, explode("\n", $c)));
$factory = sprintf('$this->factories%s[%s]', $definition->isPublic() ? '' : "['service_container']", $this->doExport($id));
$lazyloadInitialization = $definition->isLazy() ? '$lazyLoad = true' : '';

$c = sprintf(" %s = function (%s) {\n%s };\n\n return %1\$s();\n", $factory, $lazyloadInitialization, $c);
Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ public function testNonSharedLazyDumpAsFiles()
->setLazy(true);
$container->compile();
$dumper = new PhpDumper($container);
$dumper->setProxyDumper(new \DummyProxyDumper());
$dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'inline_factories_parameter' => false, 'inline_class_loader_parameter' => false]), true);

if ('\\' === \DIRECTORY_SEPARATOR) {
Expand Down
8 changes: 3 additions & 5 deletions src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,11 @@ protected function getBarService()
*/
protected function getFooService($lazyLoad = true)
{
// lazy factory for stdClass
$this->factories['service_container']['foo'] = $this->factories['service_container']['foo'] ?? \Closure::fromCallable([$this, 'getFooService']);

$this->factories['service_container']['foo'] = function ($lazyLoad = true) {
return new \stdClass();
};
// lazy factory for stdClass

return $this->factories['service_container']['foo']();
return new \stdClass();
}
}

Expand Down
36 changes: 31 additions & 5 deletions ...ny/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,34 @@ class getNonSharedFooService extends ProjectServiceContainer
*/
public static function do($container, $lazyLoad = true)
{
include_once $container->targetDir.''.'/Fixtures/includes/foo_lazy.php';

$container->factories['non_shared_foo'] = function ($lazyLoad = true) use ($container) {
return new \Bar\FooLazyClass();
$container->factories['non_shared_foo'] = $container->factories['non_shared_foo'] ?? function () use ($container) {
return self::do($container);
};

return $container->factories['non_shared_foo']();
// lazy factory for Bar\FooLazyClass

static $include = true;

if ($include) {
include_once $container->targetDir.''.'/Fixtures/includes/foo_lazy.php';

$include = false;
}

return new \Bar\FooLazyClass();
}
}

[Container%s/proxy.php] => <?php

namespace Container%s;

// proxy code for Bar\FooLazyClass

if (!\class_exists('proxy', false)) {
\class_alias(__NAMESPACE__.'\\proxy', 'proxy', false);
}

[Container%s/ProjectServiceContainer.php] => <?php

namespace Container%s;
Expand Down Expand Up @@ -105,6 +123,13 @@ class ProjectServiceContainer extends Container

return class_exists($class, false) ? $class::do($this, $lazyLoad) : $service;
}

protected function createProxy($class, \Closure $factory)
{
class_exists($class, false) || require __DIR__.'/'.$class.'.php';

return $factory();
}
}

[ProjectServiceContainer.preload.php] => <?php
Expand All @@ -120,6 +145,7 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {

require dirname(__DIR__, %d).'%svendor/autoload.php';
require __DIR__.'/Container%s/ProjectServiceContainer.php';
require __DIR__.'/Container%s/proxy.php';
require __DIR__.'/Container%s/getNonSharedFooService.php';

$classes = [];
Expand Down