Commit d8a80c9
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 runsFile tree
2 files changed
+23
-2
lines changed- Normalizer
- Tests/Normalizer
2 files changed
+23
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
339 | 339 | | |
340 | 340 | | |
341 | 341 | | |
342 | | - | |
| 342 | + | |
343 | 343 | | |
344 | 344 | | |
345 | 345 | | |
346 | 346 | | |
347 | | - | |
| 347 | + | |
348 | 348 | | |
349 | 349 | | |
350 | 350 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| 23 | + | |
23 | 24 | | |
24 | 25 | | |
25 | 26 | | |
| |||
168 | 169 | | |
169 | 170 | | |
170 | 171 | | |
| 172 | + | |
171 | 173 | | |
172 | 174 | | |
173 | 175 | | |
| |||
241 | 243 | | |
242 | 244 | | |
243 | 245 | | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
244 | 265 | | |
245 | 266 | | |
246 | 267 | | |
| |||
0 commit comments