Commit fe45278
committed
Merge branch '5.4' into 6.2
* 5.4:
Fix some Composer keywords
[FrameworkBundle] Rename limiter’s `strategy` to `policy` in XSD
[VarDumper] Fixed dumping of CutStub
Fix test
Change limit argument from string to integer.
[Messenger] Fix `evaluate()` calls in `WorkerTest`
[Mailer] STDOUT blocks infinitely under Windows when STDERR is filled1 file changed
+8
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
153 | 153 | | |
154 | 154 | | |
155 | 155 | | |
156 | | - | |
157 | | - | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
158 | 159 | | |
159 | 160 | | |
160 | 161 | | |
161 | 162 | | |
162 | 163 | | |
163 | | - | |
| 164 | + | |
164 | 165 | | |
165 | 166 | | |
166 | 167 | | |
| |||
194 | 195 | | |
195 | 196 | | |
196 | 197 | | |
197 | | - | |
198 | | - | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
199 | 201 | | |
200 | 202 | | |
201 | 203 | | |
202 | 204 | | |
203 | 205 | | |
204 | | - | |
| 206 | + | |
205 | 207 | | |
206 | 208 | | |
207 | 209 | | |
| |||
0 commit comments