Skip to content

Commit 843e49e

Browse files
committed
Merge branch 'master' into dev
2 parents 428db1e + 9d11b99 commit 843e49e

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2365,7 +2365,7 @@ CollectionFactory::generate(3, static function (int $i): array {
23652365
return [$i*2, $i*2 + 1];
23662366
}) // [[0, 1], [2, 3], [4, 5]]
23672367
->stream()
2368-
->reorganize(Reorganizers::chunk(2))
2368+
->reorganize(Reorganizers::collapse())
23692369
->getCollection()
23702370
->toArray() // for example [0, 1, 2, 3, 4, 5]
23712371
;

doc/README.ru.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2360,7 +2360,7 @@ CollectionFactory::generate(3, static function (int $i): array {
23602360
return [$i*2, $i*2 + 1];
23612361
}) // [[0, 1], [2, 3], [4, 5]]
23622362
->stream()
2363-
->reorganize(Reorganizers::chunk(2))
2363+
->reorganize(Reorganizers::collapse())
23642364
->getCollection()
23652365
->toArray() // for example [0, 1, 2, 3, 4, 5]
23662366
;

src/WS/Utils/Collections/Functions/ObjectFunctions.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ public static function getPropertyValue($object, string $fieldName)
2323
return $object->{$fieldName};
2424
}
2525

26+
if (isset($object->{$fieldName})) {
27+
return $object->{$fieldName};
28+
}
29+
2630
if (method_exists($object, $fieldName)) {
2731
return $object->{$fieldName}();
2832
}

0 commit comments

Comments
 (0)