Commit 1b8e033
committed
Merge branch '7.4' into 8.0
* 7.4: (21 commits)
[WebProfilerBundle] Fix hot reload support (FrankenPHP)
[Serializer] Normalize static methods when they have groups
[PropertyInfo] fix compatibility with phpdocumentor/reflection-docblock 6.x
[DoctrineBridge] Respect schema_filter in schema listeners
[HttpClient] Fix destructor throwing while timeout was handled
[HttpClient] Test throwing destructor together with retryable
[Mime] Update mime types
[HttpFoundation] Reject invalid paths
[HttpKernel] Fix handling empty MapUploadedFile arrays
[FrameworkBundle] Add missing `useAttributeAsKey` calls
[Di] Fix invalid reference behavior
When calling UploadedFile::getErrorMessage() to a file which has no error and is uploaded successfully, it should not return an error
[HttpKernel] Bypass mapping construction when `RedirectController::urlRedirectAction` is triggered
cs fix
[Console] fall back to 0 when getCode() does not provide an integer
fix merge
[FrameworkBundle] Fix accessing the test container when using KernelTestCase in non-debug mode
Fix running HttpClient tests
[FrameworkBundle] Fix clearing the HttpCache store in tests
[DependencyInjection][HttpKernel] Fix parsing Target attributes on properties and on controllers
...4 files changed
Lines changed: 53 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
204 | 204 | | |
205 | 205 | | |
206 | 206 | | |
207 | | - | |
| 207 | + | |
208 | 208 | | |
209 | | - | |
| 209 | + | |
210 | 210 | | |
211 | | - | |
| 211 | + | |
212 | 212 | | |
213 | | - | |
| 213 | + | |
214 | 214 | | |
215 | | - | |
| 215 | + | |
216 | 216 | | |
217 | | - | |
| 217 | + | |
218 | 218 | | |
219 | | - | |
| 219 | + | |
220 | 220 | | |
221 | 221 | | |
222 | | - | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
223 | 231 | | |
224 | 232 | | |
225 | 233 | | |
| |||
268 | 276 | | |
269 | 277 | | |
270 | 278 | | |
271 | | - | |
| 279 | + | |
272 | 280 | | |
273 | 281 | | |
274 | 282 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
389 | 389 | | |
390 | 390 | | |
391 | 391 | | |
392 | | - | |
| 392 | + | |
393 | 393 | | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
394 | 402 | | |
395 | 403 | | |
396 | 404 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
120 | 120 | | |
121 | 121 | | |
122 | 122 | | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
123 | 149 | | |
124 | 150 | | |
125 | 151 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2713 | 2713 | | |
2714 | 2714 | | |
2715 | 2715 | | |
| 2716 | + | |
2716 | 2717 | | |
2717 | 2718 | | |
2718 | 2719 | | |
| |||
2739 | 2740 | | |
2740 | 2741 | | |
2741 | 2742 | | |
2742 | | - | |
2743 | 2743 | | |
2744 | 2744 | | |
2745 | 2745 | | |
| |||
0 commit comments