Skip to content

[DependencyInjection] fix auto-refresh when inline_factories is enabled #44010

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.

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
Nov 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 19 additions & 15 deletions src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ public function dump(array $options = [])
}

$code =
$this->startClass($options['class'], $baseClass).
$this->startClass($options['class'], $baseClass, $this->inlineFactories && $proxyClasses).
$this->addServices($services).
$this->addDeprecatedAliases().
$this->addDefaultParametersMethod()
Expand Down Expand Up @@ -286,14 +286,15 @@ class %s extends {$options['class']}

$code .= $this->endClass();

if ($this->inlineFactories) {
if ($this->inlineFactories && $proxyClasses) {
$files['proxy-classes.php'] = "<?php\n\n";

foreach ($proxyClasses as $c) {
$code .= $c;
$files['proxy-classes.php'] .= $c;
}
}

$files[$options['class'].'.php'] = $code;
$preloadedFiles[$options['class'].'.php'] = $options['class'].'.php';
$hash = ucfirst(strtr(ContainerBuilder::hash($files), '._', 'xx'));
$code = [];

Expand All @@ -313,7 +314,9 @@ class %s extends {$options['class']}
$autoloadFile = trim($this->export($autoloadFile), '()\\');

$preloadedFiles = array_reverse($preloadedFiles);
$preloadedFiles = implode("';\nrequire __DIR__.'/", $preloadedFiles);
if ('' !== $preloadedFiles = implode("';\nrequire __DIR__.'/", $preloadedFiles)) {
$preloadedFiles = "require __DIR__.'/$preloadedFiles';\n";
}

$code[$options['class'].'.preload.php'] = <<<EOF
<?php
Expand All @@ -328,8 +331,8 @@ class %s extends {$options['class']}
}

require $autoloadFile;
require __DIR__.'/$preloadedFiles';

(require __DIR__.'/Container{$hash}/{$options['class']}.php')->set(\\Container{$hash}\\{$options['class']}::class, null);
$preloadedFiles
\$classes = [];

EOF;
Expand Down Expand Up @@ -1179,7 +1182,7 @@ private function addNewInstance(Definition $definition, string $return = '', str
return $return.sprintf('new %s(%s)', $this->dumpLiteralClass($this->dumpValue($class)), implode(', ', $arguments)).$tail;
}

private function startClass(string $class, string $baseClass): string
private function startClass(string $class, string $baseClass, bool $hasProxyClasses): string
{
$namespaceLine = !$this->asFiles && $this->namespace ? "\nnamespace {$this->namespace};\n" : '';

Expand Down Expand Up @@ -1239,7 +1242,7 @@ public function __construct()
$code .= $this->addMethodMap();
$code .= $this->asFiles && !$this->inlineFactories ? $this->addFileMap() : '';
$code .= $this->addAliases();
$code .= $this->addInlineRequires();
$code .= $this->addInlineRequires($hasProxyClasses);
$code .= <<<EOF
}

Expand Down Expand Up @@ -1451,15 +1454,12 @@ protected function {$methodNameAlias}()
return $code;
}

private function addInlineRequires(): string
private function addInlineRequires(bool $hasProxyClasses): string
{
if (!$this->hotPathTag || !$this->inlineRequires) {
return '';
}

$lineage = [];
$hotPathServices = $this->hotPathTag && $this->inlineRequires ? $this->container->findTaggedServiceIds($this->hotPathTag) : [];

foreach ($this->container->findTaggedServiceIds($this->hotPathTag) as $id => $tags) {
foreach ($hotPathServices as $id => $tags) {
$definition = $this->container->getDefinition($id);

if ($this->getProxyDumper()->isProxyCandidate($definition)) {
Expand All @@ -1484,6 +1484,10 @@ private function addInlineRequires(): string
}
}

if ($hasProxyClasses) {
$code .= "\n include __DIR__.'/proxy-classes.php';";
}

return $code ? sprintf("\n \$this->privates['service_container'] = function () {%s\n };\n", $code) : '';
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,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/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
require __DIR__.'/Container%s/getClosureService.php';

$classes = [];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -907,7 +907,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/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
require __DIR__.'/Container%s/getThrowingOneService.php';
require __DIR__.'/Container%s/getTaggedIteratorService.php';
require __DIR__.'/Container%s/getServiceFromStaticMethodService.php';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,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/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);

$classes = [];
$classes[] = 'Bar\FooClass';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,19 @@ return [
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
];

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

namespace Container%s;

include_once $this->targetDir.''.'/Fixtures/includes/foo.php';

class FooClass_%s extends \Bar\FooClass implements \ProxyManager\Proxy\VirtualProxyInterface
%A

if (!\class_exists('FooClass_%s', false)) {
\class_alias(__NAMESPACE__.'\\FooClass_%s', 'FooClass_%s', false);
}

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

namespace Container%s;
Expand Down Expand Up @@ -45,6 +58,10 @@ class ProjectServiceContainer extends Container
];

$this->aliases = [];

$this->privates['service_container'] = function () {
include __DIR__.'/proxy-classes.php';
};
}

public function compile(): void
Expand Down Expand Up @@ -156,16 +173,6 @@ class ProjectServiceContainer extends Container
];
}
}
include_once $this->targetDir.''.'/Fixtures/includes/foo.php';

class FooClass_%s extends \Bar\FooClass implements \ProxyManager\Proxy\VirtualProxyInterface
{
%A
}

if (!\class_exists('FooClass_%s', false)) {
\class_alias(__NAMESPACE__.'\\FooClass_%s', 'FooClass_%s', false);
}

[ProjectServiceContainer.preload.php] => <?php

Expand All @@ -179,7 +186,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/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);

$classes = [];
$classes[] = 'Bar\FooClass';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,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/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
require __DIR__.'/Container%s/proxy.php';
require __DIR__.'/Container%s/getNonSharedFooService.php';

Expand Down