Commit 5c5c37e
committed
Merge branch '4.4' into 5.4
* 4.4:
[HttpClient] Fix the CS fix
Workaround disabled "var_dump"
[Serializer] Respect default context in DateTimeNormalizer::denormalize
# Conflicts:
# src/Symfony/Component/Debug/ErrorHandler.php
# src/Symfony/Component/HttpClient/HttpClientTrait.php
# src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php1 file changed
+6
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
117 | 117 | | |
118 | 118 | | |
119 | 119 | | |
120 | | - | |
| 120 | + | |
121 | 121 | | |
122 | 122 | | |
123 | 123 | | |
| |||
206 | 206 | | |
207 | 207 | | |
208 | 208 | | |
209 | | - | |
210 | | - | |
211 | | - | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
212 | 214 | | |
213 | 215 | | |
214 | 216 | | |
| |||
0 commit comments