Commit 9fbc7d9
committed
Merge branch '7.4' into 8.0
* 7.4:
[FrameworkBundle] Dump all registered extensions’ configuration reference
fix merge
Mark FormFlow as finished if the last step is skipped
[HttpKernel] Fix using MapRequestPayload on nullable arguments
[ObjectMapper] bypass lazy ghost with class transform
[WebProfilerBundle] fix displaying runner
[DependencyInjection] Fix preloading LazyClosure
[Emoji] Update list to version 17
make doLoadClassMetadata() methods private
fix routing config type information
[HttpClient] Don't reset unused clients in data collectorFile tree
2 files changed
+27
-5
lines changed- Controller/ArgumentResolver
- Tests/Controller/ArgumentResolver
2 files changed
+27
-5
lines changedLines changed: 5 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
193 | 193 | | |
194 | 194 | | |
195 | 195 | | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
196 | 200 | | |
197 | 201 | | |
198 | 202 | | |
| |||
207 | 211 | | |
208 | 212 | | |
209 | 213 | | |
210 | | - | |
| 214 | + | |
211 | 215 | | |
212 | 216 | | |
213 | 217 | | |
214 | | - | |
215 | | - | |
216 | | - | |
217 | | - | |
218 | 218 | | |
219 | 219 | | |
220 | 220 | | |
| |||
Lines changed: 22 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
182 | 182 | | |
183 | 183 | | |
184 | 184 | | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
185 | 207 | | |
186 | 208 | | |
187 | 209 | | |
| |||
0 commit comments