Merge pull request #6004 from GawainLynch/hotfix/twig-1.27

Fix for Twig ^1.27
bolt · Nov 10, 2016 · 421045f · 421045f
2 parents 7dcab75 + 4a79405
commit 421045f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -61,7 +61,7 @@
         "symfony/web-profiler-bundle" : "^2.8",
         "symfony/yaml" : "^2.8",
         "tdammers/htmlmaid" : "~0.7",
-        "twig/twig" : "<1.26",
+        "twig/twig" : "^1.27",
         "ua-parser/uap-php" : "~3.4"
     },
     "require-dev" : {

diff --git a/src/Twig/FilesystemLoader.php b/src/Twig/FilesystemLoader.php
@@ -7,6 +7,7 @@
 use Bolt\Filesystem\Handler\DirectoryInterface;
 use Bolt\Filesystem\Handler\FileInterface;
 use Twig_Error_Loader as LoaderError;
+use Twig_Source as TwigSource;
 
 /**
  * Loads templates from a Bolt\Filesystem interface.
@@ -46,6 +47,16 @@ public function prependPath($path, $namespace = self::MAIN_NAMESPACE)
         $this->prependDir($this->filesystem->getDir($path), $namespace);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getSourceContext($name)
+    {
+        $file = $this->findTemplate($name);
+
+        return new TwigSource($file->read(), $name, $file->getFullPath());
+    }
+
     /**
      * Adds a directory where templates are stored.
      *

diff --git a/tests/phpunit/unit/Twig/SetcontentTest.php b/tests/phpunit/unit/Twig/SetcontentTest.php
@@ -72,7 +72,8 @@ public function testParse()
         $twigParser = new TwigParserMock($app['twig']);
         $twigParser->setStream($twigTokenStream);
 
-        $expression = new Twig_ExpressionParser($twigParser, ['='], []);
+        $env = $app['twig'];
+        $expression = new Twig_ExpressionParser($twigParser, $env);
         $twigParser->setExpressionParser($expression);
 
         $setContentParser = new SetcontentTokenParser();