twig2 compatibility (#79)

* twig2 compatibility

* added quotes

* use VERSION instead of MAJOR_VERSION which was introduced later

Author: toooni

DependencyInjection/TranslationExtension.php

@@ -20,6 +20,10 @@
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\HttpKernel\Kernel;
 use Translation\Bundle\Model\Configuration as ConfigurationModel;
+use Translation\Extractor\Visitor\Twig\TranslationBlock;
+use Translation\Extractor\Visitor\Twig\TranslationFilter;
+use Translation\Extractor\Visitor\Twig\Twig2TranslationBlock;
+use Translation\Extractor\Visitor\Twig\Twig2TranslationFilter;
 
 /**
  * This is the class that loads and manages your bundle configuration.
@@ -44,6 +48,14 @@ public function load(array $configs, ContainerBuilder $container)
         $container->getDefinition('php_translation.extractor.php.visitor.FormTypeChoices')
             ->addMethodCall('setSymfonyMajorVersion', [Kernel::MAJOR_VERSION]);
 
+        if (version_compare(\Twig_Environment::VERSION, 2) === -1) {
+            $container->setParameter('php_translation.extractor.twig.visitor.translation_block.class', TranslationBlock::class);
+            $container->setParameter('php_translation.extractor.twig.visitor.translation_filter.class', TranslationFilter::class);
+        } else {
+            $container->setParameter('php_translation.extractor.twig.visitor.translation_block.class', Twig2TranslationBlock::class);
+            $container->setParameter('php_translation.extractor.twig.visitor.translation_filter.class', Twig2TranslationFilter::class);
+        }
+
         $container->setParameter('php_translation.locales', $config['locales']);
         $container->setParameter('php_translation.default_locale', isset($config['default_locale']) ? $config['default_locale'] : $container->getParameter('kernel.default_locale'));
         $this->handleConfigNode($container, $config);

Resources/config/extractors.yml

@@ -53,11 +53,11 @@ services:
 
   # Twig Visitors:
   php_translation.extractor.twig.visitor.translation_block:
-    class: Translation\Extractor\Visitor\Twig\TranslationBlock
+    class: '%php_translation.extractor.twig.visitor.translation_block.class%'
     tags:
       - { name: 'php_translation.visitor', type: 'twig' }
 
   php_translation.extractor.twig.visitor.translation_filter:
-    class: Translation\Extractor\Visitor\Twig\TranslationFilter
+    class: '%php_translation.extractor.twig.visitor.translation_filter.class%'
     tags:
       - { name: 'php_translation.visitor', type: 'twig' }