Commitf751ac9

committed

Merge branch '3.3' into 3.4

* 3.3: Revert "feature#21038 [FrameworkBundle] deprecated cache:clear with warmup (fabpot)"

2 parents9306fec +4fdaa3a commitf751ac9Copy full SHA for f751ac9

File tree

-20

lines changed

-20

lines changed

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -167,9 +167,6 @@ Form`
`167`	`167`	`FrameworkBundle`
`168`	`168`	`---------------`
`169`	`169`
`170`		-* The`cache:clear` command should always be called with the`--no-warmup` option.
`171`		- Warmup should be done via the`cache:warmup` command.
`172`		`-`
`173`	`170`	`*[BC BREAK] The "framework.trusted_proxies" configuration option and the corresponding "kernel.trusted_proxies"`
`174`	`171`	`parameter have been removed. Use the Request::setTrustedProxies() method in your front controller instead.`
`175`	`172`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -284,9 +284,6 @@ FrameworkBundle`
`284`	`284`
`285`	`285`	* The `validator.mapping.cache.doctrine.apc` service has been removed.
`286`	`286`
`287`		-* The `cache:clear` command does not warmup the cache anymore. Warmup should
`288`		-be done via the `cache:warmup` command.
`289`		`-`
`290`	`287`	* 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.
`291`	`288`
`292`	`289`	* The default value of the `framework.workflows.[name].type` configuration options is now `state_machine`.

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ CHANGELOG`
`37`	`37`	the same helpers as the`Controller` class, but does not allow accessing the dependency
`38`	`38`	`injection container, in order to encourage explicit dependency declarations.`
`39`	`39`	* Added support for the`controller.service_arguments` tag, for injecting services into controllers' actions
`40`		-* Deprecated`cache:clear` with warmup (always call it with`--no-warmup`)
`41`	`40`	`* Changed default configuration for`
`42`	`41`	assets/forms/validation/translation/serialization/csrf from`canBeEnabled()` to
`43`	`42`	`canBeDisabled()` when Flex is used

Lines changed: 0 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -111,12 +111,6 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`111`	`111`	`if ($input->getOption('no-warmup')) {`
`112`	`112`	`$this->filesystem->rename($realCacheDir,$oldCacheDir);`
`113`	`113`	`}else {`
`114`		`-$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.';`
`115`		`-`
`116`		`- @trigger_error($warning,E_USER_DEPRECATED);`
`117`		`-`
`118`		`-$io->warning($warning);`
`119`		`-`
`120`	`114`	`$this->warmupCache($input,$output,$realCacheDir,$oldCacheDir);`
`121`	`115`	`}`
`122`	`116`
`@@ -168,8 +162,6 @@ private function warmupCache(InputInterface $input, OutputInterface $output, $re`
`168`	`162`	`* @param string $warmupDir`
`169`	`163`	`* @param string $realCacheDir`
`170`	`164`	`* @param bool $enableOptionalWarmers`
`171`		`- *`
`172`		`- * @internal to be removed in 4.0`
`173`	`165`	`*/`
`174`	`166`	`protectedfunctionwarmup($warmupDir,$realCacheDir,$enableOptionalWarmers =true)`
`175`	`167`	`{`
`@@ -242,8 +234,6 @@ protected function warmup($warmupDir, $realCacheDir, $enableOptionalWarmers = tr`
`242`	`234`	`* @param string $warmupDir`
`243`	`235`	`*`
`244`	`236`	`* @return KernelInterface`
`245`		`- *`
`246`		`- * @internal to be removed in 4.0`
`247`	`237`	`*/`
`248`	`238`	`protectedfunctiongetTempKernel(KernelInterface$parent,$namespace,$parentClass,$warmupDir)`
`249`	`239`	`{`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,6 @@ protected function tearDown()`
`43`	`43`	`$this->fs->remove($this->rootDir);`
`44`	`44`	`}`
`45`	`45`
`46`		`-/**`
`47`		`- * @group legacy`
`48`		`- */`
`49`	`46`	`publicfunctiontestCacheIsFreshAfterCacheClearedWithWarmup()`
`50`	`47`	`{`
`51`	`48`	`$input =newArrayInput(array('cache:clear'));`

Comments

(0)