Merge pull request #12 from JBlond/twig-trans-11

Twig trans 11

Author: JBlond

Diff for: README.md

@@ -83,7 +83,8 @@ echo $tpl->render(['key1' => 'value1', 'key2' => 'value2']);
 ## Requirements
 
 * PHP 7.2 or greater
-* PHP Multibyte String ' gettext'
+* PHP Multibyte String 
+* 'gettext'
 * Twig >= 3.0
 
 ### Optional Requirements

Diff for: src/jblond/TwigTrans/TransNode.php

@@ -2,6 +2,7 @@
 
 namespace jblond\TwigTrans;
 
+use Twig\Attribute\YieldReady;
 use Twig\Compiler;
 use Twig\Node\Expression\AbstractExpression;
 use Twig\Node\Expression\ConstantExpression;
@@ -15,6 +16,7 @@
  * Class TransNode
  * @package jblond\TwigTrans
  */
+#[YieldReady]
 class TransNode extends Node
 {
     /**
@@ -24,15 +26,13 @@ class TransNode extends Node
      * @param AbstractExpression|null $count
      * @param Node|null $notes
      * @param int $lineNo
-     * @param string|null $tag
      */
     public function __construct(
         Node $body,
-        Node $plural = null,
-        AbstractExpression $count = null,
-        Node $notes = null,
-        int $lineNo = 0,
-        ?string $tag = null
+        ?Node $plural = null,
+        ?AbstractExpression $count = null,
+        ?Node $notes = null,
+        int $lineNo = 0
     ) {
         $nodes = ['body' => $body];
         if (null !== $count) {
@@ -45,7 +45,7 @@ public function __construct(
             $nodes['notes'] = $notes;
         }
 
-        parent::__construct($nodes, [], $lineNo, $tag);
+        parent::__construct($nodes, [], $lineNo);
     }
 
     /**

Diff for: tests/TwigTrans/Node/TransTest.php

@@ -52,7 +52,7 @@ public function getTests(): array
 
         $body = new NameExpression('foo', 0);
         $node = new TransNode($body, null, null, null, 0);
-        $tests[] = [$node, sprintf('echo gettext(%s);', $this->getVariableGetter('foo'))];
+        $tests[] = [$node, sprintf('echo gettext(%s);', NodeTestCase::createVariableGetter('foo'))];
 
         $body = new ConstantExpression('Hello', 0);
         $node = new TransNode($body, null, null, null, 0);
@@ -74,7 +74,7 @@ public function getTests(): array
             $node,
             sprintf(
                 'echo strtr(gettext("J\'ai %%foo%% pommes"), array("%%foo%%" => %s, ));',
-                $this->getVariableGetter('foo')
+                NodeTestCase::createVariableGetter('foo')
             )
         ];
 
@@ -97,8 +97,8 @@ public function getTests(): array
             sprintf(
                 'echo strtr(ngettext("Hey %%name%%, I have one apple", "Hey %%name%%, I have %%count%% apples", ' .
                 'abs(12)), array("%%name%%" => %s, "%%name%%" => %s, "%%count%%" => abs(12), ));',
-                $this->getVariableGetter('name'),
-                $this->getVariableGetter('name')
+                NodeTestCase::createVariableGetter('name'),
+                NodeTestCase::createVariableGetter('name')
             )
         ];
 
@@ -122,7 +122,7 @@ public function getTests(): array
             $node,
             sprintf(
                 'echo strtr(gettext("J\'ai %%foo%% pommes"), array("%%foo%%" => %s, ));',
-                $this->getVariableGetter('foo')
+                NodeTestCase::createVariableGetter('foo')
             )
         ];