Commit fc720fc
committed
Merge branch '4.0'
* 4.0:
[Form] Fixed ContextErrorException in FileType
[DI] Fix handling of inlined definitions by ContainerBuilder
[Security] remove unused variable
[DI] Fix infinite loop when analyzing references
[Lock][Process][FrameworkBundle] fix tests
Display a nice error message if the form/serializer component is missing.
[SecurityBundle] providerIds is undefined error when firewall provider is not specified
[SecurityBundle] providerIds is undefined error when firewall provider is not specified
[SecurityBundle] providerIds is undefined error when firewall provider is not specified
Force phpunit-bridge update (bis)
[Bridge/PhpUnit] Fix disabling global state preservation
Incorrect dot on method loadChoices in upgrade doc1 file changed
+10
-5
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
137 | 137 | | |
138 | 138 | | |
139 | 139 | | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
144 | 140 | | |
145 | 141 | | |
146 | 142 | | |
| |||
184 | 180 | | |
185 | 181 | | |
186 | 182 | | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
187 | 187 | | |
188 | 188 | | |
189 | 189 | | |
| |||
231 | 231 | | |
232 | 232 | | |
233 | 233 | | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
234 | 238 | | |
235 | 239 | | |
236 | 240 | | |
| |||
923 | 927 | | |
924 | 928 | | |
925 | 929 | | |
| 930 | + | |
926 | 931 | | |
927 | 932 | | |
928 | 933 | | |
| |||
1032 | 1037 | | |
1033 | 1038 | | |
1034 | 1039 | | |
1035 | | - | |
| 1040 | + | |
1036 | 1041 | | |
1037 | 1042 | | |
1038 | 1043 | | |
| |||
0 commit comments