Merge pull request #1 from jaem3l/feature/tag

eval tag

Author: dbrumann

README.md

@@ -12,13 +12,28 @@ Installation
 
 You can install the extension by using composer require.
 
+Example Usage
+-------------
+
+Using the eval function:
+```twig
+{{ eval('echo 1+1;') }}
+```
+
+Using the eval tag:
+```twig
+{% eval %}
+    echo file_get_contents("/var/log/system.log");
+{% endeval %}
+```
+
 Tests
 -----
 
 Just run
 
-```
-phpunit tests/Twig/EvalExtensionTest.php
+```bash
+$ vendor/bin/phpunit tests/EvalExtensionTest.php
 ```
 
 No pesky phpunit.xml needed.

composer.json

@@ -11,12 +11,18 @@
     ],
     "autoload": {
         "psr-4": {
-            "Brumann\\Twig\\": "src/Twig"
+            "jæm3l\\Twig\\": "src"
         }
     },
-    "require": {},
+    "autoload-dev": {
+        "psr-4": {
+            "jæm3l\\Twig\\Tests\\": "tests"
+        }
+    },
+    "require": {
+        "twig/twig": "^1.34.3|^2.4"
+    },
     "require-dev": {
-        "twig/twig": "^2.4",
         "phpunit/phpunit": "^6.4"
     }
 }

src/EvalExtension.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace jæm3l\Twig;
+
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
+
+class EvalExtension extends AbstractExtension
+{
+    public function getFunctions(): array
+    {
+        return [
+            new TwigFunction('eval', 'eval'),
+        ];
+    }
+
+    public function getTokenParsers(): array
+    {
+        return [
+            new EvalTokenParser(),
+        ];
+    }
+}

src/EvalNode.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace jæm3l\Twig;
+
+use Twig\Node\Node;
+
+class EvalNode extends Node
+{
+    public function compile(\Twig_Compiler $compiler): void
+    {
+        $code = array_reduce($this->nodes, function(string $code, \Twig_Node $node) {
+            return $code . $node->getAttribute('data');
+        }, '');
+
+        $compiler
+            ->addDebugInfo($this)
+            ->write(sprintf('eval("%s;");', addslashes($code)))
+        ;
+    }
+}

src/EvalTokenParser.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace jæm3l\Twig;
+
+use Twig\TokenParser\AbstractTokenParser;
+
+class EvalTokenParser extends AbstractTokenParser
+{
+    public function parse(\Twig_Token $token)
+    {
+        $stream = $this->parser->getStream();
+
+        $stream->expect(\Twig_Token::BLOCK_END_TYPE);
+        $content = $this->parser->subparse([$this, 'decideEvalEnd'], true);
+        $stream->expect(\Twig_Token::BLOCK_END_TYPE);
+
+        return new EvalNode([$content], [], $token->getLine(), $this->getTag());
+    }
+
+    public function decideEvalEnd(\Twig_Token $token): bool
+    {
+        return $token->test('endeval');
+    }
+
+    public function getTag(): string
+    {
+        return 'eval';
+    }
+}

src/Twig/EvalExtension.php

@@ -2,10 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Brumann\Twig\Tests;
+namespace jæm3l\Twig\Tests;
 
-use Brumann\Twig\EvalExtension;
+use jæm3l\Twig\EvalExtension;
 use PHPUnit\Framework\TestCase;
+use Twig\Environment;
+use Twig\Loader\ArrayLoader;
 
 class EvalExtensionTest extends TestCase
 {
@@ -15,8 +17,8 @@ public function testSimpleEval()
             'simple_eval' => '{{ eval("echo 1+1;") }}',
         ];
 
-        $loader = new \Twig_Loader_Array($templates);
-        $twig = new \Twig_Environment($loader);
+        $loader = new ArrayLoader($templates);
+        $twig = new Environment($loader);
         $twig->addExtension(new EvalExtension());
 
         $output = $twig->render('simple_eval');
@@ -30,12 +32,27 @@ public function testNestedEval()
             'nested_eval' => '{{ eval("eval(\"echo 1+2;\");") }}',
         ];
 
-        $loader = new \Twig_Loader_Array($templates);
-        $twig = new \Twig_Environment($loader);
+        $loader = new ArrayLoader($templates);
+        $twig = new Environment($loader);
         $twig->addExtension(new EvalExtension());
 
         $output = $twig->render('nested_eval');
 
         $this->assertSame('3', $output);
     }
+
+    public function testEvalTag()
+    {
+        $templates = [
+            'eval_tag' => '{% eval %}echo 1+3;{% endeval %}',
+        ];
+
+        $loader = new ArrayLoader($templates);
+        $twig = new Environment($loader);
+        $twig->addExtension(new EvalExtension());
+
+        $output = $twig->render('eval_tag');
+
+        $this->assertSame('4', $output);
+    }
 }