Commit db3eeaa
committed
Merge branch '6.0' into 6.1
* 6.0: (22 commits)
[Messenger] Use :memory: for SQLite tests
[Mailer] Stream timeout not detected due to checking only string result of function fgets
don not set http_version instead of setting it to null
[DependencyInjection] don't move locator tag for service subscriber
Fix search scope when performing fallback mapping driver detection
Fix the notification email theme for asynchronously dispatched emails
Update the CI setup to use the new output file
Update actions in the CI to move away from the deprecated runtime
Use 6.3 for new features
[HttpFoundation] Check IPv6 is valid before comparing it
Run tests with UTC to avoid daylight saving time messing with assertions
Bump Symfony version to 6.0.16
Update VERSION for 6.0.15
Update CHANGELOG for 6.0.15
Bump Symfony version to 5.4.16
Update VERSION for 5.4.15
Update CHANGELOG for 5.4.15
Bump Symfony version to 4.4.49
Update VERSION for 4.4.48
Update CONTRIBUTORS for 4.4.48
...File tree
2 files changed
+41
-2
lines changed- DependencyInjection
- Tests/Fixtures/Bundles/AttributesBundle/AnnotatedEntity
2 files changed
+41
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
266 | 266 | | |
267 | 267 | | |
268 | 268 | | |
269 | | - | |
270 | | - | |
| 269 | + | |
| 270 | + | |
271 | 271 | | |
272 | 272 | | |
273 | 273 | | |
| |||
Lines changed: 39 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
0 commit comments