remove dependancy on container for hackzilla_ticket.templates

Author: hackzilla

Controller/TicketController.php

@@ -45,7 +45,7 @@ public function indexAction(Request $request)
         );
 
         return $this->render(
-            $this->container->getParameter('hackzilla_ticket.templates.index'),
+            $this->container->getParameter('hackzilla_ticket.templates')['index'],
             [
                 'pagination'     => $pagination,
                 'ticketState'    => $ticketState,
@@ -81,7 +81,7 @@ public function createAction(Request $request)
         }
 
         return $this->render(
-            $this->container->getParameter('hackzilla_ticket.templates.new'),
+            $this->container->getParameter('hackzilla_ticket.templates')['new'],
             [
                 'entity' => $ticket,
                 'form'   => $form->createView(),
@@ -100,7 +100,7 @@ public function newAction()
         $form = $this->createForm(TicketType::class, $entity);
 
         return $this->render(
-            $this->container->getParameter('hackzilla_ticket.templates.new'),
+            $this->container->getParameter('hackzilla_ticket.templates')['new'],
             [
                 'entity' => $entity,
                 'form'   => $form->createView(),
@@ -143,7 +143,7 @@ public function showAction($ticketId)
             $data['delete_form'] = $this->createDeleteForm($ticket->getId())->createView();
         }
 
-        return $this->render($this->container->getParameter('hackzilla_ticket.templates.show'), $data);
+        return $this->render($this->container->getParameter('hackzilla_ticket.templates')['show'], $data);
     }
 
     /**
@@ -190,7 +190,7 @@ public function replyAction(Request $request, $ticketId)
             $data['delete_form'] = $this->createDeleteForm($ticket->getId())->createView();
         }
 
-        return $this->render($this->container->getParameter('hackzilla_ticket.templates.show'), $data);
+        return $this->render($this->container->getParameter('hackzilla_ticket.templates')['show'], $data);
     }
 
     /**

DependencyInjection/HackzillaTicketExtension.php

@@ -30,13 +30,7 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter('hackzilla_ticket.model.message.class', $config['message_class']);
 
         $container->setParameter('hackzilla_ticket.features', $config['features']);
-
-        $container->setParameter('hackzilla_ticket.templates.index', $config['templates']['index']);
-        $container->setParameter('hackzilla_ticket.templates.new', $config['templates']['new']);
-        $container->setParameter('hackzilla_ticket.templates.prototype', $config['templates']['prototype']);
-        $container->setParameter('hackzilla_ticket.templates.show', $config['templates']['show']);
-        $container->setParameter('hackzilla_ticket.templates.show_attachment', $config['templates']['show_attachment']);
-        $container->setParameter('hackzilla_ticket.templates.macros', $config['templates']['macros']);
+        $container->setParameter('hackzilla_ticket.templates', $config['templates']);
     }
 
     public static function bundleDirectory()

Resources/config/services.yml

@@ -56,11 +56,11 @@ services:
             - '@hackzilla_ticket.features'
         tags:
             - { name: twig.extension }
-            
+
     hackzilla_ticket.component.twig_extension.ticket_global:
         class: Hackzilla\Bundle\TicketBundle\TwigExtension\TicketGlobalExtension
         arguments:
-            - '@service_container'
+            - '%hackzilla_ticket.templates%'
         tags:
             - { name: twig.extension }
 

TwigExtension/TicketGlobalExtension.php

@@ -2,21 +2,16 @@
 
 namespace Hackzilla\Bundle\TicketBundle\TwigExtension;
 
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
 class TicketGlobalExtension extends \Twig_Extension implements \Twig_Extension_GlobalsInterface
 {
-    /**
-     * @var \Symfony\Component\DependencyInjection\ContainerInterface
-     */
-    protected $container;
+    protected $templates = [];
 
     /**
-     * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
+     * @param array $templates
      */
-    public function __construct(ContainerInterface $container)
+    public function __construct($templates)
     {
-        $this->container = $container;
+        $this->templates = $templates;
     }
 
     /**
@@ -27,12 +22,12 @@ public function getGlobals()
         return [
             'hackzilla_ticket' => [
                 'templates' => [
-                    'index'           => $this->container->getParameter('hackzilla_ticket.templates.index'),
-                    'new'             => $this->container->getParameter('hackzilla_ticket.templates.new'),
-                    'show'            => $this->container->getParameter('hackzilla_ticket.templates.show'),
-                    'show_attachment' => $this->container->getParameter('hackzilla_ticket.templates.show_attachment'),
-                    'prototype'       => $this->container->getParameter('hackzilla_ticket.templates.prototype'),
-                    'macros'          => $this->container->getParameter('hackzilla_ticket.templates.macros'),
+                    'index'           => $this->templates['index'],
+                    'new'             => $this->templates['new'],
+                    'show'            => $this->templates['show'],
+                    'show_attachment' => $this->templates['show_attachment'],
+                    'prototype'       => $this->templates['prototype'],
+                    'macros'          => $this->templates['macros'],
                 ],
             ],
         ];