minor #382 Fixed the way we get the Twig template source (javiereguiluz)

This PR was merged into the master branch.

Discussion
----------

Fixed the way we get the Twig template source

This reverts the temporary #356 solution thanks to this fix made by Twig 1.25.0 version: twigphp/Twig#2011

Commits
-------

31fd935 Fixed the way we get the Twig template source

Author: javiereguiluz

composer.json

@@ -28,6 +28,7 @@
         "symfony/swiftmailer-bundle"           : "^2.3",
         "symfony/symfony"                      : "^3.1",
         "twig/extensions"                      : "^1.3",
+        "twig/twig"                            : "^1.25",
         "white-october/pagerfanta-bundle"      : "^1.0"
     },
     "require-dev": {

composer.lock

@@ -99,23 +99,15 @@ private function getCallableReflector($callable)
 
     private function getTemplateSource(\Twig_Template $template)
     {
-        // Twig templates are not always stored in files, and so there is no
-        // API to get the filename from a template name in a generic way.
-        // The logic used here works only for templates stored in app/Resources/views
-        // and referenced via the "filename.html.twig" notation, not via the "::filename.html.twig"
-        // one or stored in bundles. This is enough for the needs of the demo app.
-        $filePath = $this->kernelRootDir.'/Resources/views/'.$template->getTemplateName();
-        $sourceCode = $template->getSource();
-
-        // Temporary workaround for https://github.com/twigphp/Twig/issues/2011
-        if (null === $sourceCode) {
-            $sourceCode = @file_get_contents($filePath);
-        }
-
         return [
-            'file_path' => $filePath,
+            // Twig templates are not always stored in files, and so there is no
+            // API to get the filename from a template name in a generic way.
+            // The logic used here works only for templates stored in app/Resources/views
+            // and referenced via the "filename.html.twig" notation, not via the "::filename.html.twig"
+            // one or stored in bundles. This is enough for the needs of the demo app.
+            'file_path' => $this->kernelRootDir.'/Resources/views/'.$template->getTemplateName(),
             'starting_line' => 1,
-            'source_code' => $sourceCode,
+            'source_code' => $template->getSource(),
         ];
     }