diff --git a/.travis.yml b/.travis.yml
index c6c645e..300bced 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
   - hhvm
 
 env:
@@ -32,8 +33,17 @@ matrix:
           env: SYMFONY_VERSION=2.3.*
         - php: 5.6
           env: SYMFONY_VERSION=2.7.*
+        - php: 7.0
+          env: SYMFONY_VERSION=2.7.*
+        - php: 7.1
+          env: SYMFONY_VERSION=2.8.*
         - php: 5.6
-          env: SYMFONY_VERSION=3.0.*
+          env: SYMFONY_VERSION=^3.0
+        - php: 7.0
+          env: SYMFONY_VERSION=^3.0
+        - php: 7.1
+          env: SYMFONY_VERSION=^3.0
+
 
 before_install:
     - travis_retry composer self-update
diff --git a/Annotation/TransArrayKeys.php b/Annotation/TransArrayKeys.php
new file mode 100644
index 0000000..a1da118
--- /dev/null
+++ b/Annotation/TransArrayKeys.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * Copyright 2011 Johannes M. Schmitt <schmittjoh@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace JMS\TranslationBundle\Annotation;
+
+/**
+ * @Annotation
+ *
+ * @author Krisztián Ferenczi <ferenczi.krisztian@gmail.com>
+ */
+final class TransArrayKeys
+{
+    /**
+     * @var string
+     */
+    public $domain = 'messages';
+}
diff --git a/Annotation/TransArrayValues.php b/Annotation/TransArrayValues.php
new file mode 100644
index 0000000..7eae4fe
--- /dev/null
+++ b/Annotation/TransArrayValues.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * Copyright 2011 Johannes M. Schmitt <schmittjoh@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace JMS\TranslationBundle\Annotation;
+
+/**
+ * @Annotation
+ *
+ * @author Krisztián Ferenczi <ferenczi.krisztian@gmail.com>
+ */
+final class TransArrayValues
+{
+    /**
+     * @var string
+     */
+    public $domain = 'messages';
+}
diff --git a/Annotation/TransString.php b/Annotation/TransString.php
new file mode 100644
index 0000000..f9cee13
--- /dev/null
+++ b/Annotation/TransString.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * Copyright 2011 Johannes M. Schmitt <schmittjoh@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace JMS\TranslationBundle\Annotation;
+
+/**
+ * @Annotation
+ *
+ * @author Krisztián Ferenczi <ferenczi.krisztian@gmail.com>
+ */
+final class TransString
+{
+    /**
+     * @var string
+     */
+    public $domain = 'messages';
+}
diff --git a/Changelog.md b/Changelog.md
index 05367eb..164573a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,12 @@
 # Changelog
 
-### 1.3.1 to UNRELEASED
+### 1.3.2 to UNRELEASED
+
+### 1.3.1 to 1.3.2
+* Added configuration options to disable date/sources in xliff dump
+* Fixed trim bug with @XBundle notation
+* Added support for php 7.1
+* Added Twig 2 support
 
 ### 1.3.0 to 1.3.1
 
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index c79e908..7852ced 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -43,6 +43,13 @@ public function getConfigTreeBuilder()
                     ->arrayNode('locales')
                         ->prototype('scalar')->end()
                     ->end()
+                    ->arrayNode('dumper')
+                        ->addDefaultsIfNotSet()
+                        ->children()
+                            ->booleanNode('add_date')->defaultTrue()->end()
+                            ->booleanNode('add_references')->defaultTrue()->end()
+                        ->end()
+                    ->end()
                     ->scalarNode('source_language')->defaultValue('en')->end()
                     ->arrayNode('custom_form_config_names')
                         ->prototype('scalar')->end()
@@ -72,7 +79,7 @@ public function getConfigTreeBuilder()
                                                     if (false === $pos = strpos($v, '/')) {
                                                         $bundleName = substr($v, 1);
                                                     } else {
-                                                        $bundleName = substr($v, 1, $pos - 2);
+                                                        $bundleName = substr($v, 1, $pos - 1);
                                                     }
 
                                                     $bundles = $c->getParameter('kernel.bundles');
diff --git a/DependencyInjection/JMSTranslationExtension.php b/DependencyInjection/JMSTranslationExtension.php
index aed6bfd..e21d728 100644
--- a/DependencyInjection/JMSTranslationExtension.php
+++ b/DependencyInjection/JMSTranslationExtension.php
@@ -36,10 +36,15 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter('jms_translation.source_language', $config['source_language']);
         $container->setParameter('jms_translation.locales', $config['locales']);
 
+
         // Extend form extractor
         $def = $container->getDefinition('jms_translation.extractor.file.form_extractor');
         $def->addMethodCall('addCustomTranslationFields', [$config['custom_form_config_names']]);
 
+        foreach ($config['dumper'] as $option => $value) {
+            $container->setParameter("jms_translation.dumper.{$option}", $value);
+        }
+
         $requests = array();
         foreach ($config['configs'] as $name => $extractConfig) {
             $def = new Definition('JMS\TranslationBundle\Translation\ConfigBuilder');
diff --git a/README.md b/README.md
index d0e7fb9..521c2da 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,24 @@ $this->trans('user.create.success.%email%', ['%email%' => $user->getEmail()]);
 
 > The double `""` sign is the escaped `"` in the `AltTrans` annotation value.
 
+- Add new Trans* Annotations: `TransArrayKeys`, `TransArrayValues`, `TransString` . You can handle the strings in var:
+
+```php
+<?php
+
+/** @TransArrayValues("error") */
+$msgs = [
+    /** @AltTrans("Error 1", locale="en") */
+    'error.msg1',
+    /** @AltTrans("Error 2", locale="en") */
+    'error.msg2',
+    /** @AltTrans("Error 3", locale="en") */
+    'error.msg3',
+];
+/** @Ignore */
+$this->trans($msgs[$errorId], [], "error");
+```
+
 JMSTranslationBundle [![Build Status](https://secure.travis-ci.org/schmittjoh/JMSTranslationBundle.png?branch=master)](http://travis-ci.org/schmittjoh/JMSTranslationBundle) [![Join the chat at https://gitter.im/schmittjoh/JMSTranslationBundle](https://badges.gitter.im/schmittjoh/JMSTranslationBundle.svg)](https://gitter.im/schmittjoh/JMSTranslationBundle?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 ====================
 
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index 784c5a9..07ff417 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -9,6 +9,7 @@
 
         <parameter key="jms_translation.extractor_manager.class">JMS\TranslationBundle\Translation\ExtractorManager</parameter>
         <parameter key="jms_translation.extractor.file_extractor.class">JMS\TranslationBundle\Translation\Extractor\FileExtractor</parameter>
+        <parameter key="jms_translation.extractor.file.annotation_extractor">JMS\TranslationBundle\Translation\Extractor\File\AnnotationExtractor</parameter>
         <parameter key="jms_translation.extractor.file.default_php_extractor">JMS\TranslationBundle\Translation\Extractor\File\DefaultPhpFileExtractor</parameter>
         <parameter key="jms_translation.extractor.file.translation_container_extractor">JMS\TranslationBundle\Translation\Extractor\File\TranslationContainerExtractor</parameter>
         <parameter key="jms_translation.extractor.file.twig_extractor">JMS\TranslationBundle\Translation\Extractor\File\TwigFileExtractor</parameter>
@@ -64,12 +65,24 @@
             <call method="setSourceLanguage">
                 <argument>%jms_translation.source_language%</argument>
             </call>
+            <call method="setAddDate">
+                <argument>%jms_translation.dumper.add_date%</argument>
+            </call>
+            <call method="setAddReference">
+                <argument>%jms_translation.dumper.add_references%</argument>
+            </call>
             <tag name="jms_translation.dumper" format="xliff" />
         </service>
         <service id="jms_translation.dumper.xlf_dumper" class="%jms_translation.dumper.xliff_dumper.class%" public="false">
             <call method="setSourceLanguage">
                 <argument>%jms_translation.source_language%</argument>
             </call>
+            <call method="setAddDate">
+                <argument>%jms_translation.dumper.add_date%</argument>
+            </call>
+            <call method="setAddReference">
+                <argument>%jms_translation.dumper.add_references%</argument>
+            </call>
             <tag name="jms_translation.dumper" format="xlf" />
         </service>
         <service id="jms_translation.dumper.yaml_dumper" class="%jms_translation.dumper.yaml_dumper.class%" public="false">
@@ -88,6 +101,11 @@
             <argument type="service" id="twig" />
             <argument type="service" id="logger" />
         </service>
+        <service id="jms_translation.extractor.file.annotation_extractor" class="%jms_translation.extractor.file.annotation_extractor%" public="false">
+            <argument type="service" id="jms_translation.doc_parser" />
+            <argument type="service" id="jms_translation.file_source_factory" />
+            <tag name="jms_translation.file_visitor" />
+        </service>
         <service id="jms_translation.extractor.file.default_php_extractor" class="%jms_translation.extractor.file.default_php_extractor%" public="false">
             <argument type="service" id="jms_translation.doc_parser" />
             <argument type="service" id="jms_translation.file_source_factory" />
@@ -120,10 +138,13 @@
         <service id="jms_translation.doc_parser" class="Doctrine\Common\Annotations\DocParser" public="false">
             <call method="setImports">
                 <argument type="collection">
+                    <argument key="alttrans">JMS\TranslationBundle\Annotation\AltTrans</argument>
                     <argument key="desc">JMS\TranslationBundle\Annotation\Desc</argument>
-                    <argument key="meaning">JMS\TranslationBundle\Annotation\Meaning</argument>
                     <argument key="ignore">JMS\TranslationBundle\Annotation\Ignore</argument>
-                    <argument key="alttrans">JMS\TranslationBundle\Annotation\AltTrans</argument>
+                    <argument key="meaning">JMS\TranslationBundle\Annotation\Meaning</argument>
+                    <argument key="transarraykeys">JMS\TranslationBundle\Annotation\TransArrayKeys</argument>
+                    <argument key="transarrayvalues">JMS\TranslationBundle\Annotation\TransArrayValues</argument>
+                    <argument key="transstring">JMS\TranslationBundle\Annotation\TransString</argument>
                 </argument>
             </call>
             <call method="setIgnoreNotImportedAnnotations">
diff --git a/Resources/views/Translate/index.html.twig b/Resources/views/Translate/index.html.twig
index 4f53d1d..ed6ce54 100644
--- a/Resources/views/Translate/index.html.twig
+++ b/Resources/views/Translate/index.html.twig
@@ -4,7 +4,7 @@
     {{ parent() }}
     <script language="javascript" type="text/javascript">
         var updateMessagePath = {{ path("jms_translation_update_message", {"config": selectedConfig, "domain": selectedDomain, "locale": selectedLocale})|json_encode|raw }};
-        var isWritable        = {{ isWriteable is sameas(true) ? 'true' : 'false' }};
+        var isWritable        = {{ isWriteable is same as(true) ? 'true' : 'false' }};
         var JMS               = new JMSTranslationManager(updateMessagePath, isWritable);
 
         JMS.ready();
@@ -33,7 +33,7 @@
         </select>
     </form>
 
-    {% if isWriteable is sameas(false) %}
+    {% if isWriteable is same as(false) %}
     <div class="alert-message error">
         The translation file "<strong>{{ file }}</strong>" is not writable.
     </div>
diff --git a/Resources/views/Translate/messages.html.twig b/Resources/views/Translate/messages.html.twig
index 5061dbb..929f134 100644
--- a/Resources/views/Translate/messages.html.twig
+++ b/Resources/views/Translate/messages.html.twig
@@ -14,7 +14,7 @@
                     <p><abbr title="{{ id }}">{{ id|slice(0, 25) }}{% if id|length > 25 %}...{% endif %}</abbr></p>
                 </td>
                 <td>
-                    <textarea data-id="{{ id }}" class="span6"{% if isWriteable is sameas(false) %} readonly="readonly"{% endif %}>{{ message.localeString }}</textarea></td>
+                    <textarea data-id="{{ id }}" class="span6"{% if isWriteable is same as(false) %} readonly="readonly"{% endif %}>{{ message.localeString }}</textarea></td>
                 <td>
                     {% if message.meaning is not empty %}
                         <h6>Meaning</h6>
diff --git a/Tests/Translation/Extractor/File/AnnotationExtractorTest.php b/Tests/Translation/Extractor/File/AnnotationExtractorTest.php
new file mode 100644
index 0000000..514b542
--- /dev/null
+++ b/Tests/Translation/Extractor/File/AnnotationExtractorTest.php
@@ -0,0 +1,75 @@
+<?php
+
+/*
+ * Copyright 2011 Johannes M. Schmitt <schmittjoh@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace JMS\TranslationBundle\Tests\Translation\Extractor\File;
+
+use JMS\TranslationBundle\Model\Message;
+use JMS\TranslationBundle\Model\MessageCatalogue;
+use JMS\TranslationBundle\Translation\Extractor\File\AnnotationExtractor;
+use JMS\TranslationBundle\Translation\Extractor\File\DefaultPhpFileExtractor;
+
+class AnnotationExtractorTest extends BasePhpFileExtractorTest
+{
+    public function testExtractController()
+    {
+        $catalogue = $this->extract('Controller.php');
+
+        $fileSourceFactory = $this->getFileSourceFactory();
+        $fixtureSplInfo = new \SplFileInfo(__DIR__.'/Fixture/Controller.php');
+
+        $expected = new MessageCatalogue();
+
+        $message = new Message('simple.text1');
+        $message->addSource($fileSourceFactory->create($fixtureSplInfo, 94));
+        $expected->add($message);
+
+        $message = new Message('simple.text2');
+        $message->addSource($fileSourceFactory->create($fixtureSplInfo, 95));
+        $message->addAlternativeTranslation('en', 'Simple text 2');
+        $expected->add($message);
+
+        $message = new Message('subarray.value1', 'subarray');
+        $message->addSource($fileSourceFactory->create($fixtureSplInfo, 100));
+        $message->addAlternativeTranslation('en', 'Sub array value1');
+        $expected->add($message);
+
+        $message = new Message('subarray.value2', 'subarray');
+        $message->addSource($fileSourceFactory->create($fixtureSplInfo, 102));
+        $message->addAlternativeTranslation('en', 'Sub array value2');
+        $expected->add($message);
+
+        $message = new Message('user.role.partner');
+        $message->addSource($fileSourceFactory->create($fixtureSplInfo, 108));
+        $expected->add($message);
+
+        $message = new Message('user.role.supporter');
+        $message->addSource($fileSourceFactory->create($fixtureSplInfo, 109));
+        $expected->add($message);
+
+        $message = new Message('user.role.admin');
+        $message->addSource($fileSourceFactory->create($fixtureSplInfo, 110));
+        $expected->add($message);
+
+        $this->assertEquals($expected, $catalogue);
+    }
+
+    protected function getDefaultExtractor()
+    {
+        return new AnnotationExtractor($this->getDocParser(), $this->getFileSourceFactory());
+    }
+}
diff --git a/Tests/Translation/Extractor/File/BasePhpFileExtractorTest.php b/Tests/Translation/Extractor/File/BasePhpFileExtractorTest.php
index 2a8049b..bb8dc9a 100644
--- a/Tests/Translation/Extractor/File/BasePhpFileExtractorTest.php
+++ b/Tests/Translation/Extractor/File/BasePhpFileExtractorTest.php
@@ -65,6 +65,9 @@ final protected function getDocParser()
             'meaning' => 'JMS\TranslationBundle\Annotation\Meaning',
             'ignore' => 'JMS\TranslationBundle\Annotation\Ignore',
             'alttrans' => 'JMS\TranslationBundle\Annotation\AltTrans',
+            'transarraykeys' => 'JMS\TranslationBundle\Annotation\TransArrayKeys',
+            'transarrayvalues' => 'JMS\TranslationBundle\Annotation\TransArrayValues',
+            'transstring' => 'JMS\TranslationBundle\Annotation\TransString',
         ));
         $docParser->setIgnoreNotImportedAnnotations(true);
 
diff --git a/Tests/Translation/Extractor/File/Fixture/Controller.php b/Tests/Translation/Extractor/File/Fixture/Controller.php
index c3dccc0..e9720ae 100644
--- a/Tests/Translation/Extractor/File/Fixture/Controller.php
+++ b/Tests/Translation/Extractor/File/Fixture/Controller.php
@@ -87,4 +87,27 @@ public function testAlternativeTranslations()
         /** @AltTrans("This is the alternative <a href=""http://example.com"">translations &raquo;</a>", locale="en") */
         return $this->translator->trans('text.alternative.en', array('%bar%' => 'barVar'));
     }
+
+    public function testAnnotations()
+    {
+        /** @TransString */
+        $simpleString1 = "simple.text1";
+        $simpleString2 = /** @TransString @AltTrans("Simple text 2", locale="en") */ "simple.text2";
+        $array = [
+            /** @TransArrayValues("subarray") */
+            'hihi' => [
+                /** @AltTrans("Sub array value1", locale="en") */
+                'key1' => 'subarray.value1',
+                /** @AltTrans("Sub array value2", locale="en") */
+                'key2' => 'subarray.value2',
+            ],
+        ];
+
+        /** @TransArrayKeys */
+        return [
+            'user.role.partner' => 'ROLE_PARTNER',
+            'user.role.supporter' => 'ROLE_SUPPORTER',
+            'user.role.admin' => 'ROLE_ADMIN',
+        ];
+    }
 }
diff --git a/Tests/Translation/Extractor/File/TwigFileExtractorTest.php b/Tests/Translation/Extractor/File/TwigFileExtractorTest.php
index 38543ea..597dee1 100644
--- a/Tests/Translation/Extractor/File/TwigFileExtractorTest.php
+++ b/Tests/Translation/Extractor/File/TwigFileExtractorTest.php
@@ -154,7 +154,7 @@ private function extract($file, TwigFileExtractor $extractor = null)
             throw new RuntimeException(sprintf('The file "%s" does not exist.', $file));
         }
 
-        $env = new \Twig_Environment();
+        $env = new \Twig_Environment(new \Twig_Loader_Array(array()));
         $env->addExtension(new SymfonyTranslationExtension($translator = new IdentityTranslator(new MessageSelector())));
         $env->addExtension(new TranslationExtension($translator, true));
         $env->addExtension(new RoutingExtension(new UrlGenerator(new RouteCollection(), new RequestContext())));
@@ -173,7 +173,7 @@ private function extract($file, TwigFileExtractor $extractor = null)
             $extractor = new TwigFileExtractor($env, new FileSourceFactory('faux'));
         }
 
-        $ast = $env->parse($env->tokenize(file_get_contents($file), $file));
+        $ast = $env->parse($env->tokenize(new \Twig_Source(file_get_contents($file), $file)));
 
         $catalogue = new MessageCatalogue();
         $extractor->visitTwigFile(new \SplFileInfo($file), $catalogue, $ast);
diff --git a/Tests/Translation/Extractor/FileExtractorTest.php b/Tests/Translation/Extractor/FileExtractorTest.php
index d0f2109..71ceae7 100644
--- a/Tests/Translation/Extractor/FileExtractorTest.php
+++ b/Tests/Translation/Extractor/FileExtractorTest.php
@@ -18,7 +18,9 @@
 
 namespace JMS\TranslationBundle\Tests\Translation\Extractor;
 
+use JMS\TranslationBundle\Translation\Extractor\File\TwigFileExtractor;
 use JMS\TranslationBundle\Translation\FileSourceFactory;
+use JMS\TranslationBundle\Twig\TranslationExtension;
 use Psr\Log\NullLogger;
 use Doctrine\Common\Annotations\DocParser;
 use JMS\TranslationBundle\Translation\Extractor\File\FormExtractor;
@@ -29,13 +31,11 @@
 use JMS\TranslationBundle\Model\FileSource;
 use JMS\TranslationBundle\Model\Message;
 use JMS\TranslationBundle\Model\MessageCatalogue;
-use JMS\TranslationBundle\Translation\Extractor\File\TwigFileExtractor;
 use JMS\TranslationBundle\Translation\Extractor\File\TranslationContainerExtractor;
 use JMS\TranslationBundle\Translation\Extractor\File\DefaultPhpFileExtractor;
 use Symfony\Component\Translation\MessageSelector;
 use Symfony\Component\Translation\IdentityTranslator;
 use Symfony\Bridge\Twig\Extension\TranslationExtension as SymfonyTranslationExtension;
-use JMS\TranslationBundle\Twig\TranslationExtension;
 use JMS\TranslationBundle\Translation\Extractor\FileExtractor;
 
 class FileExtractorTest extends \PHPUnit_Framework_TestCase
@@ -95,7 +95,7 @@ public function testExtractWithSimpleTestFixtures()
 
     private function extract($directory)
     {
-        $twig = new \Twig_Environment();
+        $twig = new \Twig_Environment(new \Twig_Loader_Array(array()));
         $twig->addExtension(new SymfonyTranslationExtension($translator = new IdentityTranslator(new MessageSelector())));
         $twig->addExtension(new TranslationExtension($translator));
         $loader=new \Twig_Loader_Filesystem(realpath(__DIR__."/Fixture/SimpleTest/Resources/views/"));
diff --git a/Tests/Translation/ExtractorManagerTest.php b/Tests/Translation/ExtractorManagerTest.php
index d9dd3d2..785f68a 100644
--- a/Tests/Translation/ExtractorManagerTest.php
+++ b/Tests/Translation/ExtractorManagerTest.php
@@ -67,7 +67,7 @@ public function testReset()
         $foo = $this->getMock('JMS\TranslationBundle\Translation\ExtractorInterface');
         $logger = new NullLogger();
 
-        $extractor = new FileExtractor(new \Twig_Environment(), $logger, array());
+        $extractor = new FileExtractor(new \Twig_Environment(new \Twig_Loader_Array(array())), $logger, array());
         $extractor->setExcludedNames(array('foo', 'bar'));
         $extractor->setExcludedDirs(array('baz'));
 
@@ -110,7 +110,7 @@ private function getManager(FileExtractor $extractor = null, array $extractors =
         $logger = new NullLogger();
 
         if (null === $extractor) {
-            $extractor = new FileExtractor(new \Twig_Environment(), $logger, array());
+            $extractor = new FileExtractor(new \Twig_Environment(new \Twig_Loader_Array(array())), $logger, array());
         }
 
         return new ExtractorManager($extractor, $logger, $extractors);
diff --git a/Tests/Twig/BaseTwigTestCase.php b/Tests/Twig/BaseTwigTestCase.php
index 3e076c9..181b6fe 100644
--- a/Tests/Twig/BaseTwigTestCase.php
+++ b/Tests/Twig/BaseTwigTestCase.php
@@ -29,11 +29,10 @@ final protected function parse($file, $debug = false)
     {
         $content = file_get_contents(__DIR__.'/Fixture/'.$file);
 
-        $env = new \Twig_Environment();
+        $env = new \Twig_Environment(new \Twig_Loader_Array(array()));
         $env->addExtension(new SymfonyTranslationExtension($translator = new IdentityTranslator(new MessageSelector())));
         $env->addExtension(new TranslationExtension($translator, $debug));
-        $env->setLoader(new \Twig_Loader_String());
 
-        return $env->parse($env->tokenize($content));
+        return $env->parse($env->tokenize(new \Twig_Source($content, null)))->getNode('body');
     }
 }
diff --git a/Translation/Extractor/File/AnnotationExtractor.php b/Translation/Extractor/File/AnnotationExtractor.php
new file mode 100644
index 0000000..6661b1a
--- /dev/null
+++ b/Translation/Extractor/File/AnnotationExtractor.php
@@ -0,0 +1,283 @@
+<?php
+
+/*
+ * Copyright 2011 Johannes M. Schmitt <schmittjoh@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace JMS\TranslationBundle\Translation\Extractor\File;
+
+use JMS\TranslationBundle\Annotation\AltTrans;
+use JMS\TranslationBundle\Annotation\TransArrayKeys;
+use JMS\TranslationBundle\Annotation\TransArrayValues;
+use JMS\TranslationBundle\Annotation\TransString;
+use JMS\TranslationBundle\Exception\RuntimeException;
+use JMS\TranslationBundle\Model\Message;
+use JMS\TranslationBundle\Annotation\Meaning;
+use JMS\TranslationBundle\Annotation\Desc;
+use JMS\TranslationBundle\Annotation\Ignore;
+use Doctrine\Common\Annotations\DocParser;
+use JMS\TranslationBundle\Model\MessageCatalogue;
+use JMS\TranslationBundle\Translation\Extractor\FileVisitorInterface;
+use JMS\TranslationBundle\Logger\LoggerAwareInterface;
+use JMS\TranslationBundle\Translation\FileSourceFactory;
+use PhpParser\Comment\Doc;
+use PhpParser\Node;
+use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitor;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpKernel\Kernel;
+
+/**
+ * Class AnnotationExtractor
+ *
+ * Parse translations by Trans* annotations
+ *
+ * @package JMS\TranslationBundle\Translation\Extractor\File
+ */
+class AnnotationExtractor implements FileVisitorInterface, LoggerAwareInterface, NodeVisitor
+{
+    const ARRAY_TARGET_KEY = 'key';
+    const ARRAY_TARGET_VALUE = 'value';
+
+    /**
+     * @var FileSourceFactory
+     */
+    private $fileSourceFactory;
+
+    /**
+     * @var DocParser
+     */
+    private $docParser;
+
+    /**
+     * @var NodeTraverser
+     */
+    private $traverser;
+
+    /**
+     * @var \SplFileInfo
+     */
+    private $file;
+
+    /**
+     * @var MessageCatalogue
+     */
+    private $catalogue;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * FormExtractor constructor.
+     * @param DocParser $docParser
+     * @param FileSourceFactory $fileSourceFactory
+     */
+    public function __construct(DocParser $docParser, FileSourceFactory $fileSourceFactory)
+    {
+        $this->docParser = $docParser;
+        $this->fileSourceFactory = $fileSourceFactory;
+        $this->traverser = new NodeTraverser();
+        $this->traverser->addVisitor($this);
+    }
+
+    /**
+     * @param Node $node
+     * @return null|Node|void
+     */
+    public function enterNode(Node $node)
+    {
+        if (!$this->nodeHasTransAnnotation($node)) {
+            return;
+        }
+
+        $docComments = $this->docParser->parse($node->getDocComment(), 'file '.$this->file.' near line '.$node->getLine());
+        foreach ($docComments as $annot) {
+            if ($annot instanceof TransString) {
+                $this->parseStringItem($node, $annot->domain);
+            } elseif ($annot instanceof TransArrayKeys) {
+                $this->parseArray($node, $annot->domain, self::ARRAY_TARGET_KEY);
+            } elseif ($annot instanceof TransArrayValues) {
+                $this->parseArray($node, $annot->domain, self::ARRAY_TARGET_VALUE);
+            }
+        }
+    }
+
+    /**
+     * Check the node has Trans* annotation.
+     *
+     * @param Node $node
+     * @return bool
+     */
+    protected function nodeHasTransAnnotation(Node $node)
+    {
+        if (!$node->hasAttribute('comments')) {
+            return false;
+        }
+
+        $docComment = $node->getDocComment();
+        return $docComment && strpos($docComment, '@Trans');
+    }
+
+    /**
+     * Find string in (sub)node
+     *
+     * @param Node $node
+     * @param string $domain
+     */
+    protected function parseStringItem(Node $node, $domain)
+    {
+        $ignore = false;
+        $desc = $meaning = null;
+        $alternativeTranslations = [];
+        if (null !== $docComment = $node->getDocComment()) {
+            foreach ($this->docParser->parse($docComment, 'file '.$this->file.' near line '.$node->getLine()) as $annot) {
+                if ($annot instanceof Ignore) {
+                    $ignore = true;
+                } elseif ($annot instanceof Desc) {
+                    $desc = $annot->text;
+                } elseif ($annot instanceof Meaning) {
+                    $meaning = $annot->text;
+                } elseif ($annot instanceof AltTrans) {
+                    $alternativeTranslations[$annot->locale] = $annot->text;
+                }
+            }
+        }
+
+        $stringNode = $this->findSubNode($node, Node\Scalar\String_::class);
+        if (!$stringNode) {
+            return;
+        }
+
+        $message = new Message($stringNode->value, $domain);
+        $message
+            ->setDesc($desc)
+            ->setMeaning($meaning)
+            ->addSource($this->fileSourceFactory->create($this->file, $stringNode->getLine()))
+            ->setAlternativeTranslations($alternativeTranslations)
+        ;
+        $this->catalogue->add($message);
+    }
+
+    /**
+     * @param Node $node
+     * @param string $domain
+     * @param string $target self::ARRAY_TARGET_*
+     */
+    protected function parseArray(Node $node, $domain, $target)
+    {
+        $arrayNode = $this->findSubNode($node, Node\Expr\Array_::class);
+        if (!$arrayNode) {
+            return;
+        }
+        /** @var Node\Expr\ArrayItem $arrayItem */
+        foreach ($arrayNode->items as $arrayItem) {
+            /** @var Node\Scalar\String_ $stringNode */
+            $stringNode = $target == self::ARRAY_TARGET_KEY
+                ? $arrayItem->key
+                : $arrayItem->value;
+            // If arrayItem has docComment but the current string node doesn't, then set it
+            if (!$stringNode->getDocComment() && $arrayItem->getDocComment()) {
+                $stringNode->setAttribute('comments', $arrayItem->getAttribute('comments'));
+            }
+
+            $this->parseStringItem($stringNode, $domain);
+        }
+    }
+
+    /**
+     * Find in node the subnode with setted class.
+     *
+     * @param Node $node
+     * @param string $nodeClass Finded node class
+     * @return Node|void
+     */
+    protected function findSubNode(Node $node, $nodeClass)
+    {
+        if (get_class($node) == $nodeClass) {
+            return $node;
+        }
+        if (isset($node->expr) && is_object($node->expr) && get_class($node->expr) == $nodeClass) {
+            return $node->expr;
+        }
+        if (isset($node->value) && is_object($node->value) && get_class($node->value) == $nodeClass) {
+            return $node->value;
+        }
+
+        return;
+    }
+
+    /**
+     * @param \SplFileInfo $file
+     * @param MessageCatalogue $catalogue
+     * @param array $ast
+     */
+    public function visitPhpFile(\SplFileInfo $file, MessageCatalogue $catalogue, array $ast)
+    {
+        $this->file = $file;
+        $this->catalogue = $catalogue;
+        $this->traverser->traverse($ast);
+    }
+
+    /**
+     * @param Node $node
+     * @return null|\PhpParser\Node[]|void
+     */
+    public function leaveNode(Node $node)
+    {
+    }
+
+    /**
+     * @param array $nodes
+     * @return null|\PhpParser\Node[]|void
+     */
+    public function beforeTraverse(array $nodes)
+    {
+    }
+
+    /**
+     * @param array $nodes
+     * @return null|\PhpParser\Node[]|void
+     */
+    public function afterTraverse(array $nodes)
+    {
+    }
+
+    /**
+     * @param \SplFileInfo $file
+     * @param MessageCatalogue $catalogue
+     */
+    public function visitFile(\SplFileInfo $file, MessageCatalogue $catalogue)
+    {
+    }
+
+    /**
+     * @param \SplFileInfo $file
+     * @param MessageCatalogue $catalogue
+     * @param \Twig_Node $ast
+     */
+    public function visitTwigFile(\SplFileInfo $file, MessageCatalogue $catalogue, \Twig_Node $ast)
+    {
+    }
+
+    /**
+     * @param LoggerInterface $logger
+     */
+    public function setLogger(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+}
diff --git a/Translation/Extractor/File/TwigFileExtractor.php b/Translation/Extractor/File/TwigFileExtractor.php
index 30bb9f0..dfc1e26 100644
--- a/Translation/Extractor/File/TwigFileExtractor.php
+++ b/Translation/Extractor/File/TwigFileExtractor.php
@@ -25,7 +25,7 @@
 use JMS\TranslationBundle\Model\MessageCatalogue;
 use JMS\TranslationBundle\Translation\Extractor\FileVisitorInterface;
 
-class TwigFileExtractor implements FileVisitorInterface, \Twig_NodeVisitorInterface
+class TwigFileExtractor extends \Twig_BaseNodeVisitor implements FileVisitorInterface
 {
     /**
      * @var FileSourceFactory
@@ -64,11 +64,11 @@ public function __construct(\Twig_Environment $env, FileSourceFactory $fileSourc
     }
 
     /**
-     * @param \Twig_NodeInterface $node
+     * @param \Twig_Node $node
      * @param \Twig_Environment $env
-     * @return \Twig_NodeInterface
+     * @return \Twig_Node
      */
-    public function enterNode(\Twig_NodeInterface $node, \Twig_Environment $env)
+    public function doEnterNode(\Twig_Node $node, \Twig_Environment $env)
     {
         $this->stack[] = $node;
 
@@ -81,7 +81,7 @@ public function enterNode(\Twig_NodeInterface $node, \Twig_Environment $env)
             }
 
             $message = new Message($id, $domain);
-            $message->addSource($this->fileSourceFactory->create($this->file, $node->getLine()));
+            $message->addSource($this->fileSourceFactory->create($this->file, $node->getTemplateLine()));
             // Placeholders
             foreach($node->getNode('vars') as $n => $var) {
                 if($n%2 == 1) {
@@ -118,7 +118,7 @@ public function enterNode(\Twig_NodeInterface $node, \Twig_Environment $env)
                 }
 
                 $message = new Message($id, $domain);
-                $message->addSource($this->fileSourceFactory->create($this->file, $node->getLine()));
+                $message->addSource($this->fileSourceFactory->create($this->file, $node->getTemplateLine()));
 
                 // Placeholders
                 $index--;
@@ -226,11 +226,11 @@ private function traverseEmbeddedTemplates(\Twig_Node $node)
     }
 
     /**
-     * @param \Twig_NodeInterface $node
+     * @param \Twig_Node $node
      * @param \Twig_Environment $env
-     * @return \Twig_NodeInterface
+     * @return \Twig_Node
      */
-    public function leaveNode(\Twig_NodeInterface $node, \Twig_Environment $env)
+    public function doLeaveNode(\Twig_Node $node, \Twig_Environment $env)
     {
         array_pop($this->stack);
 
diff --git a/Translation/Extractor/FileExtractor.php b/Translation/Extractor/FileExtractor.php
index f207d24..6321b34 100644
--- a/Translation/Extractor/FileExtractor.php
+++ b/Translation/Extractor/FileExtractor.php
@@ -203,7 +203,7 @@ public function extract()
         }
 
         $curTwigLoader = $this->twig->getLoader();
-        $this->twig->setLoader(new \Twig_Loader_String());
+        $this->twig->setLoader(new \Twig_Loader_Array(array()));
 
         try {
             $catalogue = new MessageCatalogue();
@@ -227,7 +227,7 @@ public function extract()
                         $visitingArgs[] = $ast;
                     } elseif ('twig' === $extension) {
                         $visitingMethod = 'visitTwigFile';
-                        $visitingArgs[] = $this->twig->parse($this->twig->tokenize(file_get_contents($file), (string) $file));
+                        $visitingArgs[] = $this->twig->parse($this->twig->tokenize(new \Twig_Source(file_get_contents($file), (string) $file)));
                     }
                 }
 
diff --git a/Twig/DefaultApplyingNodeVisitor.php b/Twig/DefaultApplyingNodeVisitor.php
index 66e7ab1..162746d 100644
--- a/Twig/DefaultApplyingNodeVisitor.php
+++ b/Twig/DefaultApplyingNodeVisitor.php
@@ -28,7 +28,7 @@
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-class DefaultApplyingNodeVisitor implements \Twig_NodeVisitorInterface
+class DefaultApplyingNodeVisitor extends \Twig_BaseNodeVisitor
 {
     /**
      * @var bool
@@ -44,11 +44,11 @@ public function setEnabled($bool)
     }
 
     /**
-     * @param \Twig_NodeInterface $node
+     * @param \Twig_Node $node
      * @param \Twig_Environment $env
-     * @return \Twig_NodeInterface
+     * @return \Twig_Node
      */
-    public function enterNode(\Twig_NodeInterface $node, \Twig_Environment $env)
+    public function doEnterNode(\Twig_Node $node, \Twig_Environment $env)
     {
         if (!$this->enabled) {
             return $node;
@@ -75,16 +75,14 @@ public function enterNode(\Twig_NodeInterface $node, \Twig_Environment $env)
             // so that we can catch a possible exception when the default translation has not yet
             // been extracted
             if ('transchoice' === $transNode->getNode('filter')->getAttribute('value')) {
-                $transchoiceArguments = new \Twig_Node_Expression_Array(array(), $transNode->getLine());
+                $transchoiceArguments = new \Twig_Node_Expression_Array(array(), $transNode->getTemplateLine());
                 $transchoiceArguments->addElement($wrappingNode->getNode('node'));
                 $transchoiceArguments->addElement($defaultNode);
                 foreach ($wrappingNode->getNode('arguments') as $arg) {
                     $transchoiceArguments->addElement($arg);
                 }
 
-                $transchoiceNode = new \Twig_Node_Expression_MethodCall(
-                    new \Twig_Node_Expression_ExtensionReference('jms_translation', $transNode->getLine()),
-                    'transchoiceWithDefault', $transchoiceArguments, $transNode->getLine());
+                $transchoiceNode = new Node\Transchoice($transchoiceArguments, $transNode->getTemplateLine());
                 $node->setNode('node', $transchoiceNode);
 
                 return $node;
@@ -93,7 +91,7 @@ public function enterNode(\Twig_NodeInterface $node, \Twig_Environment $env)
             // if the |trans filter has replacements parameters
             // (e.g. |trans({'%foo%': 'bar'}))
             if ($wrappingNode->getNode('arguments')->hasNode(0)) {
-                $lineno =  $wrappingNode->getLine();
+                $lineno =  $wrappingNode->getTemplateLine();
 
                 // remove the replacements from the test node
                 $testNode->setNode('arguments', clone $testNode->getNode('arguments'));
@@ -111,10 +109,10 @@ public function enterNode(\Twig_NodeInterface $node, \Twig_Environment $env)
             }
 
             $condition = new \Twig_Node_Expression_Conditional(
-                new \Twig_Node_Expression_Binary_Equal($testNode, $transNode->getNode('node'), $wrappingNode->getLine()),
+                new \Twig_Node_Expression_Binary_Equal($testNode, $transNode->getNode('node'), $wrappingNode->getTemplateLine()),
                 $defaultNode,
                 clone $wrappingNode,
-                $wrappingNode->getLine()
+                $wrappingNode->getTemplateLine()
             );
             $node->setNode('node', $condition);
         }
@@ -123,11 +121,11 @@ public function enterNode(\Twig_NodeInterface $node, \Twig_Environment $env)
     }
 
     /**
-     * @param \Twig_NodeInterface $node
+     * @param \Twig_Node $node
      * @param \Twig_Environment $env
-     * @return \Twig_NodeInterface
+     * @return \Twig_Node
      */
-    public function leaveNode(\Twig_NodeInterface $node, \Twig_Environment $env)
+    public function doLeaveNode(\Twig_Node $node, \Twig_Environment $env)
     {
         return $node;
     }
diff --git a/Twig/Node/Transchoice.php b/Twig/Node/Transchoice.php
new file mode 100644
index 0000000..ec3f4d0
--- /dev/null
+++ b/Twig/Node/Transchoice.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * Copyright 2011 Johannes M. Schmitt <schmittjoh@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace JMS\TranslationBundle\Twig\Node;
+
+class Transchoice extends \Twig_Node_Expression
+{
+    public function __construct(\Twig_Node_Expression_Array $arguments, $lineno)
+    {
+        parent::__construct(array('arguments' => $arguments), array(), $lineno);
+    }
+
+    public function compile(\Twig_Compiler $compiler)
+    {
+        $compiler->raw(
+            sprintf(
+                '$this->env->getExtension(\'%s\')->%s(',
+                'JMS\TranslationBundle\Twig\TranslationExtension',
+                'transchoiceWithDefault'
+            )
+        );
+
+        $first = true;
+        foreach ($this->getNode('arguments')->getKeyValuePairs() as $pair) {
+            if (!$first) {
+                $compiler->raw(', ');
+            }
+            $first = false;
+
+            $compiler->subcompile($pair['value']);
+        }
+
+        $compiler->raw(')');
+    }
+}
diff --git a/Twig/NormalizingNodeVisitor.php b/Twig/NormalizingNodeVisitor.php
index cde5622..15287f7 100644
--- a/Twig/NormalizingNodeVisitor.php
+++ b/Twig/NormalizingNodeVisitor.php
@@ -26,29 +26,29 @@
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-class NormalizingNodeVisitor implements \Twig_NodeVisitorInterface
+class NormalizingNodeVisitor extends \Twig_BaseNodeVisitor
 {
     /**
-     * @param \Twig_NodeInterface $node
+     * @param \Twig_Node $node
      * @param \Twig_Environment $env
-     * @return \Twig_NodeInterface
+     * @return \Twig_Node
      */
-    public function enterNode(\Twig_NodeInterface $node, \Twig_Environment $env)
+    public function doEnterNode(\Twig_Node $node, \Twig_Environment $env)
     {
         return $node;
     }
 
     /**
-     * @param \Twig_NodeInterface $node
+     * @param \Twig_Node $node
      * @param \Twig_Environment $env
-     * @return \Twig_Node_Expression_Constant|\Twig_NodeInterface
+     * @return \Twig_Node_Expression_Constant|\Twig_Node
      */
-    public function leaveNode(\Twig_NodeInterface $node, \Twig_Environment $env)
+    public function doLeaveNode(\Twig_Node $node, \Twig_Environment $env)
     {
         if ($node instanceof \Twig_Node_Expression_Binary_Concat
             && ($left = $node->getNode('left')) instanceof \Twig_Node_Expression_Constant
             && ($right = $node->getNode('right')) instanceof \Twig_Node_Expression_Constant) {
-            return new \Twig_Node_Expression_Constant($left->getAttribute('value').$right->getAttribute('value'), $left->getLine());
+            return new \Twig_Node_Expression_Constant($left->getAttribute('value').$right->getAttribute('value'), $left->getTemplateLine());
         }
 
         return $node;
diff --git a/Twig/RemovingNodeVisitor.php b/Twig/RemovingNodeVisitor.php
index 3aaaf9c..ec8a16b 100644
--- a/Twig/RemovingNodeVisitor.php
+++ b/Twig/RemovingNodeVisitor.php
@@ -23,7 +23,7 @@
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-class RemovingNodeVisitor implements \Twig_NodeVisitorInterface
+class RemovingNodeVisitor extends \Twig_BaseNodeVisitor
 {
     /**
      * @var bool
@@ -39,11 +39,11 @@ public function setEnabled($bool)
     }
 
     /**
-     * @param \Twig_NodeInterface $node
+     * @param \Twig_Node $node
      * @param \Twig_Environment $env
-     * @return \Twig_NodeInterface
+     * @return \Twig_Node
      */
-    public function enterNode(\Twig_NodeInterface $node, \Twig_Environment $env)
+    public function doEnterNode(\Twig_Node $node, \Twig_Environment $env)
     {
         if ($this->enabled && $node instanceof \Twig_Node_Expression_Filter) {
             $name = $node->getNode('filter')->getAttribute('value');
@@ -57,11 +57,11 @@ public function enterNode(\Twig_NodeInterface $node, \Twig_Environment $env)
     }
 
     /**
-     * @param \Twig_NodeInterface $node
+     * @param \Twig_Node $node
      * @param \Twig_Environment $env
-     * @return \Twig_NodeInterface
+     * @return \Twig_Node
      */
-    public function leaveNode(\Twig_NodeInterface $node, \Twig_Environment $env)
+    public function doLeaveNode(\Twig_Node $node, \Twig_Environment $env)
     {
         return $node;
     }
diff --git a/Twig/TranslationExtension.php b/Twig/TranslationExtension.php
index 9444f0c..cd0946e 100644
--- a/Twig/TranslationExtension.php
+++ b/Twig/TranslationExtension.php
@@ -122,7 +122,7 @@ public function meaning($v)
         return $v;
     }
 
-    public function altTrans($v)
+    public function altTrans($v, $locale, $trans)
     {
         return $v;
     }
diff --git a/composer.json b/composer.json
index 2c668ec..6d43130 100644
--- a/composer.json
+++ b/composer.json
@@ -18,17 +18,14 @@
     "minimum-stability": "stable",
     "require": {
         "php": "^5.3.3 || ^7.0",
+        "twig/twig": "^1.27 || ^2.0",
         "symfony/framework-bundle": "^2.3 || ^3.0",
-        "nikic/php-parser": "^1.4 || ^2.0",
+        "nikic/php-parser": "^1.4 || ^2.0 || ^3.0",
         "symfony/console": "^2.3 || ^3.0"
     },
-    "conflict": {
-        "twig/twig": "<1.12"
-    },
     "require-dev": {
         "phpunit/phpunit": "4.8.27",
         "psr/log": "^1.0",
-        "twig/twig": "^1.12",
         "symfony/symfony": "^2.3 || ^3.0",
         "symfony/expression-language": "^2.6 || ^3.0",
         "sensio/framework-extra-bundle": "^2.3 || ^3.0",