Merge branch '3.4' into 4.0

* 3.4:
  Clean up
  Update return type in docblock.
  PHP CS Fixer: no need to exclude xml and yml files
  PHP CS Fixer: no need to exclude json file
  Update LICENSE year... forever
  fixed some deprecation messages
  fixed CS
  Fixes for Oracle in PdoSessionHandler
  fixed some deprecation messages
  fixed some deprecation messages
  fixed some deprecation messages
  fixed some deprecation messages
  [TwigBundle/Brige] catch missing requirements to throw meaningful exceptions
  [HttpKernel] Call Response->setPrivate() instead of sending raw header() when session is started
  [FrameworkBundle] Make cache:clear "atomic" and consistent with cache:warmup
  Suggest to write an implementation if the interface cannot be autowired
  [Debug] Skip DebugClassLoader checks for already parsed files
  [2.7][DX] Use constant message contextualisation for deprecations
  Remove group options without data and fix normalization
  Remove redundant translation path

Author: nicolas-grekas

.php_cs.dist

@@ -32,16 +32,9 @@ return PhpCsFixer\Config::create()
             ))
             // file content autogenerated by `var_export`
             ->notPath('Symfony/Component/Translation/Tests/fixtures/resources.php')
-            // autogenerated xmls
-            ->notPath('Symfony/Component/Console/Tests/Fixtures/application_1.xml')
-            ->notPath('Symfony/Component/Console/Tests/Fixtures/application_2.xml')
-            // yml
-            ->notPath('Symfony/Component/Yaml/Tests/Fixtures/sfTests.yml')
             // test template
             ->notPath('Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
             // explicit heredoc test
             ->notPath('Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
-            // purposefully invalid JSON
-            ->notPath('Symfony/Component/Asset/Tests/fixtures/manifest-invalid.json')
     )
 ;

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2017 Fabien Potencier
+Copyright (c) 2004-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/Symfony/Bridge/Doctrine/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2017 Fabien Potencier
+Copyright (c) 2004-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/Symfony/Bridge/Monolog/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2017 Fabien Potencier
+Copyright (c) 2004-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/Symfony/Bridge/PhpUnit/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2017 Fabien Potencier
+Copyright (c) 2014-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/Symfony/Bridge/ProxyManager/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2017 Fabien Potencier
+Copyright (c) 2004-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/Symfony/Bridge/Twig/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2017 Fabien Potencier
+Copyright (c) 2004-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/Symfony/Bridge/Twig/UndefinedCallableHandler.php

@@ -0,0 +1,76 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Twig;
+
+use Twig\Error\SyntaxError;
+
+/**
+ * @internal
+ */
+class UndefinedCallableHandler
+{
+    private static $filterComponents = array(
+        'humanize' => 'form',
+        'trans' => 'translation',
+        'transchoice' => 'translation',
+        'yaml_encode' => 'yaml',
+        'yaml_dump' => 'yaml',
+    );
+
+    private static $functionComponents = array(
+        'asset' => 'asset',
+        'asset_version' => 'asset',
+        'dump' => 'debug-bundle',
+        'expression' => 'expression-language',
+        'form_widget' => 'form',
+        'form_errors' => 'form',
+        'form_label' => 'form',
+        'form_row' => 'form',
+        'form_rest' => 'form',
+        'form' => 'form',
+        'form_start' => 'form',
+        'form_end' => 'form',
+        'csrf_token' => 'form',
+        'logout_url' => 'security-http',
+        'logout_path' => 'security-http',
+        'is_granted' => 'security-core',
+        'link' => 'web-link',
+        'preload' => 'web-link',
+        'dns_prefetch' => 'web-link',
+        'preconnect' => 'web-link',
+        'prefetch' => 'web-link',
+        'prerender' => 'web-link',
+        'workflow_can' => 'workflow',
+        'workflow_transitions' => 'workflow',
+        'workflow_has_marked_place' => 'workflow',
+        'workflow_marked_places' => 'workflow',
+    );
+
+    public static function onUndefinedFilter($name)
+    {
+        if (!isset(self::$filterComponents[$name])) {
+            return false;
+        }
+
+        // Twig will append the source context to the message, so that it will end up being like "[...] Unknown filter "%s" in foo.html.twig on line 123."
+        throw new SyntaxError(sprintf('Did you forget to run "composer require symfony/%s"? Unknown filter "%s".', $name, self::$filterComponents[$name]));
+    }
+
+    public static function onUndefinedFunction($name)
+    {
+        if (!isset(self::$functionComponents[$name])) {
+            return false;
+        }
+
+        throw new SyntaxError(sprintf('Did you forget to run "composer require symfony/%s"? Unknown function "%s".', $name, self::$functionComponents[$name]));
+    }
+}

src/Symfony/Bundle/DebugBundle/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2017 Fabien Potencier
+Copyright (c) 2014-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -73,40 +73,62 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        $fs = $this->filesystem;
         $io = new SymfonyStyle($input, $output);
 
         $kernel = $this->getApplication()->getKernel();
         $realCacheDir = $kernel->getContainer()->getParameter('kernel.cache_dir');
         // the old cache dir name must not be longer than the real one to avoid exceeding
         // the maximum length of a directory or file path within it (esp. Windows MAX_PATH)
         $oldCacheDir = substr($realCacheDir, 0, -1).('~' === substr($realCacheDir, -1) ? '+' : '~');
+        $fs->remove($oldCacheDir);
 
         if (!is_writable($realCacheDir)) {
             throw new \RuntimeException(sprintf('Unable to write in the "%s" directory', $realCacheDir));
         }
 
-        if ($this->filesystem->exists($oldCacheDir)) {
-            $this->filesystem->remove($oldCacheDir);
-        }
-
         $io->comment(sprintf('Clearing the cache for the <info>%s</info> environment with debug <info>%s</info>', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
         $this->cacheClearer->clear($realCacheDir);
 
         // The current event dispatcher is stale, let's not use it anymore
         $this->getApplication()->setDispatcher(new EventDispatcher());
 
-        if ($input->getOption('no-warmup')) {
-            $this->filesystem->rename($realCacheDir, $oldCacheDir);
-        } else {
-            $this->warmupCache($input, $output, $realCacheDir, $oldCacheDir);
+        $containerDir = new \ReflectionObject($kernel->getContainer());
+        $containerDir = basename(dirname($containerDir->getFileName()));
+
+        // the warmup cache dir name must have the same length as the real one
+        // to avoid the many problems in serialized resources files
+        $warmupDir = substr($realCacheDir, 0, -1).('_' === substr($realCacheDir, -1) ? '-' : '_');
+
+        if ($output->isVerbose() && $fs->exists($warmupDir)) {
+            $io->comment('Clearing outdated warmup directory...');
+        }
+        $fs->remove($warmupDir);
+        $fs->mkdir($warmupDir);
+
+        if (!$input->getOption('no-warmup')) {
+            if ($output->isVerbose()) {
+                $io->comment('Warming up cache...');
+            }
+            $this->warmup($warmupDir, $realCacheDir, !$input->getOption('no-optional-warmers'));
+        }
+
+        $containerDir = $fs->exists($warmupDir.'/'.$containerDir) ? false : $containerDir;
+
+        $fs->rename($realCacheDir, $oldCacheDir);
+        $fs->rename($warmupDir, $realCacheDir);
+
+        if ($containerDir) {
+            $fs->rename($oldCacheDir.'/'.$containerDir, $realCacheDir.'/'.$containerDir);
+            touch($realCacheDir.'/'.$containerDir.'.legacy');
         }
 
         if ($output->isVerbose()) {
             $io->comment('Removing old cache directory...');
         }
 
         try {
-            $this->filesystem->remove($oldCacheDir);
+            $fs->remove($oldCacheDir);
         } catch (IOException $e) {
             $io->warning($e->getMessage());
         }
@@ -118,34 +140,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $io->success(sprintf('Cache for the "%s" environment (debug=%s) was successfully cleared.', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
     }
 
-    private function warmupCache(InputInterface $input, OutputInterface $output, string $realCacheDir, string $oldCacheDir)
-    {
-        $io = new SymfonyStyle($input, $output);
-
-        // the warmup cache dir name must have the same length than the real one
-        // to avoid the many problems in serialized resources files
-        $realCacheDir = realpath($realCacheDir);
-        $warmupDir = substr($realCacheDir, 0, -1).('_' === substr($realCacheDir, -1) ? '-' : '_');
-
-        if ($this->filesystem->exists($warmupDir)) {
-            if ($output->isVerbose()) {
-                $io->comment('Clearing outdated warmup directory...');
-            }
-            $this->filesystem->remove($warmupDir);
-        }
-
-        if ($output->isVerbose()) {
-            $io->comment('Warming up cache...');
-        }
-        $this->warmup($warmupDir, $realCacheDir, !$input->getOption('no-optional-warmers'));
-
-        $this->filesystem->rename($realCacheDir, $oldCacheDir);
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            sleep(1);  // workaround for Windows PHP rename bug
-        }
-        $this->filesystem->rename($warmupDir, $realCacheDir);
-    }
-
     private function warmup(string $warmupDir, string $realCacheDir, bool $enableOptionalWarmers = true)
     {
         // create a temporary kernel