Skip to content
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

Jump to bottom

[DI] Add check around class_alias for generated proxy classes #37144

Merged
merged 1 commit into from Jun 9, 2020
Merged

[DI] Add check around class_alias for generated proxy classes #37144

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
View file
Open in desktop
Expand Up @@ -567,7 +567,7 @@ private function generateProxyClasses(): array
$proxyClass = explode(' ', $this->inlineRequires ? substr($proxyCode, \strlen($code)) : $proxyCode, 3)[1];

if ($this->asFiles || $this->namespace) {
$proxyCode .= "\n\\class_alias(__NAMESPACE__.'\\\\$proxyClass', '$proxyClass', false);\n";
$proxyCode .= "\nif (!\\class_exists('$proxyClass', false)) {\n \\class_alias(__NAMESPACE__.'\\\\$proxyClass', '$proxyClass', false);\n}\n";
}

$proxyClasses[$proxyClass.'.php'] = $proxyCode;
Expand Down Expand Up @@ -1086,7 +1086,7 @@ private function addNewInstance(Definition $definition, string $return = '', str
// If the class is a string we can optimize away
if (0 === strpos($class, "'") && false === strpos($class, '$')) {
if ("''" === $class) {
throw new RuntimeException(sprintf('Cannot dump definition: %s service is defined to be created by a factory but is missing the service reference, did you forget to define the factory service id or class?', $id ? 'The "'.$id.'"' : 'inline'));
throw new RuntimeException(sprintf('Cannot dump definition: "%s" service is defined to be created by a factory but is missing the service reference, did you forget to define the factory service id or class?', $id ? 'The "'.$id.'"' : 'inline'));
}

return $return.sprintf('%s::%s(%s)', $this->dumpLiteralClass($class), $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;
Expand Down
4 changes: 3 additions & 1 deletion ...ony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
View file
Open in desktop
Expand Up @@ -160,7 +160,9 @@ class FooClass_%s extends \Bar\FooClass implements \ProxyManager\Proxy\VirtualPr
%A
}

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

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

Expand Down