Merge branch 'master' of github.com:php-translation/symfony-bundle into chore/twig-from-aliases-to-namespaces

Author: bocharsky-bw

.travis.yml

@@ -13,6 +13,7 @@ env:
   global:
     - TEST_COMMAND="composer test"
     - SYMFONY_PHPUNIT_VERSION="6.3"
+    - COMPOSER_MEMORY_LIMIT=-1
 
 matrix:
     fast_finish: true
@@ -24,11 +25,11 @@ matrix:
           # Test with lowest dependencies
         - php: 7.1
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" SYMFONY_PHPUNIT_VERSION="5.7"
-        - php: 5.5
+        - php: 5.6
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" SYMFONY_PHPUNIT_VERSION="5.7"
 
           # Test the latest stable release
-        - php: 5.5
+        - php: 5.6
           env: SYMFONY_PHPUNIT_VERSION="5.7"
         - php: 5.6
           env: SYMFONY_PHPUNIT_VERSION="5.7"
@@ -44,7 +45,7 @@ matrix:
         - php: 7.2
           env: DEPENDENCIES="dunglas/symfony-lock:^4"
         - php: 7.0
-          env: DEPENDENCIES="dunglas/symfony-lock:^2 twig/twig:^1.34 symfony/property-access:^2.8"
+          env: DEPENDENCIES="dunglas/symfony-lock:^2 twig/twig:^1.34,<1.39 symfony/property-access:^2.8"
 
           # Latest commit to master
         - php: 7.2

Command/DeleteObsoleteCommand.php

@@ -28,7 +28,8 @@
  */
 class DeleteObsoleteCommand extends Command
 {
-    use BundleTrait, StorageTrait;
+    use BundleTrait;
+    use StorageTrait;
 
     protected static $defaultName = 'translation:delete-obsolete';
 
@@ -72,7 +73,7 @@ protected function configure()
             ->setName(self::$defaultName)
             ->setDescription('Delete all translations marked as obsolete.')
             ->addArgument('configuration', InputArgument::OPTIONAL, 'The configuration to use', 'default')
-            ->addArgument('locale', InputArgument::OPTIONAL, 'The locale ot use. If omitted, we use all configured locales.', null)
+            ->addArgument('locale', InputArgument::OPTIONAL, 'The locale to use. If omitted, we use all configured locales.', null)
             ->addOption('bundle', 'b', InputOption::VALUE_REQUIRED, 'The bundle you want remove translations from.')
         ;
     }

Command/DownloadCommand.php

@@ -20,14 +20,14 @@
 use Translation\Bundle\Service\CacheClearer;
 use Translation\Bundle\Service\ConfigurationManager;
 use Translation\Bundle\Service\StorageManager;
-use Translation\Bundle\Model\Configuration;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
 class DownloadCommand extends Command
 {
-    use BundleTrait, StorageTrait;
+    use BundleTrait;
+    use StorageTrait;
 
     protected static $defaultName = 'translation:download';
 

Command/ExtractCommand.php

@@ -89,7 +89,7 @@ protected function configure()
             ->setName(self::$defaultName)
             ->setDescription('Extract translations from source code.')
             ->addArgument('configuration', InputArgument::OPTIONAL, 'The configuration to use', 'default')
-            ->addArgument('locale', InputArgument::OPTIONAL, 'The locale ot use. If omitted, we use all configured locales.', false)
+            ->addArgument('locale', InputArgument::OPTIONAL, 'The locale to use. If omitted, we use all configured locales.', false)
             ->addOption('hide-errors', null, InputOption::VALUE_NONE, 'If we should print error or not')
             ->addOption('bundle', 'b', InputOption::VALUE_REQUIRED, 'The bundle you want extract translations from.')
         ;

Command/StatusCommand.php

@@ -68,9 +68,9 @@ protected function configure()
             ->setName(self::$defaultName)
             ->setDescription('Show status about your translations.')
             ->addArgument('configuration', InputArgument::OPTIONAL, 'The configuration to use', 'default')
-            ->addArgument('locale', InputArgument::OPTIONAL, 'The locale ot use. If omitted, we use all configured locales.', false)
+            ->addArgument('locale', InputArgument::OPTIONAL, 'The locale to use. If omitted, we use all configured locales.', false)
             ->addOption('json', null, InputOption::VALUE_NONE, 'If we should output in Json format')
-            ->addOption('bundle', 'b', InputOption::VALUE_REQUIRED, 'The translations for bundle you want to check.')
+            ->addOption('bundle', 'b', InputOption::VALUE_REQUIRED, 'The bundle for which you want to check the translations.')
         ;
     }
 

Controller/WebUIController.php

@@ -16,6 +16,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Intl\Intl;
+use Symfony\Component\Intl\Locales;
 use Symfony\Component\Translation\MessageCatalogue;
 use Translation\Bundle\Exception\MessageValidationException;
 use Translation\Bundle\Service\StorageService;
@@ -250,7 +251,9 @@ private function getMessageFromRequest(Request $request)
     private function getLocale2LanguageMap()
     {
         $configuredLocales = $this->getParameter('php_translation.locales');
-        $names = Intl::getLocaleBundle()->getLocaleNames('en');
+        $names = class_exists(Locales::class)
+            ? Locales::getNames('en')
+            : Intl::getLocaleBundle()->getLocaleNames('en');
         $map = [];
         foreach ($configuredLocales as $l) {
             $map[$l] = isset($names[$l]) ? $names[$l] : $l;

Resources/views/SymfonyProfiler/translation.html.twig

@@ -120,6 +120,10 @@
     {% include "@Translation/SymfonyProfiler/javascripts.html.twig" %}
 {% endblock %}
 
+{% block panel %}
+    {{ block('panelContent') }}
+{% endblock %}
+
 {% macro render_table(messages, checkedByDefault = false) %}
     <table>
         <thead>

Tests/Unit/Twig/BaseTwigTestCase.php

@@ -33,6 +33,6 @@ final protected function parse($file, $debug = false)
         $env->addExtension(new SymfonyTranslationExtension($translator = new IdentityTranslator(new MessageSelector())));
         $env->addExtension(new TranslationExtension($translator, $debug));
 
-        return $env->parse($env->tokenize(new Source($content, null)))->getNode('body');
+        return $env->parse($env->tokenize(new Source($content, '')))->getNode('body');
     }
 }

composer.json

@@ -13,18 +13,19 @@
         "php": "^5.5 || ^7.0",
         "symfony/framework-bundle": "^2.7 || ^3.0 || ^4.0",
         "symfony/validator": "^2.7 || ^3.0 || ^4.0",
-        "symfony/translation": "^2.7 || ^3.0 || ^4.0",
+        "symfony/translation": "^2.7 || ^3.0 || ^4.0,<4.2",
         "symfony/twig-bundle": "^2.7 || ^3.0 || ^4.0",
         "symfony/finder": "^2.7 || ^3.0 || ^4.0",
         "symfony/intl": "^2.7 || ^3.0 || ^4.0",
 
         "php-translation/common": "^1.0",
         "php-translation/symfony-storage": "^1.0",
         "php-translation/extractor": "^1.3",
-        "nyholm/nsa": "^1.1"
+        "nyholm/nsa": "^1.1",
+        "twig/twig": "<1.39 || ^2.0,<2.8"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^3.4 || ^4.0",
+        "symfony/phpunit-bridge": "^3.4.19 || ^4.0",
         "php-translation/translator": "^1.0",
         "php-http/curl-client": "^1.7",
         "php-http/message": "^1.6",
@@ -35,8 +36,8 @@
         "symfony/templating": "^2.7 || ^3.0 || ^4.0",
         "symfony/dependency-injection": "^2.7 || ^3.0 || ^4.0",
         "symfony/web-profiler-bundle": "^2.7 || ^3.0 || ^4.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^1.2 || ^2.3",
-        "matthiasnoback/symfony-config-test": "^2.2 || ^3.1",
+        "matthiasnoback/symfony-dependency-injection-test": "^1.2 || ^2.3 || ^3.0",
+        "matthiasnoback/symfony-config-test": "^2.2 || ^3.1 || ^4.0",
         "guzzlehttp/psr7": "^1.4",
         "nyholm/symfony-bundle-test": "^1.2.3"
     },

phpunit.xml.dist

@@ -15,6 +15,7 @@
 
     <php>
         <env name="ENV" value="test" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="verbose=1" />
     </php>
 
     <formatter type="clover" usefile="false"/>