Merge branch '3.4'

* 3.4:
  [HttpKernel] Disable container inlining when legacy inlining has been used
  Let getFlashes starts the session
  Update default translations path
  [FrameworkBundle] Ignore failures when removing the old cache dir

Author: nicolas-grekas

src/Symfony/Bridge/Twig/AppVariable.php

@@ -156,10 +156,9 @@ public function getDebug()
      */
     public function getFlashes($types = null)
     {
-        // needed to avoid starting the session automatically when looking for flash messages
         try {
             $session = $this->getSession();
-            if (null === $session || !$session->isStarted()) {
+            if (null === $session) {
                 return array();
             }
         } catch (\RuntimeException $e) {

src/Symfony/Bridge/Twig/Tests/AppVariableTest.php

@@ -173,12 +173,8 @@ public function testGetFlashesWithNoRequest()
      */
     public function testGetFlashesWithNoSessionStarted()
     {
-        $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
-        $request->method('getSession')->willReturn(new Session());
-
-        $this->setRequestStack($request);
-
-        $this->assertEquals(array(), $this->appVariable->getFlashes());
+        $flashMessages = $this->setFlashMessages(false);
+        $this->assertEquals($flashMessages, $this->appVariable->getFlashes());
     }
 
     /**
@@ -256,7 +252,7 @@ protected function setTokenStorage($user)
         $token->method('getUser')->willReturn($user);
     }
 
-    private function setFlashMessages()
+    private function setFlashMessages($sessionHasStarted = true)
     {
         $flashMessages = array(
             'notice' => array('Notice #1 message'),
@@ -266,8 +262,8 @@ private function setFlashMessages()
         $flashBag = new FlashBag();
         $flashBag->initialize($flashMessages);
 
-        $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->getMock();
-        $session->method('isStarted')->willReturn(true);
+        $session = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')->disableOriginalConstructor()->getMock();
+        $session->method('isStarted')->willReturn($sessionHasStarted);
         $session->method('getFlashBag')->willReturn($flashBag);
 
         $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();

src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php

@@ -17,6 +17,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface;
 use Symfony\Component\HttpKernel\RebootableInterface;
@@ -104,7 +105,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $io->comment('Removing old cache directory...');
         }
 
-        $this->filesystem->remove($oldCacheDir);
+        try {
+            $this->filesystem->remove($oldCacheDir);
+        } catch (IOException $e) {
+            $io->warning($e->getMessage());
+        }
 
         if ($output->isVerbose()) {
             $io->comment('Finished');

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

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

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php

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

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml

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

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -496,7 +496,7 @@ public function testTranslator()
             '->registerTranslatorConfiguration() finds translation resources in custom paths'
         );
         $this->assertContains(
-            strtr(__DIR__.'/config/translations/test_default.en.xlf', '/', DIRECTORY_SEPARATOR),
+            strtr(__DIR__.'/translations/test_default.en.xlf', '/', DIRECTORY_SEPARATOR),
             $files,
             '->registerTranslatorConfiguration() finds translation resources in default path'
         );

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/config/translations/test_default.en.xlf renamed to src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/translations/test_default.en.xlf

@@ -121,14 +121,14 @@ public function dump(array $options = array())
             'namespace' => '',
             'as_files' => false,
             'debug' => true,
-            'hot_path_tag' => null,
+            'hot_path_tag' => 'container.hot_path',
             'inline_class_loader_parameter' => 'container.dumper.inline_class_loader',
         ), $options);
 
         $this->namespace = $options['namespace'];
         $this->asFiles = $options['as_files'];
         $this->hotPathTag = $options['hot_path_tag'];
-        $this->inlineRequires = $this->container->hasParameter($options['inline_class_loader_parameter']) && $this->container->getParameter($options['inline_class_loader_parameter']);
+        $this->inlineRequires = $options['inline_class_loader_parameter'] && $this->container->hasParameter($options['inline_class_loader_parameter']) && $this->container->getParameter($options['inline_class_loader_parameter']);
 
         if (0 !== strpos($baseClass = $options['base_class'], '\\') && 'Container' !== $baseClass) {
             $baseClass = sprintf('%s\%s', $options['namespace'] ? '\\'.$options['namespace'] : '', $baseClass);

src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

@@ -657,7 +657,6 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
             'file' => $cache->getPath(),
             'as_files' => true,
             'debug' => $this->debug,
-            'hot_path_tag' => 'container.hot_path',
         ));
 
         $rootCode = array_pop($content);