Merge branch '3.4'

* 3.4:
  [TwigBridge] Fixed the .form-check-input class in the bs4 templates
  [Console] Fix traversable autocomplete values
  [SecurityBundle] Improve deprecations
  [DI] Friendlier name for generated container in "as_files" mode
  [Debug] Remove false-positive deprecation from DebugClassLoader
  [SecurityBundle] Add missing quotes in deprecation messages
  [ExpressionLanguage] Fix PhpDoc type-hints on Token value
  bumped Symfony version to 3.3.12
  Add default translations path option and convention
  updated VERSION for 3.3.11
  updated CHANGELOG for 3.3.11
  bumped Symfony version to 2.8.30
  updated VERSION for 2.8.29
  updated CHANGELOG for 2.8.29
  bumped Symfony version to 2.7.37
  updated VERSION for 2.7.36
  update CONTRIBUTORS for 2.7.36
  updated CHANGELOG for 2.7.36

Author: nicolas-grekas

CHANGELOG.md

@@ -27,6 +27,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * Added `translator.default_path` option and parameter
  * Session `use_strict_mode` is now enabled by default and the corresponding option has been deprecated
  * Made the `cache:clear` command to *not* clear "app" PSR-6 cache pools anymore,
    but to still clear "system" ones; use the `cache:pool:clear` command to clear "app" pools instead

DependencyInjection/Configuration.php

@@ -624,6 +624,10 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode)
                         ->end()
                         ->booleanNode('logging')->defaultValue($this->debug)->end()
                         ->scalarNode('formatter')->defaultValue('translator.formatter.default')->end()
+                        ->scalarNode('default_path')
+                            ->info('The default path used to load translations')
+                            ->defaultValue('%kernel.project_dir%/config/translations')
+                        ->end()
                         ->arrayNode('paths')
                             ->prototype('scalar')->end()
                         ->end()

DependencyInjection/FrameworkExtension.php

@@ -872,6 +872,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
         $translator->addMethodCall('setFallbackLocales', array($config['fallbacks']));
 
         $container->setParameter('translator.logging', $config['logging']);
+        $container->setParameter('translator.default_path', $config['default_path']);
 
         // Discover translation directories
         $dirs = array();
@@ -890,11 +891,15 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
 
             $dirs[] = dirname(dirname($r->getFileName())).'/Resources/translations';
         }
+        $defaultDir = $container->getParameterBag()->resolveValue($config['default_path']);
         $rootDir = $container->getParameter('kernel.root_dir');
         foreach ($container->getParameter('kernel.bundles_metadata') as $name => $bundle) {
             if ($container->fileExists($dir = $bundle['path'].'/Resources/translations')) {
                 $dirs[] = $dir;
             }
+            if ($container->fileExists($dir = $defaultDir.'/'.$name)) {
+                $dirs[] = $dir;
+            }
             if ($container->fileExists($dir = $rootDir.sprintf('/Resources/%s/translations', $name))) {
                 $dirs[] = $dir;
             }
@@ -908,6 +913,9 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
             }
         }
 
+        if ($container->fileExists($defaultDir)) {
+            $dirs[] = $defaultDir;
+        }
         if ($container->fileExists($dir = $rootDir.'/Resources/translations')) {
             $dirs[] = $dir;
         }

Tests/DependencyInjection/ConfigurationTest.php

@@ -155,6 +155,7 @@ protected static function getBundleDefaultConfig()
                 'logging' => true,
                 'formatter' => 'translator.formatter.default',
                 'paths' => array(),
+                'default_path' => '%kernel.project_dir%/config/translations',
             ),
             'validation' => array(
                 'enabled' => !class_exists(FullStack::class),

Tests/DependencyInjection/Fixtures/yml/full.yml

@@ -42,6 +42,7 @@ framework:
     translator:
         enabled:  true
         fallback: fr
+        default_path: '%kernel.root_dir%/config/translations'
         paths: ['%kernel.root_dir%/Fixtures/translations']
     validation:
         enabled: true

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -496,6 +496,11 @@ public function testTranslator()
             $files,
             '->registerTranslatorConfiguration() finds translation resources in custom paths'
         );
+        $this->assertContains(
+            strtr(__DIR__.'/config/translations/test_default.en.xlf', '/', DIRECTORY_SEPARATOR),
+            $files,
+            '->registerTranslatorConfiguration() finds translation resources in default path'
+        );
 
         $calls = $container->getDefinition('translator.default')->getMethodCalls();
         $this->assertEquals(array('fr'), $calls[1][1][0]);