Merge pull request #39 from moufmouf/twig2

Adding Twig 2 compatibility

Author: moufmouf

.travis.yml

@@ -5,8 +5,13 @@ php:
  - 7.0
  - 7.1
 
+env:
+  matrix:
+  - PREFER_LOWEST=""
+  - PREFER_LOWEST="--prefer-lowest"
+
 before_script:
- - composer install --no-interaction
+ - composer update --no-interaction $PREFER_LOWEST
 
 script:
  - vendor/bin/phpunit

composer.json

@@ -19,8 +19,9 @@
     	"mouf/utils.common.paginable-interface": "~1.0",
     	"mouf/utils.common.sortable-interface": "~1.0",
         "mouf/schema-analyzer": "~1.0",
-        "twig/twig": "~1.14",
-        "greenlion/php-sql-parser": "^4.0"
+        "twig/twig": "^1.34.4 || ^2",
+        "greenlion/php-sql-parser": "^4.0",
+        "doctrine/cache": "^1.5"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.0",

src/Mouf/Database/MagicQuery/Twig/SqlTwigEnvironmentFactory.php

@@ -21,19 +21,17 @@ public static function getTwigEnvironment()
             // The cache directory is in the temporary directory and reproduces the path to the directory (to avoid cache conflict between apps).
             'cache' => self::getCacheDirectory(),
             'strict_variables' => true,
+            'autoescape' => 'sql' // Default autoescape mode: sql
         );
 
         $twig = new \Twig_Environment($stringLoader, $options);
 
         // Default escaper will throw an exception. This is because we want to use SQL parameters instead of Twig.
-        // This ahs a number of advantages, especially in terms of caching.
-        $twig->getExtension('core')->setEscaper('sql', function () {
+        // This has a number of advantages, especially in terms of caching.
+        $twig->getExtension('Twig_Extension_Core')->setEscaper('sql', function () {
             throw new ForbiddenTwigParameterInSqlException('You cannot use Twig expressions (like "{{ id }}"). Instead, you should use SQL parameters (like ":id"). Twig integration is limited to Twig statements (like "{% for .... %}"');
         });
 
-        // Default autoescape mode: sql
-        $twig->addExtension(new \Twig_Extension_Escaper('sql'));
-
         self::$twig = $twig;
 
         return $twig;

src/Mouf/Database/MagicQuery/Twig/StringLoader.php

@@ -1,6 +1,8 @@
 <?php
 
 namespace Mouf\Database\MagicQuery\Twig;
+use Twig_Error_Loader;
+use Twig_Source;
 
 /**
  * This loader completely bypasses the loader mechanism, by directly passing the key as a template.
@@ -33,4 +35,30 @@ public function isFresh($name, $time)
     {
         return true;
     }
+
+    /**
+     * Returns the source context for a given template logical name.
+     *
+     * @param string $name The template logical name
+     *
+     * @return Twig_Source
+     *
+     * @throws Twig_Error_Loader When $name is not found
+     */
+    public function getSourceContext($name)
+    {
+        return new Twig_Source($name, $name);
+    }
+
+    /**
+     * Check if we have the source code of a template, given its name.
+     *
+     * @param string $name The name of the template to check if we can load
+     *
+     * @return bool If the template source code is handled by this loader or not
+     */
+    public function exists($name)
+    {
+        return true;
+    }
 }