diff --git a/src/Graviton/RestBundle/Listener/RestrictionListener.php b/src/Graviton/RestBundle/Listener/RestrictionListener.php index 3fc5c0b20..53cb98fc3 100644 --- a/src/Graviton/RestBundle/Listener/RestrictionListener.php +++ b/src/Graviton/RestBundle/Listener/RestrictionListener.php @@ -223,7 +223,7 @@ public function onPreAggregate(PreAggregateEvent $event) $matchConditions[] = [ '$or' => [ [$fieldName => null], - [$fieldName => ['$lte' => $fieldValue]], + [$fieldName => ['$lte' => (int) $fieldValue]], // always int ] ]; } else { @@ -246,10 +246,11 @@ public function onPreAggregate(PreAggregateEvent $event) $newPipeline[] = ['$project' => $projectStage]; } - $newPipeline = array_merge( - $newPipeline, - $event->getPipeline() - ); + if (is_array($event->getPipeline())) { + foreach ($event->getPipeline() as $stage) { + $newPipeline[] = $stage; + } + } $this->logger->info( 'RESTRICTION onPreAggregate',