diff --git a/UPGRADE-3.3.md b/UPGRADE-3.3.md index 17376f5fd5..40d864222a 100644 --- a/UPGRADE-3.3.md +++ b/UPGRADE-3.3.md @@ -167,9 +167,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 65a59d8ba5..218958d1f9 100644 --- a/UPGRADE-4.0.md +++ b/UPGRADE-4.0.md @@ -284,9 +284,6 @@ FrameworkBundle * The `validator.mapping.cache.doctrine.apc` service has been removed. - * 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 08a93bdd33..5bf7ee6209 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md +++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md @@ -37,7 +37,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 77ae66867c..3bec217e30 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php @@ -111,12 +111,6 @@ EOF if ($input->getOption('no-warmup')) { $this->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); } @@ -168,8 +162,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) { @@ -242,8 +234,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 f3392995ae..2fe2eb5c9a 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'));