Commit 79bcf59
committed
Merge branch '5.2' into 5.x
* 5.2:
[HttpKernel] do is_file check before include
[PhpUnitBridge] fix reporting deprecations from DebugClassLoader
[FrameworkBundle] skip deprecation in integration tests
enable HTTP method overrides as early as possible with the HTTP cacheFile tree
2 files changed
+10
-1
lines changed- HttpCache
- Tests/Functional/app/CachePools
2 files changed
+10
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
| |||
62 | 63 | | |
63 | 64 | | |
64 | 65 | | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
65 | 75 | | |
66 | 76 | | |
67 | 77 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
18 | 17 | | |
0 commit comments