From 90099706c635d8672be67c0df4fc321a5e28c4f3 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 8 Aug 2017 08:40:28 +0200
Subject: [PATCH] Revert "feature #21038 [FrameworkBundle] deprecated
 cache:clear with warmup (fabpot)"

This reverts commit 3495b35e4fcdb2bf90b8aea443c1216c161dd469, reversing
changes made to 7f7b897ee275d4cbbd4284dbdd05f1d207699fac.
---
 UPGRADE-3.3.md                                         |  3 ---
 UPGRADE-4.0.md                                         |  3 ---
 src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md        |  1 -
 .../FrameworkBundle/Command/CacheClearCommand.php      | 10 ----------
 .../CacheClearCommand/CacheClearCommandTest.php        |  3 ---
 5 files changed, 20 deletions(-)

diff --git a/UPGRADE-3.3.md b/UPGRADE-3.3.md
index e43c365e6c..3cff95d850 100644
--- a/UPGRADE-3.3.md
+++ b/UPGRADE-3.3.md
@@ -165,9 +165,6 @@ Form
 FrameworkBundle
 ---------------
 
- * The `cache:clear` command should always be called with the `--no-warmup` option.
-   Warmup should be done via the `cache:warmup` command.
-
  * [BC BREAK] The "framework.trusted_proxies" configuration option and the corresponding "kernel.trusted_proxies"
    parameter have been removed. Use the Request::setTrustedProxies() method in your front controller instead.
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 505ed8968a..67b2aa788d 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -223,9 +223,6 @@ Form
 FrameworkBundle
 ---------------
 
- * The `cache:clear` command does not warmup the cache anymore. Warmup should
-   be done via the `cache:warmup` command.
-
  * The "framework.trusted_proxies" configuration option and the corresponding "kernel.trusted_proxies" parameter have been removed. Use the `Request::setTrustedProxies()` method in your front controller instead.
 
  * The default value of the `framework.workflows.[name].type` configuration options is now `state_machine`.
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index ba704e00f2..d89c4dc254 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -14,7 +14,6 @@ CHANGELOG
    the same helpers as the `Controller` class, but does not allow accessing the dependency
    injection container, in order to encourage explicit dependency declarations.
  * Added support for the `controller.service_arguments` tag, for injecting services into controllers' actions
- * Deprecated `cache:clear` with warmup (always call it with `--no-warmup`)
  * Changed default configuration for
    assets/forms/validation/translation/serialization/csrf from `canBeEnabled()` to
    `canBeDisabled()` when Flex is used
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
index 2331afecb4..b7613f7436 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
@@ -77,12 +77,6 @@ EOF
         if ($input->getOption('no-warmup')) {
             $filesystem->rename($realCacheDir, $oldCacheDir);
         } else {
-            $warning = 'Calling cache:clear without the --no-warmup option is deprecated since version 3.3. Cache warmup should be done with the cache:warmup command instead.';
-
-            @trigger_error($warning, E_USER_DEPRECATED);
-
-            $io->warning($warning);
-
             $this->warmupCache($input, $output, $realCacheDir, $oldCacheDir);
         }
 
@@ -132,8 +126,6 @@ EOF
      * @param string $warmupDir
      * @param string $realCacheDir
      * @param bool   $enableOptionalWarmers
-     *
-     * @internal to be removed in 4.0
      */
     protected function warmup($warmupDir, $realCacheDir, $enableOptionalWarmers = true)
     {
@@ -200,8 +192,6 @@ EOF
      * @param string          $warmupDir
      *
      * @return KernelInterface
-     *
-     * @internal to be removed in 4.0
      */
     protected function getTempKernel(KernelInterface $parent, $namespace, $parentClass, $warmupDir)
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
index b9fe63ec5b..fd3b611202 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
@@ -43,9 +43,6 @@ class CacheClearCommandTest extends TestCase
         $this->fs->remove($this->rootDir);
     }
 
-    /**
-     * @group legacy
-     */
     public function testCacheIsFreshAfterCacheClearedWithWarmup()
     {
         $input = new ArrayInput(array('cache:clear'));