Add class_alias for generated proxy classes

symfony · Jun 9, 2020 · c4f1a54 · c4f1a54
1 parent 0b19249
commit c4f1a54
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -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;

diff --git a/...ony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt b/...ony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
@@ -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')) {
+    \class_alias(__NAMESPACE__.'\\FooClass_%s', 'FooClass_%s', false);
+}
 
     [ProjectServiceContainer.preload.php] => <?php