Commit d2bb2ba
committed
Merge branch '4.0' into 4.1
* 4.0: (21 commits)
[PropertyInfo] fix resolving parent|self type hints
fixed CS
fix merge
[Security] Fix logout
Cleanup 2 tests for the HttpException classes
#27250 limiting GET_LOCK key up to 64 char due to changes in MySQL 5.7.5 and later
[Config] Fix tests when path contains UTF chars
[DI] Shared services should not be inlined in non-shared ones
[Profiler] Remove propel & event_listener_loading category identifiers
[Filesystem] Fix usages of error_get_last()
[Cache][Lock] Fix usages of error_get_last()
[Debug] Fix populating error_get_last() for handled silent errors
fixed CS
fixed CS
fixed CS
[FrameworkBundle] Fix cache:clear on vagrant
[HttpKernel] Handle NoConfigurationException "onKernelException()"
Fix misses calculation when calling getItems
[DI] Display previous error messages when throwing unused bindings
Fixed return type
...1 file changed
+2
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
78 | 78 | | |
79 | 79 | | |
80 | 80 | | |
81 | | - | |
82 | | - | |
| 81 | + | |
83 | 82 | | |
84 | 83 | | |
85 | 84 | | |
| |||
91 | 90 | | |
92 | 91 | | |
93 | 92 | | |
94 | | - | |
95 | | - | |
| 93 | + | |
96 | 94 | | |
97 | 95 | | |
98 | 96 | | |
| |||
0 commit comments