Commit 3f12bc7
committed
columnAt, groupBy: skip scalar rows in mixed data like indexBy does
Mixed data (some rows, some scalars) passes assertNestedArray(), which only requires one nested value. columnAt() then threw a TypeError from count() on the scalar, and groupBy() grouped scalars under the '' key. indexBy() already skips scalar rows; now all three agree. Tests pin the skip in both modes.
Also in Deprecations.php docblocks: fold sprintf()'s asRaw() note into its example comment, and move offsetSet()'s note above the @deprecated tag.1 parent 7b8054b commit 3f12bc7
3 files changed
Lines changed: 31 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
165 | 165 | | |
166 | 166 | | |
167 | 167 | | |
168 | | - | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
169 | 171 | | |
170 | 172 | | |
171 | 173 | | |
172 | | - | |
173 | | - | |
174 | | - | |
175 | 174 | | |
176 | 175 | | |
177 | 176 | | |
| |||
404 | 403 | | |
405 | 404 | | |
406 | 405 | | |
407 | | - | |
408 | | - | |
409 | 406 | | |
410 | 407 | | |
411 | 408 | | |
| 409 | + | |
412 | 410 | | |
413 | 411 | | |
414 | 412 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
724 | 724 | | |
725 | 725 | | |
726 | 726 | | |
| 727 | + | |
| 728 | + | |
| 729 | + | |
727 | 730 | | |
728 | 731 | | |
729 | 732 | | |
| |||
755 | 758 | | |
756 | 759 | | |
757 | 760 | | |
| 761 | + | |
| 762 | + | |
| 763 | + | |
758 | 764 | | |
759 | 765 | | |
760 | 766 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
118 | 118 | | |
119 | 119 | | |
120 | 120 | | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
121 | 130 | | |
122 | 131 | | |
123 | 132 | | |
| |||
280 | 289 | | |
281 | 290 | | |
282 | 291 | | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
283 | 304 | | |
284 | 305 | | |
285 | 306 | | |
| |||
0 commit comments