Skip to content

Commit de3b253

Browse files
committed
bug symfony#53128 Change ProxyCacheWarmer::warmUp signature (llupa)
This PR was squashed before being merged into the 6.4 branch. Discussion ---------- Change ProxyCacheWarmer::warmUp signature | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | none exists | License | MIT I ended up with a composer.lock that has `"symfony/doctrine-bridge:v6.4.0"` and `"symfony/http-kernel:v7.0.1"`, this combination results in a fatal syntax error: ```php Compile Error: Declaration of Symfony\Bridge\Doctrine\CacheWarmer\ProxyCacheWarmer::warmUp(string $cacheDir): array must be compatible with Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface::warmUp(string $cacheDir, ?string $buildDir = null): array ``` I opened this PR as a starting point to "fix" this, I already wondered if the conflict should also be put over `doctrine-bridge`. Happy to do changes as needed. Commits ------- 0de35b0 Change ProxyCacheWarmer::warmUp signature
2 parents 9dceeea + 0de35b0 commit de3b253

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

UPGRADE-6.4.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ DependencyInjection
9696
DoctrineBridge
9797
--------------
9898

99+
* [BC Break] Add argument `$buildDir` to `ProxyCacheWarmer::warmUp()`
99100
* [BC Break] Add return type-hints to `EntityFactory`
100101
* Deprecate `DbalLogger`, use a middleware instead
101102
* Deprecate not constructing `DoctrineDataCollector` with an instance of `DebugDataHolder`

src/Symfony/Bridge/Doctrine/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ CHANGELOG
44
6.4
55
---
66

7+
* [BC BREAK] Add argument `$buildDir` to `ProxyCacheWarmer::warmUp()`
78
* [BC BREAK] Add return type-hints to `EntityFactory`
89
* Deprecate `DbalLogger`, use a middleware instead
910
* Deprecate not constructing `DoctrineDataCollector` with an instance of `DebugDataHolder`

src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ public function isOptional(): bool
3737
return false;
3838
}
3939

40-
/**
41-
* @param string|null $buildDir
42-
*/
43-
public function warmUp(string $cacheDir /* , string $buildDir = null */): array
40+
public function warmUp(string $cacheDir, string $buildDir = null): array
4441
{
4542
$files = [];
4643
foreach ($this->registry->getManagers() as $em) {

0 commit comments

Comments
 (0)