Merge branch '3.3' into 3.4
* 3.3: Revert "feature #21038 [FrameworkBundle] deprecated cache:clear with warmup (fabpot)"
This commit is contained in:
commit
f751ac9ac1
@ -167,9 +167,6 @@ Form
|
|||||||
FrameworkBundle
|
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"
|
* [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.
|
parameter have been removed. Use the Request::setTrustedProxies() method in your front controller instead.
|
||||||
|
|
||||||
|
@ -284,9 +284,6 @@ FrameworkBundle
|
|||||||
|
|
||||||
* The `validator.mapping.cache.doctrine.apc` service has been removed.
|
* 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 "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`.
|
* The default value of the `framework.workflows.[name].type` configuration options is now `state_machine`.
|
||||||
|
@ -37,7 +37,6 @@ CHANGELOG
|
|||||||
the same helpers as the `Controller` class, but does not allow accessing the dependency
|
the same helpers as the `Controller` class, but does not allow accessing the dependency
|
||||||
injection container, in order to encourage explicit dependency declarations.
|
injection container, in order to encourage explicit dependency declarations.
|
||||||
* Added support for the `controller.service_arguments` tag, for injecting services into controllers' actions
|
* 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
|
* Changed default configuration for
|
||||||
assets/forms/validation/translation/serialization/csrf from `canBeEnabled()` to
|
assets/forms/validation/translation/serialization/csrf from `canBeEnabled()` to
|
||||||
`canBeDisabled()` when Flex is used
|
`canBeDisabled()` when Flex is used
|
||||||
|
@ -111,12 +111,6 @@ EOF
|
|||||||
if ($input->getOption('no-warmup')) {
|
if ($input->getOption('no-warmup')) {
|
||||||
$this->filesystem->rename($realCacheDir, $oldCacheDir);
|
$this->filesystem->rename($realCacheDir, $oldCacheDir);
|
||||||
} else {
|
} 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);
|
$this->warmupCache($input, $output, $realCacheDir, $oldCacheDir);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -168,8 +162,6 @@ EOF
|
|||||||
* @param string $warmupDir
|
* @param string $warmupDir
|
||||||
* @param string $realCacheDir
|
* @param string $realCacheDir
|
||||||
* @param bool $enableOptionalWarmers
|
* @param bool $enableOptionalWarmers
|
||||||
*
|
|
||||||
* @internal to be removed in 4.0
|
|
||||||
*/
|
*/
|
||||||
protected function warmup($warmupDir, $realCacheDir, $enableOptionalWarmers = true)
|
protected function warmup($warmupDir, $realCacheDir, $enableOptionalWarmers = true)
|
||||||
{
|
{
|
||||||
@ -242,8 +234,6 @@ EOF
|
|||||||
* @param string $warmupDir
|
* @param string $warmupDir
|
||||||
*
|
*
|
||||||
* @return KernelInterface
|
* @return KernelInterface
|
||||||
*
|
|
||||||
* @internal to be removed in 4.0
|
|
||||||
*/
|
*/
|
||||||
protected function getTempKernel(KernelInterface $parent, $namespace, $parentClass, $warmupDir)
|
protected function getTempKernel(KernelInterface $parent, $namespace, $parentClass, $warmupDir)
|
||||||
{
|
{
|
||||||
|
@ -43,9 +43,6 @@ class CacheClearCommandTest extends TestCase
|
|||||||
$this->fs->remove($this->rootDir);
|
$this->fs->remove($this->rootDir);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @group legacy
|
|
||||||
*/
|
|
||||||
public function testCacheIsFreshAfterCacheClearedWithWarmup()
|
public function testCacheIsFreshAfterCacheClearedWithWarmup()
|
||||||
{
|
{
|
||||||
$input = new ArrayInput(array('cache:clear'));
|
$input = new ArrayInput(array('cache:clear'));
|
||||||
|
Reference in New Issue
Block a user