diff --git a/lib/Manager.php b/lib/Manager.php index 2ed5b7a..bee924b 100644 --- a/lib/Manager.php +++ b/lib/Manager.php @@ -32,7 +32,6 @@ use KTXF\Resource\Identifier\EntityIdentifierInterface; use KTXF\Resource\Identifier\ResourceIdentifiers; use KTXF\Resource\Provider\ResourceServiceIdentityInterface; use KTXF\Resource\Provider\ResourceServiceLocationInterface; -use KTXF\Resource\Range\RangeAnchorType; use KTXF\Resource\Range\RangeType; use KTXF\Resource\Sort\ISort; use Psr\Log\LoggerInterface; @@ -779,20 +778,7 @@ class Manager { // construct range for entities $entityRange = null; if ($range !== null && $range !== [] && isset($range['type'])) { - $entityRange = $service->entityListRange(RangeType::from($range['type'])); - // Cast to IRangeTally if the range type is TALLY - if ($entityRange->type() === RangeType::TALLY) { - /** @var IRangeTally $entityRange */ - if (isset($range['anchor'])) { - $entityRange->setAnchor(RangeAnchorType::from($range['anchor'])); - } - if (isset($range['position'])) { - $entityRange->setPosition($range['position']); - } - if (isset($range['tally'])) { - $entityRange->setTally($range['tally']); - } - } + $entityRange = $service->entityListRange(RangeType::from($range['type']))->jsonDeserialize($range); } // retrieve entities for each collection foreach ($collectionSelected as $collectionId) { @@ -868,19 +854,7 @@ class Manager { // construct range for entities $entityRange = null; if ($range !== null && $range !== [] && isset($range['type'])) { - $entityRange = $service->entityListRange(RangeType::from($range['type'])); - if ($entityRange->type() === RangeType::TALLY) { - /** @var IRangeTally $entityRange */ - if (isset($range['anchor'])) { - $entityRange->setAnchor(RangeAnchorType::from($range['anchor'])); - } - if (isset($range['position'])) { - $entityRange->setPosition($range['position']); - } - if (isset($range['tally'])) { - $entityRange->setTally($range['tally']); - } - } + $entityRange = $service->entityListRange(RangeType::from($range['type']))->jsonDeserialize($range); } // yield entities for each collection individually foreach ($collectionSelected as $collectionId) {