Prepare 1.1 (#37)

* Removed some code that was not associated with a release

* mnor

* Added factor for twig

* cs

* Bugfix

* removed debug code

Author: Nyholm

Changelog.md

@@ -4,9 +4,16 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 
 ## UNRELEASED
 
+## 1.1.0
+
 ### Added
 
-- Support for Twig2.0
+- Support for Twig 2.0.
+- Support for reporting errors and silence errors with `@Ignore`.
+
+### Deprecated
+
+- `Twig\TranslationBlock` and `Twig\TranslationFilter`. Use `Twig\Twig1Visitor` instead. 
 
 ## 1.0.0
 

composer.json

@@ -36,7 +36,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.2-dev"
         }
     }
 }

src/Visitor/Twig/TranslationBlock.php

@@ -18,25 +18,24 @@
 /**
  * @author Tobias Nyholm <[email protected]>
  *
- * @deprecated Use Twig1Visitor. Will be removed in 2.0.
+ * @deprecated Use Twig1Visitor. Will be removed in 2.0
  */
 final class TranslationBlock extends BaseVisitor implements \Twig_NodeVisitorInterface
 {
-    /**
-     * @var WorkerTranslationBlock
-     */
-    private $worker;
-
-    public function __construct()
-    {
-        $this->worker = new WorkerTranslationBlock();
-    }
-
     public function enterNode(Twig_NodeInterface $node, Twig_Environment $env)
     {
-        return $this->worker->work($node, $this->collection, function () {
-            return $this->getAbsoluteFilePath();
-        });
+        if ($node instanceof TransNode) {
+            $id = $node->getNode('body')->getAttribute('data');
+            $domain = 'messages';
+            if ($node->hasNode('domain')) {
+                $domain = $node->getNode('domain')->getAttribute('value');
+            }
+
+            $source = new SourceLocation($id, $this->getAbsoluteFilePath(), $node->getLine(), ['domain' => $domain]);
+            $this->collection->addLocation($source);
+        }
+
+        return $node;
     }
 
     public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env)

src/Visitor/Twig/TranslationFilter.php

@@ -22,21 +22,40 @@
  */
 final class TranslationFilter extends BaseVisitor implements \Twig_NodeVisitorInterface
 {
-    /**
-     * @var WorkerTranslationFilter
-     */
-    private $worker;
-
-    public function __construct()
-    {
-        $this->worker = new WorkerTranslationFilter();
-    }
-
     public function enterNode(Twig_NodeInterface $node, Twig_Environment $env)
     {
-        return $this->worker->work($node, $this->collection, function () {
-            return $this->getAbsoluteFilePath();
-        });
+        if (!$node instanceof \Twig_Node_Expression_Filter) {
+            return $node;
+        }
+
+        $name = $node->getNode('filter')->getAttribute('value');
+        if ('trans' !== $name && 'transchoice' !== $name) {
+            return $node;
+        }
+
+        $idNode = $node->getNode('node');
+        if (!$idNode instanceof \Twig_Node_Expression_Constant) {
+            // We can only extract constants
+            return $node;
+        }
+
+        $id = $idNode->getAttribute('value');
+        $index = 'trans' === $name ? 1 : 2;
+        $domain = 'messages';
+        $arguments = $node->getNode('arguments');
+        if ($arguments->hasNode($index)) {
+            $argument = $arguments->getNode($index);
+            if (!$argument instanceof \Twig_Node_Expression_Constant) {
+                return $node;
+            }
+
+            $domain = $argument->getAttribute('value');
+        }
+
+        $source = new SourceLocation($id, $this->getAbsoluteFilePath(), $node->getLine(), ['domain' => $domain]);
+        $this->collection->addLocation($source);
+
+        return $node;
     }
 
     public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env)

src/Visitor/Twig/Twig1Visitor.php

@@ -11,30 +11,17 @@
 
 namespace Translation\Extractor\Visitor\Twig;
 
-use Translation\Extractor\Visitor\BaseVisitor;
 use Twig_Environment;
 use Twig_NodeInterface;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-final class Twig1Visitor extends BaseVisitor implements \Twig_NodeVisitorInterface
+final class Twig1Visitor extends TwigVisitor implements \Twig_NodeVisitorInterface
 {
-    /**
-     * @var WorkerTranslationFilter
-     */
-    private $worker;
-
-    public function __construct()
-    {
-        $this->worker = new Worker();
-    }
-
     public function enterNode(Twig_NodeInterface $node, Twig_Environment $env)
     {
-        return $this->worker->work($node, $this->collection, function () {
-            return $this->getAbsoluteFilePath();
-        });
+        return $this->doEnterNode($node);
     }
 
     public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env)

src/Visitor/Twig/Twig2TranslationBlock.php

@@ -11,30 +11,17 @@
 
 namespace Translation\Extractor\Visitor\Twig;
 
-use Translation\Extractor\Visitor\BaseVisitor;
 use Twig_Environment;
 use Twig_Node;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
-final class Twig2Visitor extends BaseVisitor implements \Twig_NodeVisitorInterface
+final class Twig2Visitor extends TwigVisitor implements \Twig_NodeVisitorInterface
 {
-    /**
-     * @var WorkerTranslationFilter
-     */
-    private $worker;
-
-    public function __construct()
-    {
-        $this->worker = new Worker();
-    }
-
     public function enterNode(Twig_Node $node, Twig_Environment $env)
     {
-        return $this->worker->work($node, $this->collection, function () {
-            return $this->getAbsoluteFilePath();
-        });
+        return $this->doEnterNode($node);
     }
 
     public function leaveNode(Twig_Node $node, Twig_Environment $env)

src/Visitor/Twig/Twig2TranslationFilter.php

@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of the PHP Translation package.
+ *
+ * (c) PHP Translation team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Translation\Extractor\Visitor\Twig;
+
+use Translation\Extractor\Visitor\BaseVisitor;
+
+/**
+ * Factory class and base class for TwigVisitor.
+ *
+ * @author Tobias Nyholm <[email protected]>
+ */
+abstract class TwigVisitor extends BaseVisitor
+{
+    /**
+     * @var Worker
+     */
+    private $worker;
+
+    /**
+     * @param Worker|null $worker
+     */
+    public function __construct(Worker $worker = null)
+    {
+        if (null === $worker) {
+            $worker = new Worker();
+        }
+
+        $this->worker = $worker;
+    }
+
+    /**
+     * @return Twig1Visitor|Twig2Visitor
+     */
+    public static function create()
+    {
+        if (\Twig_Environment::MAJOR_VERSION === 1) {
+            return new Twig1Visitor();
+        }
+
+        return new Twig2Visitor();
+    }
+
+    /**
+     * @param \Twig_Node|\Twig_NodeInterface $node
+     *
+     * @return \Twig_Node|\Twig_NodeInterface
+     */
+    protected function doEnterNode($node)
+    {
+        return $this->worker->work($node, $this->collection, function () {
+            return $this->getAbsoluteFilePath();
+        });
+    }
+}