Update the way to retrieve the template source

stof · stof · commit 86203de0b11a · 2015-10-08T15:57:40.000+02:00
Latest Twig versions allow to get the source from the Twig_Template
object itself, making it work with any loader (and without needing the
loader).
diff --git a/src/CodeExplorerBundle/EventListener/ControllerListener.php b/src/CodeExplorerBundle/EventListener/ControllerListener.php
@@ -28,10 +28,7 @@
  */
 class ControllerListener
 {
-    /**
-     * @var SourceCodeExtension
-     */
-    protected $twigExtension;
+    private $twigExtension;
 
     public function __construct(SourceCodeExtension $twigExtension)
     {
diff --git a/src/CodeExplorerBundle/Resources/config/services.yml b/src/CodeExplorerBundle/Resources/config/services.yml
@@ -2,7 +2,7 @@ services:
     code_explorer.twig.source_code_extension:
         public:    false
         class:     CodeExplorerBundle\Twig\SourceCodeExtension
-        arguments: [@twig.loader, %kernel.root_dir%]
+        arguments: [%kernel.root_dir%]
         tags:
             - { name: twig.extension }
 
diff --git a/src/CodeExplorerBundle/Twig/SourceCodeExtension.php b/src/CodeExplorerBundle/Twig/SourceCodeExtension.php
@@ -22,14 +22,12 @@
  */
 class SourceCodeExtension extends \Twig_Extension
 {
-    protected $loader;
-    protected $controller;
-    protected $kernelRootDir;
+    private $controller;
+    private $kernelRootDir;
 
-    public function __construct(\Twig_LoaderInterface $loader, $kernelRootDir)
+    public function __construct($kernelRootDir)
     {
         $this->kernelRootDir = $kernelRootDir;
-        $this->loader = $loader;
     }
 
     public function setController($controller)
@@ -101,12 +99,10 @@ private function getCallableReflector($callable)
 
     private function getTemplateSource(\Twig_Template $template)
     {
-        $templateName = $template->getTemplateName();
-
         return array(
-            'file_path' => $this->kernelRootDir.'/Resources/views/'.$templateName,
+            'file_path' => $this->kernelRootDir.'/Resources/views/'.$template->getTemplateName(),
             'starting_line' => 1,
-            'source_code' => $this->loader->getSource($templateName),
+            'source_code' => $template->getSource(),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,7 @@`
`28`	`28`	`*/`
`29`	`29`	`class ControllerListener`
`30`	`30`	`{`
`31`		`- /**`
`32`		`- * @var SourceCodeExtension`
`33`		`- */`
`34`		`- protected $twigExtension;`
	`31`	`+ private $twigExtension;`
`35`	`32`
`36`	`33`	`public function __construct(SourceCodeExtension $twigExtension)`
`37`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,12 @@`
`22`	`22`	`*/`
`23`	`23`	`class SourceCodeExtension extends \Twig_Extension`
`24`	`24`	`{`
`25`		`- protected $loader;`
`26`		`- protected $controller;`
`27`		`- protected $kernelRootDir;`
	`25`	`+ private $controller;`
	`26`	`+ private $kernelRootDir;`
`28`	`27`
`29`		`- public function __construct(\Twig_LoaderInterface $loader, $kernelRootDir)`
	`28`	`+ public function __construct($kernelRootDir)`
`30`	`29`	`{`
`31`	`30`	`$this->kernelRootDir = $kernelRootDir;`
`32`		`- $this->loader = $loader;`
`33`	`31`	`}`
`34`	`32`
`35`	`33`	`public function setController($controller)`
`@@ -101,12 +99,10 @@ private function getCallableReflector($callable)`
`101`	`99`
`102`	`100`	`private function getTemplateSource(\Twig_Template $template)`
`103`	`101`	`{`
`104`		`- $templateName = $template->getTemplateName();`
`105`		`-`
`106`	`102`	`return array(`
`107`		`- 'file_path' => $this->kernelRootDir.'/Resources/views/'.$templateName,`
	`103`	`+ 'file_path' => $this->kernelRootDir.'/Resources/views/'.$template->getTemplateName(),`
`108`	`104`	`'starting_line' => 1,`
`109`		`- 'source_code' => $this->loader->getSource($templateName),`
	`105`	`+ 'source_code' => $template->getSource(),`
`110`	`106`	`);`
`111`	`107`	`}`
`112`	`108`