[WebProfilerBundle] inlined a service (closes #4717)

symfony · Jul 3, 2012 · f47b9a6 · f47b9a6 · Bladrak · Jul 3, 2012
1 parent 736aa21
commit f47b9a6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -17,6 +17,7 @@
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpFoundation\Session\Flash\AutoExpireFlashBag;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Bundle\WebProfilerBundle\Profiler\TemplateManager;
 
 /**
  * ProfilerController.
@@ -25,6 +26,8 @@
  */
 class ProfilerController extends ContainerAware
 {
+    protected $templateManager;
+
     /**
      * Renders a profiler panel for the given token.
      *
@@ -49,15 +52,13 @@ public function panelAction(Request $request, $token)
             throw new NotFoundHttpException(sprintf('Panel "%s" is not available for token "%s".', $panel, $token));
         }
 
-        $templateManager = $this->container->get('web_profiler.template_manager');
-
-        return $this->container->get('templating')->renderResponse($templateManager->getName($profile, $panel), array(
+        return $this->container->get('templating')->renderResponse($this->getTemplateManager()->getName($profile, $panel), array(
             'token'     => $token,
             'profile'   => $profile,
             'collector' => $profile->getCollector($panel),
             'panel'     => $panel,
             'page'      => $page,
-            'templates' => $templateManager->getTemplates($profile),
+            'templates' => $this->getTemplateManager()->getTemplates($profile),
             'is_ajax'   => $request->isXmlHttpRequest(),
         ));
     }
@@ -183,7 +184,7 @@ public function toolbarAction($token, $position = null)
         return $this->container->get('templating')->renderResponse('WebProfilerBundle:Profiler:toolbar.html.twig', array(
             'position'     => $position,
             'profile'      => $profile,
-            'templates'    => $this->container->get('web_profiler.template_manager')->getTemplates($profile),
+            'templates'    => $this->getTemplateManager()->getTemplates($profile),
             'profiler_url' => $url,
         ));
     }
@@ -309,4 +310,18 @@ public function phpinfoAction()
 
         return new Response($phpinfo);
     }
+
+    protected function getTemplateManager()
+    {
+        if (null === $this->templateManager) {
+            $this->templateManager = new TemplateManager(
+                $this->container->get('profiler'),
+                $this->container->get('templating'),
+                $this->container->get('twig'),
+                $this->container->getParameter('data_collector.templates')
+            );
+        }
+
+        return $this->templateManager;
+    }
 }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml
@@ -6,7 +6,6 @@
 
     <parameters>
         <parameter key="web_profiler.debug_toolbar.class">Symfony\Bundle\WebProfilerBundle\EventListener\WebDebugToolbarListener</parameter>
-        <parameter key="web_profiler.template_manager.class">Symfony\Bundle\WebProfilerBundle\Profiler\TemplateManager</parameter>
     </parameters>
 
     <services>
@@ -17,12 +16,5 @@
             <argument>%web_profiler.debug_toolbar.mode%</argument>
             <argument>%web_profiler.debug_toolbar.position%</argument>
         </service>
-
-        <service id="web_profiler.template_manager" class="%web_profiler.template_manager.class%">
-            <argument type="service" id="profiler" />
-            <argument type="service" id="templating.engine.twig" />
-            <argument type="service" id="twig" />
-            <argument>%data_collector.templates%</argument>
-        </service>
     </services>
 </container>