Mirrors/wiosna-dev_common-library
1
0
Fork 1
mirror of https://github.com/wiosna-dev/common-library.git synced 2026-03-12 09:31:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

[BaseCollection] Fix incorrectly working limit() method

Browse Source
This commit is contained in:
Meritoo
2021-04-11 21:45:29 +02:00
parent 0d3265d7b6
commit 1eb86cf102
4 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -2,6 +2,10 @@
Common and useful classes, methods, exceptions etc. Common and useful classes, methods, exceptions etc.
# 1.1.4
1. [BaseCollection] Fix incorrectly working limit() method
# 1.1.3 # 1.1.3
1. Move `Renderable` class: `Meritoo\Common` -> `Meritoo\Common\Contract` 1. Move `Renderable` class: `Meritoo\Common` -> `Meritoo\Common\Contract`

2
VERSION
View File

@@ -1 +1 @@
1.1.3 1.1.4

2
src/Collection/BaseCollection.php
View File

@@ -248,7 +248,7 @@ abstract class BaseCollection implements CollectionInterface
foreach ($result as $index => $element) { foreach ($result as $index => $element) {
$iteration++; $iteration++;
if ($iteration < $offset || ($iteration >= $offset && $iteration < $max)) { if ($iteration >= $offset && $iteration < $offset + $max) {
continue; continue;
} }

21
tests/Collection/BaseCollectionTest.php
View File

@@ -724,33 +724,24 @@ class BaseCollectionTest extends BaseTestCase
2, 2,
]; ];
yield 'Maximum set to 1 & offset smaller than size of collection' => [ yield 'Maximum set to 1 & offset set to 2' => [
[ [
'lorem', 123 => 'dolor',
'ipsum',
], ],
1, 1,
2, 2,
]; ];
yield 'Maximum set to 1 & offset equal size of collection' => [ yield 'Maximum set to 1 & offset set to 3' => [
[ [
'lorem',
'ipsum',
123 => 'dolor',
345 => 'sit', 345 => 'sit',
], ],
1, 1,
4, 3,
]; ];
yield 'Maximum set to 1 & offset greater than size of collection' => [ yield 'Maximum set to 1 & offset set to 10' => [
[ [],
'lorem',
'ipsum',
123 => 'dolor',
345 => 'sit',
],
1, 1,
10, 10,
]; ];