Commit 40ccb82
committed
Merge branch '6.4' into 7.0
* 6.4:
fix tests
fix merge
fix typo
Change ProxyCacheWarmer::warmUp signature
CS fix
[Serializer] Keep stack trace for enum value denormalizer error
add the MailPace transport to the UnsupportedSchemeException
add the Phrase translation provider to the UnsupportedSchemeException
[Serializer] Fix partial denormalization with missing constructor arguments
[Serializer] Moves dummy to fixtures folder
[HttpKernel] Don't validate partially denormalized object
fix(mailjet-smtp): disable tls for mailjet as it should use starttls insteadFile tree
20 files changed
+163
-30
lines changed- src/Symfony
- Bridge
- Doctrine
- PhpUnit/Tests/DeprecationErrorHandler
- Bundle/SecurityBundle/Tests/DependencyInjection
- Component
- Cache/Tests/Adapter
- HttpKernel
- Controller/ArgumentResolver
- Tests/Controller/ArgumentResolver
- Lock/Tests/Store
- Mailer
- Bridge/Mailjet/Transport
- Exception
- Tests/Exception
- Serializer
- Normalizer
- Tests
- Fixtures
- Normalizer
- Translation
- Exception
- Tests/Exception
20 files changed
+163
-30
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| 20 | + | |
20 | 21 | | |
21 | 22 | | |
22 | 23 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
265 | 265 | | |
266 | 266 | | |
267 | 267 | | |
268 | | - | |
| 268 | + | |
269 | 269 | | |
270 | 270 | | |
271 | 271 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
243 | 243 | | |
244 | 244 | | |
245 | 245 | | |
246 | | - | |
| 246 | + | |
247 | 247 | | |
248 | 248 | | |
249 | 249 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
| 34 | + | |
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | | - | |
| 35 | + | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
119 | 119 | | |
120 | 120 | | |
121 | 121 | | |
122 | | - | |
| 122 | + | |
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
| |||
Lines changed: 55 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
227 | 227 | | |
228 | 228 | | |
229 | 229 | | |
230 | | - | |
231 | 230 | | |
232 | 231 | | |
233 | 232 | | |
234 | | - | |
235 | | - | |
236 | | - | |
237 | | - | |
| 233 | + | |
| 234 | + | |
238 | 235 | | |
239 | 236 | | |
240 | 237 | | |
| |||
255 | 252 | | |
256 | 253 | | |
257 | 254 | | |
258 | | - | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
259 | 285 | | |
260 | 286 | | |
261 | 287 | | |
| |||
639 | 665 | | |
640 | 666 | | |
641 | 667 | | |
642 | | - | |
643 | 668 | | |
644 | 669 | | |
645 | 670 | | |
646 | | - | |
647 | | - | |
648 | | - | |
649 | | - | |
| 671 | + | |
| 672 | + | |
650 | 673 | | |
651 | 674 | | |
652 | 675 | | |
| |||
667 | 690 | | |
668 | 691 | | |
669 | 692 | | |
670 | | - | |
671 | 693 | | |
672 | 694 | | |
673 | 695 | | |
| |||
688 | 710 | | |
689 | 711 | | |
690 | 712 | | |
| 713 | + | |
| 714 | + | |
| 715 | + | |
| 716 | + | |
| 717 | + | |
| 718 | + | |
| 719 | + | |
| 720 | + | |
| 721 | + | |
| 722 | + | |
| 723 | + | |
| 724 | + | |
| 725 | + | |
| 726 | + | |
| 727 | + | |
| 728 | + | |
| 729 | + | |
| 730 | + | |
| 731 | + | |
| 732 | + | |
| 733 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
38 | | - | |
| 38 | + | |
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| |||
0 commit comments