Twig 1 bugfixes (#38)

* Twig 1 bugfixes

* Bugfixes

Author: Nyholm

.travis.yml

@@ -26,7 +26,7 @@ matrix:
       env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
 
 install:
-    - travis_retry composer update --prefer-dist --no-interaction
+    - travis_retry composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
 
 script:
     - $TEST_COMMAND

Changelog.md

@@ -4,6 +4,13 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 
 ## UNRELEASED
 
+## 1.1.1
+
+### Fixed
+
+- Make sure we test with the lowest version on Travis
+- Fixed minor bugs for Twig 1.x.
+
 ## 1.1.0
 
 ### Added

src/FileExtractor/TwigFileExtractor.php

@@ -76,4 +76,9 @@ public function getNodeVisitors()
     {
         return $this->visitors;
     }
+
+    public function getName()
+    {
+        return 'php.translation';
+    }
 }

src/Visitor/Twig/TranslationBlock.php

@@ -11,6 +11,8 @@
 
 namespace Translation\Extractor\Visitor\Twig;
 
+use Symfony\Bridge\Twig\Node\TransNode;
+use Translation\Extractor\Model\SourceLocation;
 use Translation\Extractor\Visitor\BaseVisitor;
 use Twig_Environment;
 use Twig_NodeInterface;

src/Visitor/Twig/TranslationFilter.php

@@ -11,6 +11,7 @@
 
 namespace Translation\Extractor\Visitor\Twig;
 
+use Translation\Extractor\Model\SourceLocation;
 use Translation\Extractor\Visitor\BaseVisitor;
 use Twig_Environment;
 use Twig_NodeInterface;

src/Visitor/Twig/TwigVisitor.php

@@ -42,7 +42,7 @@ public function __construct(Worker $worker = null)
      */
     public static function create()
     {
-        if (\Twig_Environment::MAJOR_VERSION === 1) {
+        if (-1 === version_compare(\Twig_Environment::VERSION, '2.0')) {
             return new Twig1Visitor();
         }
 

src/Visitor/Twig/Worker.php

@@ -60,11 +60,16 @@ public function work($node, SourceCollection $collection, callable $getAbsoluteF
             ));
         } elseif ($node instanceof TransNode) {
             // extract trans nodes
+            $domain = self::UNDEFINED_DOMAIN;
+            if ($node->hasNode('domain') && null !== $node->getNode('domain')) {
+                $domain = $this->getReadDomainFromNode($node->getNode('domain'));
+            }
+
             $collection->addLocation(new SourceLocation(
                 $node->getNode('body')->getAttribute('data'),
                 $getAbsoluteFilePath(),
                 $node->getTemplateLine(),
-                ['domain' => $node->hasNode('domain') ? $this->getReadDomainFromNode($node->getNode('domain')) : self::UNDEFINED_DOMAIN]
+                ['domain' => $domain]
             ));
         }