Fix importing debug services

Sylius · Feb 8, 2024 · a77600e · a77600e
1 parent c95ef0c
commit a77600e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 87 deletions.
diff --git a/src/TwigHooks/config/services/debug.php → ...oks/config/services/debug/twig_events.php b/src/TwigHooks/config/services/debug.php → ...oks/config/services/debug/twig_events.php
@@ -2,7 +2,6 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-use Sylius\TwigHooks\DependencyInjection\CompilerPass\UnregisterDebugServicesPass;
 use Sylius\TwigHooks\Hook\Renderer\Debug\HookDebugCommentRenderer;
 use Sylius\TwigHooks\Hook\Renderer\Debug\HookProfilerRenderer;
 use Sylius\TwigHooks\Hookable\Renderer\Debug\HookableDebugCommentRenderer;
@@ -13,7 +12,6 @@
 
 return static function (ContainerBuilder $container, ContainerConfigurator $configurator): void {
     $services = $configurator->services();
-    $services->defaults()->tag(UnregisterDebugServicesPass::DEBUG_TAG);
 
     $services->set('twig_hooks.renderer.hook.debug_comment', HookDebugCommentRenderer::class)
         ->decorate('twig_hooks.renderer.hook', priority: 256)

diff --git a/src/TwigHooks/src/DependencyInjection/CompilerPass/UnregisterDebugServicesPass.php b/src/TwigHooks/src/DependencyInjection/CompilerPass/UnregisterDebugServicesPass.php
diff --git a/src/TwigHooks/src/DependencyInjection/TwigHooksExtension.php b/src/TwigHooks/src/DependencyInjection/TwigHooksExtension.php
@@ -16,6 +16,10 @@ public function load(array $configs, ContainerBuilder $container): void
         $loader = new PhpFileLoader($container, new FileLocator(dirname(__DIR__, 2) . '/config'));
         $loader->load('services.php');
 
+        if ($container->getParameter('kernel.debug')) {
+            $loader->load('services/debug/twig_events.php');
+        }
+
         $configuration = $this->getConfiguration([], $container);
         if ($configuration === null) {
             return;

diff --git a/src/TwigHooks/src/TwigHooksBundle.php b/src/TwigHooks/src/TwigHooksBundle.php
@@ -4,17 +4,10 @@
 
 namespace Sylius\TwigHooks;
 
-use Sylius\TwigHooks\DependencyInjection\CompilerPass\UnregisterDebugServicesPass;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 final class TwigHooksBundle extends Bundle
 {
-    public function build(ContainerBuilder $container): void
-    {
-        $container->addCompilerPass(new UnregisterDebugServicesPass());
-    }
-
     public function getPath(): string
     {
         return \dirname(__DIR__);

diff --git a/...ks/tests/Integration/DependencyInjection/CompilerPass/UnregisterDebugServicesPassTest.php b/...ks/tests/Integration/DependencyInjection/CompilerPass/UnregisterDebugServicesPassTest.php