bug #23825 Revert "feature #21038 [FrameworkBundle] deprecated cache:clear with warmup (fabpot)" (nicolas-grekas)
This PR was merged into the 3.3 branch. Discussion ---------- Revert "feature #21038 [FrameworkBundle] deprecated cache:clear with warmup (fabpot)" This reverts commit3495b35e4f
, reversing changes made to7f7b897ee2
. | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #21038 | License | MIT | Doc PR | - Sibling to #23792: there is no need to trigger the deprecation in 3.3 if we un-deprecate in 3.4. Commits -------90099706c6
Revert "feature #21038 [FrameworkBundle] deprecated cache:clear with warmup (fabpot)"
This commit is contained in:
commit
4fdaa3a981
@ -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.
|
||||
|
||||
|
@ -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`.
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
{
|
||||
|
@ -43,9 +43,6 @@ class CacheClearCommandTest extends TestCase
|
||||
$this->fs->remove($this->rootDir);
|
||||
}
|
||||
|
||||
/**
|
||||
* @group legacy
|
||||
*/
|
||||
public function testCacheIsFreshAfterCacheClearedWithWarmup()
|
||||
{
|
||||
$input = new ArrayInput(array('cache:clear'));
|
||||
|
Reference in New Issue
Block a user