Merge pull request #35 from toooni/twig_2

Twig 2

Tests/Functional/Twig/UrlAutoConverterTest.php

@@ -8,12 +8,24 @@ class UrlAutoConverterTest extends \PHPUnit_Framework_TestCase
 {
     public function testEscapedHtml()
     {
-        $loader = new \Twig_Loader_String();
-        $twig = new \Twig_Environment($loader);
-        $twig->addExtension(new UrlAutoConverterTwigExtension());
+        if (method_exists('\Twig_Environment', 'createTemplate')) { // twig > 2.0
+            $twig = new \Twig_Environment(new \Twig_Loader_Array());
+            $twig->addExtension(new UrlAutoConverterTwigExtension());
 
-        $body = 'Hello <a href="javascript:alert(\'ups\');">name</a>!';
-        $expected = 'Hello &lt;a href=&quot;javascript:alert(&#039;ups&#039;);&quot;&gt;name&lt;/a&gt;!';
-        $this->assertEquals($expected, $twig->render('{{ body | converturls }}', array('body' => $body)));
+            $body = 'Hello <a href="javascript:alert(\'ups\');">name</a>!';
+            $expected = 'Hello &lt;a href=&quot;javascript:alert(&#039;ups&#039;);&quot;&gt;name&lt;/a&gt;!';
+
+            $template = $twig->createTemplate('{{ body | converturls }}');
+
+            $this->assertEquals($expected, $template->render(array('body' => $body)));
+        } else { // twig < 2.0
+            $loader = new \Twig_Loader_String();
+            $twig = new \Twig_Environment($loader);
+            $twig->addExtension(new UrlAutoConverterTwigExtension());
+
+            $body = 'Hello <a href="javascript:alert(\'ups\');">name</a>!';
+            $expected = 'Hello &lt;a href=&quot;javascript:alert(&#039;ups&#039;);&quot;&gt;name&lt;/a&gt;!';
+            $this->assertEquals($expected, $twig->render('{{ body | converturls }}', array('body' => $body)));
+        }
     }
 }

composer.json

@@ -19,7 +19,7 @@
     "require": {
         "php": "^5.3.9|^7.0",
         "symfony/framework-bundle": "~2.3|~3.0",
-        "twig/twig": "~1.12"
+        "twig/twig": "~1.12|~2.0"
     },
     "require-dev": {
         "symfony/symfony": "~2.3|~3.0"