Commit 61444c8
committed
Merge branch '5.4' into 6.2
* 5.4:
[PhpUnitBridge] Kill the last concurrent process when it stales for more than 60s
[Intl] fix test
[Intl] Use VarExporter::export() in PhpBundleWriter
Use triggering class to generate baseline for deprecation messages from DebugClassLoader
[Security] Fix false-string handling in RememberMeAuthenticator
[CssSelector] Tests on Xpath translator will always pass
[Serializer] Fix Normalizer not utilizing converted name for index variadic param
[DepdencyInjection] Fix costly logic when checking errored definitions
fix children cond
[DoctrineBridge] Load refreshed user proxy
[DependencyInjection] Don't ignore attributes on the actual decorator
[FrameworkBundle] Prevent `cache:clear` to lose files on subsequent runs2 files changed
+11
-7
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
114 | 114 | | |
115 | 115 | | |
116 | 116 | | |
117 | | - | |
| 117 | + | |
118 | 118 | | |
119 | 119 | | |
120 | 120 | | |
| |||
302 | 302 | | |
303 | 303 | | |
304 | 304 | | |
305 | | - | |
| 305 | + | |
306 | 306 | | |
307 | 307 | | |
308 | | - | |
| 308 | + | |
309 | 309 | | |
310 | 310 | | |
311 | 311 | | |
312 | | - | |
| 312 | + | |
313 | 313 | | |
314 | 314 | | |
315 | 315 | | |
| |||
318 | 318 | | |
319 | 319 | | |
320 | 320 | | |
321 | | - | |
322 | | - | |
| 321 | + | |
| 322 | + | |
323 | 323 | | |
324 | 324 | | |
325 | 325 | | |
| |||
0 commit comments