Commit 71da2b7
committed
Merge branch '5.4' into 6.0
* 5.4:
[Profiler] relax return type for memory data collector
Fix param annotation in HttpKernelBrowser
[Cache] fix compat with apcu < 5.1.10
Expand FormView key to include int
[PropertyInfo] PhpStan extractor nested object fix
[Console] Fix autocompletion of argument with default value
Run `open_basedir` tests in separate processes1 file changed
+6
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
99 | 102 | | |
100 | 103 | | |
101 | 104 | | |
| |||
114 | 117 | | |
115 | 118 | | |
116 | 119 | | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
117 | 123 | | |
118 | 124 | | |
119 | 125 | | |
| |||
0 commit comments