Commit f783a7c
committed
Merge branch '6.2' into 6.3
* 6.2:
[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 merge
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 | |
|---|---|---|---|
| |||
350 | 350 | | |
351 | 351 | | |
352 | 352 | | |
353 | | - | |
| 353 | + | |
354 | 354 | | |
355 | 355 | | |
356 | 356 | | |
357 | 357 | | |
358 | | - | |
| 358 | + | |
359 | 359 | | |
360 | 360 | | |
361 | 361 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| 24 | + | |
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
| |||
178 | 179 | | |
179 | 180 | | |
180 | 181 | | |
| 182 | + | |
181 | 183 | | |
182 | 184 | | |
183 | 185 | | |
| |||
251 | 253 | | |
252 | 254 | | |
253 | 255 | | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
254 | 275 | | |
255 | 276 | | |
256 | 277 | | |
| |||
0 commit comments