Merge pull request #54 from php-translation/patch-visitor-factory

Using a TwigVisitorFactory

Author: Nyholm

src/Visitor/Twig/TwigVisitor.php

@@ -39,6 +39,8 @@ public function __construct(Worker $worker = null)
 
     /**
      * @return Twig1Visitor|Twig2Visitor
+     *
+     * @deprecated since 1.2. Will be removed in 2.0. Use TwigVisitorFactory instead.
      */
     public static function create()
     {

src/Visitor/Twig/TwigVisitorFactory.php

@@ -0,0 +1,32 @@
+<?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;
+
+/**
+ * Create a TwigVisitor depending on what version of Twig is installed.
+ *
+ * @author Tobias Nyholm <[email protected]>
+ */
+final class TwigVisitorFactory
+{
+    /**
+     * @return Twig1Visitor|Twig2Visitor
+     */
+    public static function create()
+    {
+        if (-1 === version_compare(\Twig_Environment::VERSION, '2.0')) {
+            return new Twig1Visitor();
+        }
+
+        return new Twig2Visitor();
+    }
+}

tests/Functional/Visitor/Twig/TranslationBlockTest.php

@@ -11,8 +11,7 @@
 
 namespace Translation\Extractor\Tests\Functional\Visitor\Twig;
 
-use Translation\Extractor\Visitor\Twig\TranslationBlock;
-use Translation\Extractor\Visitor\Twig\TwigVisitor;
+use Translation\Extractor\Visitor\Twig\TwigVisitorFactory;
 
 /**
  * @author Tobias Nyholm <[email protected]>
@@ -21,7 +20,7 @@ final class TranslationBlockTest extends BaseTwigVisitorTest
 {
     public function testTrans()
     {
-        $collection = $this->getSourceLocations(TwigVisitor::create(), 'Twig/TranslationBlock/trans.html.twig');
+        $collection = $this->getSourceLocations(TwigVisitorFactory::create(), 'Twig/TranslationBlock/trans.html.twig');
 
         $this->assertCount(3, $collection);
         $source = $collection->get(0);
@@ -39,7 +38,7 @@ public function testTrans()
 
     public function testTranschoice()
     {
-        $collection = $this->getSourceLocations(TwigVisitor::create(), 'Twig/TranslationBlock/transchoice.html.twig');
+        $collection = $this->getSourceLocations(TwigVisitorFactory::create(), 'Twig/TranslationBlock/transchoice.html.twig');
 
         $this->assertCount(1, $collection);
         $source = $collection->first();

tests/Functional/Visitor/Twig/TranslationFilterTest.php

@@ -11,8 +11,7 @@
 
 namespace Translation\Extractor\Tests\Functional\Visitor\Twig;
 
-use Translation\Extractor\Visitor\Twig\TranslationFilter;
-use Translation\Extractor\Visitor\Twig\TwigVisitor;
+use Translation\Extractor\Visitor\Twig\TwigVisitorFactory;
 
 /**
  * @author Tobias Nyholm <[email protected]>
@@ -21,7 +20,7 @@ final class TranslationFilterTest extends BaseTwigVisitorTest
 {
     public function testExtract()
     {
-        $collection = $this->getSourceLocations(TwigVisitor::create(), 'Twig/TranslationFilter/trans.html.twig');
+        $collection = $this->getSourceLocations(TwigVisitorFactory::create(), 'Twig/TranslationFilter/trans.html.twig');
 
         $this->assertCount(1, $collection);
         $source = $collection->first();

tests/Smoke/AllExtractorsTest.php

@@ -24,7 +24,7 @@
 use Translation\Extractor\Visitor\Php\Symfony\FormTypeChoices;
 use Translation\Extractor\Visitor\Php\Symfony\FormTypeLabelExplicit;
 use Translation\Extractor\Visitor\Php\Symfony\FormTypeLabelImplicit;
-use Translation\Extractor\Visitor\Twig\TwigVisitor;
+use Translation\Extractor\Visitor\Twig\TwigVisitorFactory;
 
 /**
  * Smoke test to make sure no extractor throws exceptions.
@@ -93,7 +93,7 @@ private function getPHPFileExtractor()
     private function getTwigFileExtractor()
     {
         $file = new TwigFileExtractor(TwigEnvironmentFactory::create());
-        $file->addVisitor(TwigVisitor::create());
+        $file->addVisitor(TwigVisitorFactory::create());
 
         return $file;
     }