Commit de3b253
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 signatureFile tree
3 files changed
+3
-4
lines changed- src/Symfony/Bridge/Doctrine
- CacheWarmer
3 files changed
+3
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
| 99 | + | |
99 | 100 | | |
100 | 101 | | |
101 | 102 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
| |||
Lines changed: 1 addition & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
| 40 | + | |
44 | 41 | | |
45 | 42 | | |
46 | 43 | | |
| |||
0 commit comments