use request from container.

Author: makasim

Resources/config/services.xml

@@ -19,8 +19,7 @@
  </service>
 
  <service id="jm_ab.template_loader" class="Jm\ABBundle\Twig\TemplateLoader">
- <argument type="service" id="jm_ab.template_manager" />
- <argument>%jm_ab.variation_parameter%</argument>
+ <argument type="service" id="service_container" />
  </service>
 
  <service id="jm_ab.twig_loader" class="%jm_ab.loader.class%">

Twig/TemplateLoader.php

@@ -4,19 +4,18 @@
 
 use Jm\ABBundle\Entity\Template;
 use Jm\ABBundle\Entity\TemplateManager;
-use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class TemplateLoader implements \Twig_LoaderInterface
 {
- private $manager;
- private $request;
- private $variationParameter;
-
- public function __construct(TemplateManager $manager, $variationParameter)
+ /**
+ * @var ContainerInterface
+ */
+ private $container; 
+ 
+ public function __construct(ContainerInterface $container)
  {
- $this->manager = $manager;
- $this->request = Request::createFromGlobals();
- $this->variationParameter = $variationParameter;
+ $this->container = $container;
  }
 
  /**
@@ -54,7 +53,7 @@ public function getCacheKey($fullName)
  return
  __CLASS__
  . '#' . $name
- . '#' . $this->request->get($this->variationParameter) === null ? 'A' : 'B'
+ . '#' . $this->container->get('request')->get($this->container->getParameter('jm_ab.variation_parameter')) === null ? 'A' : 'B'
  // force reload even if Twig has autoReload to false
  . '#' . $template->getUpdatedAt()->getTimestamp()
  ;
@@ -96,7 +95,7 @@ private function parse($name)
 
  private function getTemplate($name)
  {
- if (!$template = $this->manager->getTemplate($name)) {
+ if (!$template = $this->container->get('jm_ab.template_manager')->getTemplate($name)) {
  throw new \Twig_Error_Loader(sprintf("Unable to find template %s", $name));
  }
 
@@ -106,7 +105,7 @@ private function getTemplate($name)
  private function getTemplateVariation(Template $template)
  {
  $content = $template->getBody();
- if (null !== $this->request->get($this->variationParameter) && $this->isValidBody($template->getVariationBody())) {
+ if (null !== $this->container->get('request')->get($this->container->getParameter('jm_ab.variation_parameter')) && $this->isValidBody($template->getVariationBody())) {
  $content = $template->getVariationBody();
  }