Merge pull request #358 from Nyholm/extractor20

Use extractor 2.0

Author: Olivier Dolbeau

.travis.yml

@@ -24,7 +24,7 @@ matrix:
 
           # Test with lowest dependencies
         - php: 7.2
-          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak"
+          env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak"
 
           # Test the latest stable release
         - php: 7.3
@@ -51,7 +51,7 @@ before_install:
     - if ! [ -z "$SYMFONY_VERSION" ]; then composer config extra.symfony.require "${SYMFONY_VERSION}"; fi;
 
 install:
-    - composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
+    - composer update ${COMPOSER_FLAGS} --prefer-dist --prefer-stable --no-interaction
 
 script:
     - composer validate --strict --no-check-lock

DependencyInjection/TranslationExtension.php

@@ -52,6 +52,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $this->handleConfigNode($container, $config);
 
         if ($config['webui']['enabled']) {
+            $loader->load('webui.yml');
             $this->enableWebUi($container, $config);
         } else {
             $container->setParameter('php_translation.webui.enabled', false);
@@ -83,7 +84,6 @@ public function load(array $configs, ContainerBuilder $container): void
         }
 
         $loader->load('console.yml');
-        $loader->load('controllers.yml');
     }
 
     /**

Resources/config/edit_in_place.yml

@@ -1,4 +1,13 @@
 services:
+  Translation\Bundle\Controller\EditInPlaceController:
+    autowire: true
+    autoconfigure: true
+    public: true
+    arguments:
+      - '@Translation\Bundle\Service\StorageManager'
+      - '@Translation\Bundle\Service\CacheClearer'
+      - '@Symfony\Component\Validator\Validator\ValidatorInterface'
+
   php_translation.edit_in_place.response_listener:
     class: Translation\Bundle\EventListener\EditInPlaceResponseListener
     tags:
@@ -31,4 +40,3 @@ services:
       - ~
     tags:
       - { name: 'twig.extension' }
-

Resources/config/extractors.yml

@@ -73,12 +73,7 @@ services:
       - { name: 'php_translation.visitor', type: 'php' }
 
   # Twig Visitors:
-  php_translation.extractor.twig.factory:
-    class: Translation\Extractor\Visitor\Twig\TwigVisitorFactory
-    public: false
-
-  php_translation.extractor.twig.visitor.twig:
-    class: Translation\Bundle\Twig\Visitor\DummyTwigVisitor
-    factory: ["@php_translation.extractor.twig.factory", create]
+  php_translation.extractor.twig.factory.twig:
+    class: Translation\Extractor\Visitor\Twig\TwigVisitor
     tags:
-      - { name: 'php_translation.visitor', type: 'twig' }
+        - { name: 'php_translation.visitor', type: 'twig' }

Resources/config/controllers.yml Resources/config/webui.ymlResources/config/controllers.yml renamed to Resources/config/webui.yml

@@ -1,17 +1,8 @@
 services:
-    Translation\Bundle\Controller\EditInPlaceController:
-        autowire: true
-        public: true
-        tags: ['container.service_subscriber']
-        arguments:
-            - '@Translation\Bundle\Service\StorageManager'
-            - '@Translation\Bundle\Service\CacheClearer'
-            - '@Symfony\Component\Validator\Validator\ValidatorInterface'
-
     Translation\Bundle\Controller\WebUIController:
         autowire: true
+        autoconfigure: true
         public: true
-        tags: ['container.service_subscriber']
         arguments:
             - '@Translation\Bundle\Service\ConfigurationManager'
             - '@Translation\Bundle\Catalogue\CatalogueFetcher'

Twig/Visitor/DummyTwigVisitor.php

@@ -19,9 +19,9 @@
         "symfony/intl": "^3.4 || ^4.3 || ^5.0",
 
         "php-translation/symfony-storage": "^2.0",
-        "php-translation/extractor": "^1.6",
+        "php-translation/extractor": "^2.0",
         "nyholm/nsa": "^1.1",
-        "twig/twig": "^1.42 || ^2.11"
+        "twig/twig": "^2.11 || ^3.0"
     },
     "require-dev": {
         "symfony/phpunit-bridge": "^4.4 || ^5.0",
@@ -56,6 +56,7 @@
         "test": "vendor/bin/phpunit",
         "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml Tests/Unit"
     },
+    "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
             "dev-master": "0.10-dev"