10BC0 bug #23825 Revert "feature #21038 [FrameworkBundle] deprecated cache:… · symfony/symfony@4fdaa3a · GitHub
[go: up one dir, main page]
Skip to content

Commit 4fdaa3a

Browse files
fabpotfabpot
committed
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 commit 3495b35, reversing changes made to 7f7b897. | 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 ------- 9009970 Revert "feature #21038 [FrameworkBundle] deprecated cache:clear with warmup (fabpot)"
2 parents 3f81dd1 + 9009970 commit 4fdaa3a

File tree

5 files changed

+0
-20
lines changed

5 files changed

+0
-20
lines changed

‎UPGRADE-3.3.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,6 @@ Form
165165
FrameworkBundle
166166
---------------
167167

168-
* The `cache:clear` command should always be called with the `--no-warmup` option.
169-
Warmup should be done via the `cache:warmup` command.
170-
171168
* [BC BREAK] The "framework.trusted_proxies" configuration option and the corresponding "kernel.trusted_proxies"
172169
parameter have been removed. Use the Request::setTrustedProxies() method in your front controller instead.
173170

‎UPGRADE-4.0.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,6 @@ Form
223223
FrameworkBundle
224224
---------------
225225

226-
* The `cache:clear` command does not warmup the cache anymore. Warmup should
227-
be done via the `cache:warmup` command.
228-
229226
* 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.
230227

231228
* The default value of the `framework.workflows.[name].type` configuration options is now `state_machine`.

‎src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ CHANGELOG
1414
the same helpers as the `Controller` class, but does not allow accessing the dependency
1515
injection container, in order to encourage explicit dependency declarations.
1616
* Added support for the `controller.service_arguments` tag, for injecting services into controllers' actions
17-
* Deprecated `cache:clear` with warmup (always call it with `--no-warmup`)
1817
* Changed default configuration for
1918
assets/forms/validation/translation/serialization/csrf from `canBeEnabled()` to
2019
`canBeDisabled()` when Flex is used

‎src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
7777
if ($input->getOption('no-warmup')) {
7878
$filesystem->rename($realCacheDir, $oldCacheDir);
7979
} else {
80-
$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.';
81-
82-
@trigger_error($warning, E_USER_DEPRECATED);
83-
84-
$io->warning($warning);
85-
8680
$this->warmupCache($input, $output, $realCacheDir, $oldCacheDir);
8781
}
8882

@@ -132,8 +126,6 @@ private function warmupCache(InputInterface $input, OutputInterface $output, $re
132126
* @param string $warmupDir
133127
* @param string $realCacheDir
134128
* @param bool $enableOptionalWarmers
135-
*
136-
* @internal to be removed in 4.0
137129
*/
138130
protected function warmup($warmupDir, $realCacheDir, $enableOptionalWarmers = true)
139131
{
@@ -200,8 +192,6 @@ protected function warmup($warmupDir, $realCacheDir, $enableOptionalWarmers = tr
200192
* @param string $warmupDir
201193
*
202194
* @return KernelInterface
203-
*
204-
* @internal to be removed in 4.0
205195
*/
206196
protected function getTempKernel(KernelInterface $parent, $namespace, $parentClass, $warmupDir)
207197
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ protected function tearDown()
4343
$this->fs->remove($this->rootDir);
4444
}
4545

46-
/**
47-
* @group legacy
48-
*/
4946
public function testCacheIsFreshAfterCacheClearedWithWarmup()
5047
{
5148
$input = new ArrayInput(array('cache:clear'));

0 commit comments

Comments
 (0)
0